From 60eab08d8fc5d0a984ddd422b161ae3659019c4a Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 11 Feb 2020 16:33:28 +0300 Subject: [PATCH 001/286] Add proposals modules - add iteration 2 codex and engine modules --- modules/proposals/codex/Cargo.lock | 1913 +++++++++++++++++ modules/proposals/codex/Cargo.toml | 103 + modules/proposals/codex/src/lib.rs | 55 + modules/proposals/codex/src/proposal_types.rs | 69 + modules/proposals/codex/src/tests/mock.rs | 122 ++ modules/proposals/codex/src/tests/mod.rs | 28 + modules/proposals/engine/Cargo.lock | 1895 ++++++++++++++++ modules/proposals/engine/Cargo.toml | 98 + modules/proposals/engine/src/errors.rs | 17 + modules/proposals/engine/src/lib.rs | 348 +++ modules/proposals/engine/src/tests/mock.rs | 210 ++ modules/proposals/engine/src/tests/mod.rs | 742 +++++++ modules/proposals/engine/src/types.rs | 435 ++++ 13 files changed, 6035 insertions(+) create mode 100644 modules/proposals/codex/Cargo.lock create mode 100644 modules/proposals/codex/Cargo.toml create mode 100644 modules/proposals/codex/src/lib.rs create mode 100644 modules/proposals/codex/src/proposal_types.rs create mode 100644 modules/proposals/codex/src/tests/mock.rs create mode 100644 modules/proposals/codex/src/tests/mod.rs create mode 100644 modules/proposals/engine/Cargo.lock create mode 100644 modules/proposals/engine/Cargo.toml create mode 100644 modules/proposals/engine/src/errors.rs create mode 100644 modules/proposals/engine/src/lib.rs create mode 100644 modules/proposals/engine/src/tests/mock.rs create mode 100644 modules/proposals/engine/src/tests/mod.rs create mode 100644 modules/proposals/engine/src/types.rs diff --git a/modules/proposals/codex/Cargo.lock b/modules/proposals/codex/Cargo.lock new file mode 100644 index 0000000000..8735dda80e --- /dev/null +++ b/modules/proposals/codex/Cargo.lock @@ -0,0 +1,1913 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "ahash" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f33b5018f120946c1dcf279194f238a9f146725593ead1c08fa47ff22b0b5d3" +dependencies = [ + "const-random", +] + +[[package]] +name = "aho-corasick" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "743ad5a418686aad3b87fd14c43badd828cf26e214a00f92a384291cf22e1811" +dependencies = [ + "memchr", +] + +[[package]] +name = "arrayref" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" + +[[package]] +name = "arrayvec" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" +dependencies = [ + "nodrop", +] + +[[package]] +name = "arrayvec" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" + +[[package]] +name = "autocfg" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" + +[[package]] +name = "autocfg" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" + +[[package]] +name = "backtrace" +version = "0.3.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f80256bc78f67e7df7e36d77366f636ed976895d91fe2ab9efa3973e8fe8c4f" +dependencies = [ + "backtrace-sys", + "cfg-if", + "libc", + "rustc-demangle", +] + +[[package]] +name = "backtrace-sys" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "base58" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5024ee8015f02155eee35c711107ddd9a9bf3cb689cf2a9089c97e79b6e1ae83" + +[[package]] +name = "bitflags" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" + +[[package]] +name = "bitmask" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5da9b3d9f6f585199287a473f4f8dfab6566cf827d15c00c219f53c645687ead" + +[[package]] +name = "bitvec" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a993f74b4c99c1908d156b8d2e0fb6277736b0ecbd833982fd1241d39b2766a6" + +[[package]] +name = "blake2-rfc" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400" +dependencies = [ + "arrayvec 0.4.12", + "constant_time_eq", +] + +[[package]] +name = "block-buffer" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" +dependencies = [ + "block-padding", + "byte-tools", + "byteorder", + "generic-array", +] + +[[package]] +name = "block-padding" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" +dependencies = [ + "byte-tools", +] + +[[package]] +name = "byte-slice-cast" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0a5e3906bcbf133e33c1d4d95afc664ad37fbdb9f6568d8043e7ea8c27d93d3" + +[[package]] +name = "byte-tools" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" + +[[package]] +name = "byteorder" +version = "1.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" + +[[package]] +name = "c2-chacha" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" +dependencies = [ + "ppv-lite86", +] + +[[package]] +name = "cc" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd" + +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + +[[package]] +name = "clear_on_drop" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97276801e127ffb46b66ce23f35cc96bd454fa311294bced4bbace7baa8b1d17" +dependencies = [ + "cc", +] + +[[package]] +name = "cloudabi" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" +dependencies = [ + "bitflags", +] + +[[package]] +name = "const-random" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f1af9ac737b2dd2d577701e59fd09ba34822f6f2ebdb30a7647405d9e55e16a" +dependencies = [ + "const-random-macro", + "proc-macro-hack", +] + +[[package]] +name = "const-random-macro" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25e4c606eb459dd29f7c57b2e0879f2b6f14ee130918c2b78ccb58a9624e6c7a" +dependencies = [ + "getrandom", + "proc-macro-hack", +] + +[[package]] +name = "constant_time_eq" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-mac" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" +dependencies = [ + "generic-array", + "subtle 1.0.0", +] + +[[package]] +name = "curve25519-dalek" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b7dcd30ba50cdf88b55b033456138b7c0ac4afdc436d82e1b79f370f24cc66d" +dependencies = [ + "byteorder", + "clear_on_drop", + "digest", + "rand_core 0.3.1", + "subtle 2.2.2", +] + +[[package]] +name = "derivative" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "942ca430eef7a3806595a6737bc388bf51adb888d3fc0dd1b50f1c170167ee3a" +dependencies = [ + "proc-macro2 0.4.30", + "quote 0.6.13", + "syn 0.15.44", +] + +[[package]] +name = "digest" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" +dependencies = [ + "generic-array", +] + +[[package]] +name = "ed25519-dalek" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d07e8b8a8386c3b89a7a4b329fdfa4cb545de2545e9e2ebbc3dd3929253e426" +dependencies = [ + "clear_on_drop", + "curve25519-dalek", + "failure", + "rand 0.6.5", +] + +[[package]] +name = "elastic-array" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "580f3768bd6465780d063f5b8213a2ebd506e139b345e4a81eb301ceae3d61e1" +dependencies = [ + "heapsize", +] + +[[package]] +name = "environmental" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "516aa8d7a71cb00a1c4146f0798549b93d083d4f189b3ced8f3de6b8f11ee6c4" + +[[package]] +name = "failure" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9" +dependencies = [ + "backtrace", + "failure_derive", +] + +[[package]] +name = "failure_derive" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08" +dependencies = [ + "proc-macro2 1.0.8", + "quote 1.0.2", + "syn 1.0.14", + "synstructure", +] + +[[package]] +name = "fake-simd" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" + +[[package]] +name = "fixed-hash" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "516877b7b9a1cc2d0293cbce23cd6203f0edbfd4090e6ca4489fecb5aa73050e" +dependencies = [ + "byteorder", + "libc", + "rand 0.5.6", + "rustc-hex", + "static_assertions 0.2.5", +] + +[[package]] +name = "fuchsia-cprng" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" + +[[package]] +name = "generic-array" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" +dependencies = [ + "typenum", +] + +[[package]] +name = "getrandom" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "hash-db" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d23bd4e7b5eda0d0f3a307e8b381fdc8ba9000f26fbe912250c0a4cc3956364a" + +[[package]] +name = "hash256-std-hasher" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92c171d55b98633f4ed3860808f004099b36c1cc29c42cfc53aa8591b21efcf2" +dependencies = [ + "crunchy", +] + +[[package]] +name = "hashbrown" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bae29b6653b3412c2e71e9d486db9f9df5d701941d86683005efb9f2d28e3da" +dependencies = [ + "byteorder", + "scopeguard 0.3.3", +] + +[[package]] +name = "hashbrown" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e6073d0ca812575946eb5f35ff68dbe519907b25c42530389ff946dc84c6ead" +dependencies = [ + "ahash", + "autocfg 0.1.7", +] + +[[package]] +name = "heapsize" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1679e6ea370dee694f91f1dc469bf94cf8f52051d147aec3e1f9497c6fc22461" +dependencies = [ + "winapi", +] + +[[package]] +name = "heck" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "hex" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" + +[[package]] +name = "hmac" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dcb5e64cda4c23119ab41ba960d1e170a774c8e4b9d9e6a9bc18aabf5e59695" +dependencies = [ + "crypto-mac", + "digest", +] + +[[package]] +name = "hmac-drbg" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6e570451493f10f6581b48cdd530413b63ea9e780f544bfd3bdcaa0d89d1a7b" +dependencies = [ + "digest", + "generic-array", + "hmac", +] + +[[package]] +name = "impl-codec" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1be51a921b067b0eaca2fad532d9400041561aa922221cc65f95a85641c6bf53" +dependencies = [ + "parity-scale-codec", +] + +[[package]] +name = "impl-serde" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58e3cae7e99c7ff5a995da2cf78dd0a5383740eda71d98cf7b1910c301ac69b8" +dependencies = [ + "serde", +] + +[[package]] +name = "impl-trait-for-tuples" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ef5550a42e3740a0e71f909d4c861056a284060af885ae7aa6242820f920d9d" +dependencies = [ + "proc-macro2 1.0.8", + "quote 1.0.2", + "syn 1.0.14", +] + +[[package]] +name = "integer-sqrt" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f65877bf7d44897a473350b1046277941cee20b263397e90869c50b6e766088b" + +[[package]] +name = "keccak" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558" + +[[package]] +name = "libsecp256k1" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fc1e2c808481a63dc6da2074752fdd4336a3c8fcc68b83db6f1fd5224ae7962" +dependencies = [ + "arrayref", + "crunchy", + "digest", + "hmac-drbg", + "rand 0.7.3", + "sha2", + "subtle 2.2.2", + "typenum", +] + +[[package]] +name = "lock_api" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" +dependencies = [ + "scopeguard 0.3.3", +] + +[[package]] +name = "lock_api" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79b2de95ecb4691949fea4716ca53cdbcfccb2c612e19644a8bad05edcf9f47b" +dependencies = [ + "scopeguard 1.0.0", +] + +[[package]] +name = "log" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "malloc_size_of_derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e37c5d4cd9473c5f4c9c111f033f15d4df9bd378fdf615944e360a4f55a05f0b" +dependencies = [ + "proc-macro2 1.0.8", + "syn 1.0.14", + "synstructure", +] + +[[package]] +name = "maybe-uninit" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" + +[[package]] +name = "memchr" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3197e20c7edb283f87c071ddfc7a2cca8f8e0b888c242959846a6fce03c72223" + +[[package]] +name = "memory-db" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dabfe0a8c69954ae3bcfc5fc14260a85fb80e1bf9f86a155f668d10a67e93dd" +dependencies = [ + "ahash", + "hash-db", + "hashbrown 0.6.3", + "parity-util-mem", +] + +[[package]] +name = "memory_units" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71d96e3f3c0b6325d8ccd83c33b28acb183edcb6c67938ba104ec546854b0882" + +[[package]] +name = "merlin" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b0942b357c1b4d0dc43ba724674ec89c3218e6ca2b3e8269e7cb53bcecd2f6e" +dependencies = [ + "byteorder", + "keccak", + "rand_core 0.4.2", + "zeroize 1.1.0", +] + +[[package]] +name = "nodrop" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" + +[[package]] +name = "num-bigint" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" +dependencies = [ + "autocfg 1.0.0", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-integer" +version = "0.1.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba" +dependencies = [ + "autocfg 1.0.0", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da4dc79f9e6c81bef96148c8f6b8e72ad4541caa4a24373e900a36da07de03a3" +dependencies = [ + "autocfg 1.0.0", + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096" +dependencies = [ + "autocfg 1.0.0", +] + +[[package]] +name = "num_enum" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be601e38e20a6f3d01049d85801cb9b7a34a8da7a0da70df507bbde7735058c8" +dependencies = [ + "derivative", + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b59f30f6a043f2606adbd0addbf1eef6f2e28e8c4968918b63b7ff97ac0db2a7" +dependencies = [ + "proc-macro-crate", + "proc-macro2 1.0.8", + "quote 1.0.2", + "syn 1.0.14", +] + +[[package]] +name = "once_cell" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "532c29a261168a45ce28948f9537ddd7a5dd272cc513b3017b1e82a88f962c37" +dependencies = [ + "parking_lot 0.7.1", +] + +[[package]] +name = "once_cell" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d584f08c2d717d5c23a6414fc2822b71c651560713e54fa7eace675f758a355e" + +[[package]] +name = "opaque-debug" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" + +[[package]] +name = "parity-scale-codec" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f747c06d9f3b2ad387ac881b9667298c81b1243aa9833f086e05996937c35507" +dependencies = [ + "arrayvec 0.5.1", + "bitvec", + "byte-slice-cast", + "parity-scale-codec-derive", + "serde", +] + +[[package]] +name = "parity-scale-codec-derive" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34e513ff3e406f3ede6796dcdc83d0b32ffb86668cea1ccf7363118abeb00476" +dependencies = [ + "proc-macro-crate", + "proc-macro2 1.0.8", + "quote 1.0.2", + "syn 1.0.14", +] + +[[package]] +name = "parity-util-mem" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "570093f39f786beea92dcc09e45d8aae7841516ac19a50431953ac82a0e8f85c" +dependencies = [ + "cfg-if", + "malloc_size_of_derive", + "winapi", +] + +[[package]] +name = "parity-wasm" +version = "0.40.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e39faaa292a687ea15120b1ac31899b13586446521df6c149e46f1584671e0f" + +[[package]] +name = "parking_lot" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337" +dependencies = [ + "lock_api 0.1.5", + "parking_lot_core 0.4.0", +] + +[[package]] +name = "parking_lot" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" +dependencies = [ + "lock_api 0.3.3", + "parking_lot_core 0.6.2", + "rustc_version", +] + +[[package]] +name = "parking_lot_core" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9" +dependencies = [ + "libc", + "rand 0.6.5", + "rustc_version", + "smallvec", + "winapi", +] + +[[package]] +name = "parking_lot_core" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" +dependencies = [ + "cfg-if", + "cloudabi", + "libc", + "redox_syscall", + "rustc_version", + "smallvec", + "winapi", +] + +[[package]] +name = "paste" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "423a519e1c6e828f1e73b720f9d9ed2fa643dce8a7737fb43235ce0b41eeaa49" +dependencies = [ + "paste-impl", + "proc-macro-hack", +] + +[[package]] +name = "paste-impl" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4214c9e912ef61bf42b81ba9a47e8aad1b2ffaf739ab162bf96d1e011f54e6c5" +dependencies = [ + "proc-macro-hack", + "proc-macro2 1.0.8", + "quote 1.0.2", + "syn 1.0.14", +] + +[[package]] +name = "pbkdf2" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "006c038a43a45995a9670da19e67600114740e8511d4333bf97a56e66a7542d9" +dependencies = [ + "byteorder", + "crypto-mac", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" + +[[package]] +name = "primitive-types" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83ef7b3b965c0eadcb6838f34f827e1dfb2939bdd5ebd43f9647e009b12b0371" +dependencies = [ + "fixed-hash", + "impl-codec", + "impl-serde", + "uint", +] + +[[package]] +name = "proc-macro-crate" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e10d4b51f154c8a7fb96fd6dad097cb74b863943ec010ac94b9fd1be8861fe1e" +dependencies = [ + "toml", +] + +[[package]] +name = "proc-macro-hack" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5" +dependencies = [ + "proc-macro2 1.0.8", + "quote 1.0.2", + "syn 1.0.14", +] + +[[package]] +name = "proc-macro2" +version = "0.4.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" +dependencies = [ + "unicode-xid 0.1.0", +] + +[[package]] +name = "proc-macro2" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548" +dependencies = [ + "unicode-xid 0.2.0", +] + +[[package]] +name = "quote" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" +dependencies = [ + "proc-macro2 0.4.30", +] + +[[package]] +name = "quote" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" +dependencies = [ + "proc-macro2 1.0.8", +] + +[[package]] +name = "rand" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9" +dependencies = [ + "cloudabi", + "fuchsia-cprng", + "libc", + "rand_core 0.3.1", + "winapi", +] + +[[package]] +name = "rand" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" +dependencies = [ + "autocfg 0.1.7", + "libc", + "rand_chacha 0.1.1", + "rand_core 0.4.2", + "rand_hc 0.1.0", + "rand_isaac", + "rand_jitter", + "rand_os", + "rand_pcg", + "rand_xorshift", + "winapi", +] + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom", + "libc", + "rand_chacha 0.2.1", + "rand_core 0.5.1", + "rand_hc 0.2.0", +] + +[[package]] +name = "rand_chacha" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" +dependencies = [ + "autocfg 0.1.7", + "rand_core 0.3.1", +] + +[[package]] +name = "rand_chacha" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" +dependencies = [ + "c2-chacha", + "rand_core 0.5.1", +] + +[[package]] +name = "rand_core" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" +dependencies = [ + "rand_core 0.4.2", +] + +[[package]] +name = "rand_core" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rand_hc" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "rand_isaac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "rand_jitter" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" +dependencies = [ + "libc", + "rand_core 0.4.2", + "winapi", +] + +[[package]] +name = "rand_os" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" +dependencies = [ + "cloudabi", + "fuchsia-cprng", + "libc", + "rand_core 0.4.2", + "rdrand", + "winapi", +] + +[[package]] +name = "rand_pcg" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" +dependencies = [ + "autocfg 0.1.7", + "rand_core 0.4.2", +] + +[[package]] +name = "rand_xorshift" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "rdrand" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "redox_syscall" +version = "0.1.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" + +[[package]] +name = "regex" +version = "1.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "322cf97724bea3ee221b78fe25ac9c46114ebb51747ad5babd51a2fc6a8235a8" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", + "thread_local", +] + +[[package]] +name = "regex-syntax" +version = "0.6.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b28dfe3fe9badec5dbf0a79a9cccad2cfc2ab5484bdb3e44cbd1ae8b3ba2be06" + +[[package]] +name = "rustc-demangle" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" + +[[package]] +name = "rustc-hex" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" + +[[package]] +name = "rustc_version" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver", +] + +[[package]] +name = "safe-mix" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d3d055a2582e6b00ed7a31c1524040aa391092bf636328350813f3a0605215c" +dependencies = [ + "rustc_version", +] + +[[package]] +name = "schnorrkel" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eacd8381b3c37840c9c9f40472af529e49975bdcbc24f83c31059fd6539023d3" +dependencies = [ + "curve25519-dalek", + "failure", + "merlin", + "rand 0.6.5", + "rand_core 0.4.2", + "rand_os", + "sha2", + "subtle 2.2.2", + "zeroize 0.9.3", +] + +[[package]] +name = "scopeguard" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" + +[[package]] +name = "scopeguard" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" + +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + +[[package]] +name = "serde" +version = "1.0.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64" +dependencies = [ + "proc-macro2 1.0.8", + "quote 1.0.2", + "syn 1.0.14", +] + +[[package]] +name = "sha2" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27044adfd2e1f077f649f59deb9490d3941d674002f7d062870a60ebe9bd47a0" +dependencies = [ + "block-buffer", + "digest", + "fake-simd", + "opaque-debug", +] + +[[package]] +name = "smallvec" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" +dependencies = [ + "maybe-uninit", +] + +[[package]] +name = "sr-api-macros" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "blake2-rfc", + "proc-macro-crate", + "proc-macro2 0.4.30", + "quote 0.6.13", + "syn 0.15.44", +] + +[[package]] +name = "sr-arithmetic" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "integer-sqrt", + "num-traits", + "parity-scale-codec", + "serde", + "sr-std", + "substrate-debug-derive", +] + +[[package]] +name = "sr-io" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "hash-db", + "libsecp256k1", + "log", + "parity-scale-codec", + "rustc_version", + "sr-std", + "substrate-externalities", + "substrate-primitives", + "substrate-state-machine", + "substrate-trie", + "tiny-keccak", +] + +[[package]] +name = "sr-primitives" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "paste", + "rand 0.7.3", + "serde", + "sr-arithmetic", + "sr-io", + "sr-std", + "substrate-application-crypto", + "substrate-primitives", +] + +[[package]] +name = "sr-staking-primitives" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "parity-scale-codec", + "sr-primitives", + "sr-std", +] + +[[package]] +name = "sr-std" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "rustc_version", +] + +[[package]] +name = "sr-version" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "impl-serde", + "parity-scale-codec", + "serde", + "sr-primitives", + "sr-std", +] + +[[package]] +name = "srml-authorship" +version = "0.1.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "impl-trait-for-tuples", + "parity-scale-codec", + "sr-io", + "sr-primitives", + "sr-std", + "srml-support", + "srml-system", + "substrate-inherents", + "substrate-primitives", +] + +[[package]] +name = "srml-balances" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "parity-scale-codec", + "safe-mix", + "serde", + "sr-primitives", + "sr-std", + "srml-support", + "srml-system", + "substrate-keyring", +] + +[[package]] +name = "srml-metadata" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "parity-scale-codec", + "serde", + "sr-std", + "substrate-primitives", +] + +[[package]] +name = "srml-session" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "impl-trait-for-tuples", + "parity-scale-codec", + "safe-mix", + "serde", + "sr-io", + "sr-primitives", + "sr-staking-primitives", + "sr-std", + "srml-support", + "srml-system", + "srml-timestamp", + "substrate-trie", +] + +[[package]] +name = "srml-staking" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "parity-scale-codec", + "safe-mix", + "serde", + "sr-io", + "sr-primitives", + "sr-staking-primitives", + "sr-std", + "srml-authorship", + "srml-session", + "srml-support", + "srml-system", + "substrate-keyring", + "substrate-phragmen", +] + +[[package]] +name = "srml-support" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "bitmask", + "impl-trait-for-tuples", + "log", + "once_cell 0.2.4", + "parity-scale-codec", + "paste", + "serde", + "sr-io", + "sr-primitives", + "sr-std", + "srml-metadata", + "srml-support-procedural", + "substrate-inherents", + "substrate-primitives", +] + +[[package]] +name = "srml-support-procedural" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "proc-macro2 0.4.30", + "quote 0.6.13", + "sr-api-macros", + "srml-support-procedural-tools", + "syn 0.15.44", +] + +[[package]] +name = "srml-support-procedural-tools" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "proc-macro-crate", + "proc-macro2 0.4.30", + "quote 0.6.13", + "srml-support-procedural-tools-derive", + "syn 0.15.44", +] + +[[package]] +name = "srml-support-procedural-tools-derive" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "proc-macro2 0.4.30", + "quote 0.6.13", + "syn 0.15.44", +] + +[[package]] +name = "srml-system" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "impl-trait-for-tuples", + "parity-scale-codec", + "safe-mix", + "serde", + "sr-io", + "sr-primitives", + "sr-std", + "sr-version", + "srml-support", + "substrate-primitives", +] + +[[package]] +name = "srml-timestamp" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "impl-trait-for-tuples", + "parity-scale-codec", + "serde", + "sr-primitives", + "sr-std", + "srml-support", + "srml-system", + "substrate-inherents", +] + +[[package]] +name = "static_assertions" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c19be23126415861cb3a23e501d34a708f7f9b2183c5252d690941c2e69199d5" + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strum" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d1c33039533f051704951680f1adfd468fd37ac46816ded0d9ee068e60f05f" + +[[package]] +name = "strum_macros" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47cd23f5c7dee395a00fa20135e2ec0fffcdfa151c56182966d7a3261343432e" +dependencies = [ + "heck", + "proc-macro2 0.4.30", + "quote 0.6.13", + "syn 0.15.44", +] + +[[package]] +name = "substrate-application-crypto" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "parity-scale-codec", + "serde", + "sr-io", + "sr-std", + "substrate-primitives", +] + +[[package]] +name = "substrate-bip39" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3be511be555a3633e71739a79e4ddff6a6aaa6579fa6114182a51d72c3eb93c5" +dependencies = [ + "hmac", + "pbkdf2", + "schnorrkel", + "sha2", +] + +[[package]] +name = "substrate-debug-derive" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "proc-macro2 1.0.8", + "quote 1.0.2", + "syn 1.0.14", +] + +[[package]] +name = "substrate-externalities" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "environmental", + "primitive-types", + "sr-std", + "substrate-primitives-storage", +] + +[[package]] +name = "substrate-inherents" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "parity-scale-codec", + "parking_lot 0.9.0", + "sr-primitives", + "sr-std", +] + +[[package]] +name = "substrate-keyring" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "lazy_static", + "sr-primitives", + "strum", + "strum_macros", + "substrate-primitives", +] + +[[package]] +name = "substrate-panic-handler" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "backtrace", + "log", +] + +[[package]] +name = "substrate-phragmen" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "sr-primitives", + "sr-std", +] + +[[package]] +name = "substrate-primitives" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "base58", + "blake2-rfc", + "byteorder", + "ed25519-dalek", + "hash-db", + "hash256-std-hasher", + "hex", + "impl-serde", + "lazy_static", + "libsecp256k1", + "log", + "num-traits", + "parity-scale-codec", + "parking_lot 0.9.0", + "primitive-types", + "rand 0.7.3", + "regex", + "rustc-hex", + "schnorrkel", + "serde", + "sha2", + "sr-std", + "substrate-bip39", + "substrate-debug-derive", + "substrate-externalities", + "substrate-primitives-storage", + "tiny-bip39", + "tiny-keccak", + "twox-hash", + "wasmi", + "zeroize 0.10.1", +] + +[[package]] +name = "substrate-primitives-storage" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "impl-serde", + "serde", + "sr-std", + "substrate-debug-derive", +] + +[[package]] +name = "substrate-proposals-codex-module" +version = "2.0.0" +dependencies = [ + "num_enum", + "parity-scale-codec", + "serde", + "sr-io", + "sr-primitives", + "sr-staking-primitives", + "sr-std", + "srml-balances", + "srml-staking", + "srml-support", + "srml-system", + "srml-timestamp", + "substrate-primitives", + "substrate-proposals-engine-module", +] + +[[package]] +name = "substrate-proposals-engine-module" +version = "2.0.0" +dependencies = [ + "num_enum", + "parity-scale-codec", + "sr-primitives", + "sr-staking-primitives", + "sr-std", + "srml-balances", + "srml-staking", + "srml-support", + "srml-system", + "srml-timestamp", + "substrate-primitives", +] + +[[package]] +name = "substrate-state-machine" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "hash-db", + "log", + "num-traits", + "parity-scale-codec", + "parking_lot 0.9.0", + "rand 0.7.3", + "substrate-externalities", + "substrate-panic-handler", + "substrate-primitives", + "substrate-trie", + "trie-db", + "trie-root", +] + +[[package]] +name = "substrate-trie" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "hash-db", + "memory-db", + "parity-scale-codec", + "sr-std", + "substrate-primitives", + "trie-db", + "trie-root", +] + +[[package]] +name = "subtle" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" + +[[package]] +name = "subtle" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c65d530b10ccaeac294f349038a597e435b18fb456aadd0840a623f83b9e941" + +[[package]] +name = "syn" +version = "0.15.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" +dependencies = [ + "proc-macro2 0.4.30", + "quote 0.6.13", + "unicode-xid 0.1.0", +] + +[[package]] +name = "syn" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5" +dependencies = [ + "proc-macro2 1.0.8", + "quote 1.0.2", + "unicode-xid 0.2.0", +] + +[[package]] +name = "synstructure" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" +dependencies = [ + "proc-macro2 1.0.8", + "quote 1.0.2", + "syn 1.0.14", + "unicode-xid 0.2.0", +] + +[[package]] +name = "thread_local" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "tiny-bip39" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1c5676413eaeb1ea35300a0224416f57abc3bd251657e0fafc12c47ff98c060" +dependencies = [ + "failure", + "hashbrown 0.1.8", + "hmac", + "once_cell 0.1.8", + "pbkdf2", + "rand 0.6.5", + "sha2", +] + +[[package]] +name = "tiny-keccak" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d8a021c69bb74a44ccedb824a046447e2c84a01df9e5c20779750acb38e11b2" +dependencies = [ + "crunchy", +] + +[[package]] +name = "toml" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" +dependencies = [ + "serde", +] + +[[package]] +name = "trie-db" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0b62d27e8aa1c07414549ac872480ac82380bab39e730242ab08d82d7cc098a" +dependencies = [ + "elastic-array", + "hash-db", + "hashbrown 0.6.3", + "log", + "rand 0.6.5", +] + +[[package]] +name = "trie-root" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b779f7c1c8fe9276365d9d5be5c4b5adeacf545117bb3f64c974305789c5c0b" +dependencies = [ + "hash-db", +] + +[[package]] +name = "twox-hash" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bfd5b7557925ce778ff9b9ef90e3ade34c524b5ff10e239c69a42d546d2af56" +dependencies = [ + "rand 0.7.3", +] + +[[package]] +name = "typenum" +version = "1.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9" + +[[package]] +name = "uint" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e75a4cdd7b87b28840dba13c483b9a88ee6bbf16ba5c951ee1ecfcf723078e0d" +dependencies = [ + "byteorder", + "crunchy", + "rustc-hex", + "static_assertions 1.1.0", +] + +[[package]] +name = "unicode-segmentation" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" + +[[package]] +name = "unicode-xid" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" + +[[package]] +name = "unicode-xid" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "wasmi" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31d26deb2d9a37e6cfed420edce3ed604eab49735ba89035e13c98f9a528313" +dependencies = [ + "libc", + "memory_units", + "num-rational", + "num-traits", + "parity-wasm", + "wasmi-validation", +] + +[[package]] +name = "wasmi-validation" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bc0356e3df56e639fc7f7d8a99741915531e27ed735d911ed83d7e1339c8188" +dependencies = [ + "parity-wasm", +] + +[[package]] +name = "winapi" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "zeroize" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45af6a010d13e4cf5b54c94ba5a2b2eba5596b9e46bf5875612d332a1f2b3f86" + +[[package]] +name = "zeroize" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4090487fa66630f7b166fba2bbb525e247a5449f41c468cc1d98f8ae6ac03120" + +[[package]] +name = "zeroize" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cbac2ed2ba24cc90f5e06485ac8c7c1e5449fe8911aef4d8877218af021a5b8" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de251eec69fc7c1bc3923403d18ececb929380e016afe103da75f396704f8ca2" +dependencies = [ + "proc-macro2 1.0.8", + "quote 1.0.2", + "syn 1.0.14", + "synstructure", +] diff --git a/modules/proposals/codex/Cargo.toml b/modules/proposals/codex/Cargo.toml new file mode 100644 index 0000000000..892f79254b --- /dev/null +++ b/modules/proposals/codex/Cargo.toml @@ -0,0 +1,103 @@ +[package] +name = 'substrate-proposals-codex-module' +version = '2.0.0' +authors = ['Joystream contributors'] +edition = '2018' + +[features] +default = ['std'] +no_std = [] +std = [ + 'sr-staking-primitives/std', + 'staking/std', + 'codec/std', + 'rstd/std', + 'srml-support/std', + 'balances/std', + 'primitives/std', + 'runtime-primitives/std', + 'system/std', + 'timestamp/std', + 'serde', +] + + +[dependencies.num_enum] +default_features = false +version = "0.4.2" + +[dependencies.serde] +features = ['derive'] +optional = true +version = '1.0.101' + +[dependencies.codec] +default-features = false +features = ['derive'] +package = 'parity-scale-codec' +version = '1.0.0' + +[dependencies.primitives] +default_features = false +git = 'https://github.com/paritytech/substrate.git' +package = 'substrate-primitives' +rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' + +[dependencies.rstd] +default_features = false +git = 'https://github.com/paritytech/substrate.git' +package = 'sr-std' +rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' + +[dependencies.runtime-primitives] +default_features = false +git = 'https://github.com/paritytech/substrate.git' +package = 'sr-primitives' +rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' + +[dependencies.sr-staking-primitives] +default_features = false +git = 'https://github.com/paritytech/substrate.git' +package = 'sr-staking-primitives' +rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' + +[dependencies.srml-support] +default_features = false +git = 'https://github.com/paritytech/substrate.git' +package = 'srml-support' +rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' + +[dependencies.system] +default_features = false +git = 'https://github.com/paritytech/substrate.git' +package = 'srml-system' +rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' + +[dependencies.timestamp] +default_features = false +git = 'https://github.com/paritytech/substrate.git' +package = 'srml-timestamp' +rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' + +[dependencies.staking] +default_features = false +git = 'https://github.com/paritytech/substrate.git' +package = 'srml-staking' +rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' + +[dependencies.balances] +default_features = false +git = 'https://github.com/paritytech/substrate.git' +package = 'srml-balances' +rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' + +[dependencies.proposal_engine] +default_features = false +package = 'substrate-proposals-engine-module' +path = '../engine' + +[dev-dependencies.runtime-io] +default_features = false +git = 'https://github.com/paritytech/substrate.git' +package = 'sr-io' +rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' diff --git a/modules/proposals/codex/src/lib.rs b/modules/proposals/codex/src/lib.rs new file mode 100644 index 0000000000..269fd218b8 --- /dev/null +++ b/modules/proposals/codex/src/lib.rs @@ -0,0 +1,55 @@ +//! Proposals codex module for the Joystream platform. Version 2. +//! Contains preset proposal types +//! +//! Supported extrinsics (proposal type): +//! - create_text_proposal +//! + +// Ensure we're `no_std` when compiling for Wasm. +#![cfg_attr(not(feature = "std"), no_std)] + +// Do not delete! Cannot be uncommented by default, because of Parity decl_module! issue. +//#![warn(missing_docs)] + +pub use proposal_types::{ProposalType, TextProposalExecutable}; + +mod proposal_types; +#[cfg(test)] +mod tests; + +use codec::Encode; +use proposal_engine::*; +use rstd::clone::Clone; +use rstd::vec::Vec; +use srml_support::decl_module; + +/// 'Proposals codex' substrate module Trait +pub trait Trait: system::Trait + proposal_engine::Trait {} + +decl_module! { + /// 'Proposal codex' substrate module + pub struct Module for enum Call where origin: T::Origin { + /// Create text (signal) proposal type. On approval prints its content. + pub fn create_text_proposal(origin, title: Vec, body: Vec) { + let parameters = crate::ProposalParameters { + voting_period: T::BlockNumber::from(3u32), + approval_quorum_percentage: 49, + }; + + let text_proposal = TextProposalExecutable{ + title: title.clone(), + body: body.clone() + }; + let proposal_code = text_proposal.encode(); + + >::create_proposal( + origin, + parameters, + title, + body, + text_proposal.proposal_type(), + proposal_code + )?; + } + } +} diff --git a/modules/proposals/codex/src/proposal_types.rs b/modules/proposals/codex/src/proposal_types.rs new file mode 100644 index 0000000000..8596bc5b43 --- /dev/null +++ b/modules/proposals/codex/src/proposal_types.rs @@ -0,0 +1,69 @@ +use codec::{Decode, Encode}; +use num_enum::{IntoPrimitive, TryFromPrimitive}; +use rstd::convert::TryFrom; +use rstd::prelude::*; + +use rstd::str::from_utf8; +use srml_support::{dispatch, print}; + +use crate::{ProposalCodeDecoder, ProposalExecutable}; + +/// Defines allowed proposals types. Integer value serves as proposal_type_id. +#[derive(Debug, Eq, PartialEq, TryFromPrimitive, IntoPrimitive)] +#[repr(u32)] +pub enum ProposalType { + /// Text(signal) proposal type + Text = 1, +} + +impl ProposalType { + fn compose_executable( + &self, + proposal_data: Vec, + ) -> Result, &'static str> { + match self { + ProposalType::Text => TextProposalExecutable::decode(&mut &proposal_data[..]) + .map_err(|err| err.what()) + .map(|obj| Box::new(obj) as Box), + } + } +} + +impl ProposalCodeDecoder for ProposalType { + fn decode_proposal( + proposal_type: u32, + proposal_code: Vec, + ) -> Result, &'static str> { + Self::try_from(proposal_type) + .map_err(|_| "Unsupported proposal type")? + .compose_executable(proposal_code) + } +} + +/// Text (signal) proposal executable code wrapper. Prints its content on execution. +#[derive(Encode, Decode, Clone, PartialEq, Eq, Debug, Default)] +pub struct TextProposalExecutable { + /// Text proposal title + pub title: Vec, + + /// Text proposal body + pub body: Vec, +} + +impl TextProposalExecutable { + /// Converts text proposal type to proposal_type_id + pub fn proposal_type(&self) -> u32 { + ProposalType::Text.into() + } +} + +impl ProposalExecutable for TextProposalExecutable { + fn execute(&self) -> dispatch::Result { + print("Proposal: "); + print(from_utf8(self.title.as_slice()).unwrap()); + print("Description:"); + print(from_utf8(self.body.as_slice()).unwrap()); + + Ok(()) + } +} diff --git a/modules/proposals/codex/src/tests/mock.rs b/modules/proposals/codex/src/tests/mock.rs new file mode 100644 index 0000000000..7f3fd33f74 --- /dev/null +++ b/modules/proposals/codex/src/tests/mock.rs @@ -0,0 +1,122 @@ +#![cfg(test)] + +pub use system; + +pub use primitives::{Blake2Hasher, H256}; +pub use runtime_primitives::{ + testing::{Digest, DigestItem, Header, UintAuthorityId}, + traits::{BlakeTwo256, Convert, IdentityLookup, OnFinalize}, + weights::Weight, + BuildStorage, Perbill, +}; + +use proposal_engine::VotersParameters; +use srml_support::{impl_outer_dispatch, impl_outer_origin, parameter_types}; + +impl_outer_origin! { + pub enum Origin for Test {} +} + +// Workaround for https://github.com/rust-lang/rust/issues/26925 . Remove when sorted. +#[derive(Clone, PartialEq, Eq, Debug)] +pub struct Test; +parameter_types! { + pub const BlockHashCount: u64 = 250; + pub const MaximumBlockWeight: u32 = 1024; + pub const MaximumBlockLength: u32 = 2 * 1024; + pub const AvailableBlockRatio: Perbill = Perbill::one(); + pub const MinimumPeriod: u64 = 5; +} + +impl_outer_dispatch! { + pub enum Call for Test where origin: Origin { + codex::ProposalCodex, + proposals::ProposalsEngine, + } +} + +impl proposal_engine::Trait for Test { + type Event = (); + + type ProposalOrigin = system::EnsureSigned; + + type VoteOrigin = system::EnsureSigned; + + type TotalVotersCounter = MockVotersParameters; + + type ProposalCodeDecoder = crate::ProposalType; +} + +pub struct MockVotersParameters; +impl VotersParameters for MockVotersParameters { + fn total_voters_count() -> u32 { + 4 + } +} + +impl crate::Trait for Test {} + +impl system::Trait for Test { + type Origin = Origin; + type Index = u64; + type BlockNumber = u64; + type Call = (); + type Hash = H256; + type Hashing = BlakeTwo256; + type AccountId = u64; + type Lookup = IdentityLookup; + type Header = Header; + type Event = (); + type BlockHashCount = BlockHashCount; + type MaximumBlockWeight = MaximumBlockWeight; + type MaximumBlockLength = MaximumBlockLength; + type AvailableBlockRatio = AvailableBlockRatio; + type Version = (); +} + +impl timestamp::Trait for Test { + type Moment = u64; + type OnTimestampSet = (); + type MinimumPeriod = MinimumPeriod; +} + +parameter_types! { + pub const ExistentialDeposit: u32 = 0; + pub const TransferFee: u32 = 0; + pub const CreationFee: u32 = 0; + pub const TransactionBaseFee: u32 = 1; + pub const TransactionByteFee: u32 = 0; + pub const InitialMembersBalance: u32 = 0; +} + +impl balances::Trait for Test { + /// The type for recording an account's balance. + type Balance = u64; + /// What to do if an account's free balance gets zeroed. + type OnFreeBalanceZero = (); + /// What to do if a new account is created. + type OnNewAccount = (); + /// The ubiquitous event type. + type Event = (); + + type DustRemoval = (); + type TransferPayment = (); + type ExistentialDeposit = ExistentialDeposit; + type TransferFee = TransferFee; + type CreationFee = CreationFee; +} + +// TODO add a Hook type to capture TriggerElection and CouncilElected hooks + +// This function basically just builds a genesis storage key/value store according to +// our desired mockup. +pub fn initial_test_ext() -> runtime_io::TestExternalities { + let t = system::GenesisConfig::default() + .build_storage::() + .unwrap(); + + t.into() +} + +pub type ProposalCodex = crate::Module; +pub type ProposalsEngine = proposal_engine::Module; diff --git a/modules/proposals/codex/src/tests/mod.rs b/modules/proposals/codex/src/tests/mod.rs new file mode 100644 index 0000000000..2a443f088a --- /dev/null +++ b/modules/proposals/codex/src/tests/mod.rs @@ -0,0 +1,28 @@ +mod mock; + +use mock::*; +use system::RawOrigin; + +#[test] +fn create_text_proposal_codex_call_succeeds() { + initial_test_ext().execute_with(|| { + let origin = RawOrigin::Signed(1).into(); + + assert!( + ProposalCodex::create_text_proposal(origin, b"title".to_vec(), b"body".to_vec(),) + .is_ok() + ); + }); +} + +#[test] +fn create_text_proposal_codex_call_fails_with_insufficient_rights() { + initial_test_ext().execute_with(|| { + let origin = RawOrigin::None.into(); + + assert!( + ProposalCodex::create_text_proposal(origin, b"title".to_vec(), b"body".to_vec(),) + .is_err() + ); + }); +} diff --git a/modules/proposals/engine/Cargo.lock b/modules/proposals/engine/Cargo.lock new file mode 100644 index 0000000000..1d76a22622 --- /dev/null +++ b/modules/proposals/engine/Cargo.lock @@ -0,0 +1,1895 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "ahash" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f33b5018f120946c1dcf279194f238a9f146725593ead1c08fa47ff22b0b5d3" +dependencies = [ + "const-random", +] + +[[package]] +name = "aho-corasick" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "743ad5a418686aad3b87fd14c43badd828cf26e214a00f92a384291cf22e1811" +dependencies = [ + "memchr", +] + +[[package]] +name = "arrayref" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" + +[[package]] +name = "arrayvec" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" +dependencies = [ + "nodrop", +] + +[[package]] +name = "arrayvec" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" + +[[package]] +name = "autocfg" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" + +[[package]] +name = "autocfg" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" + +[[package]] +name = "backtrace" +version = "0.3.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f80256bc78f67e7df7e36d77366f636ed976895d91fe2ab9efa3973e8fe8c4f" +dependencies = [ + "backtrace-sys", + "cfg-if", + "libc", + "rustc-demangle", +] + +[[package]] +name = "backtrace-sys" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "base58" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5024ee8015f02155eee35c711107ddd9a9bf3cb689cf2a9089c97e79b6e1ae83" + +[[package]] +name = "bitflags" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" + +[[package]] +name = "bitmask" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5da9b3d9f6f585199287a473f4f8dfab6566cf827d15c00c219f53c645687ead" + +[[package]] +name = "bitvec" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a993f74b4c99c1908d156b8d2e0fb6277736b0ecbd833982fd1241d39b2766a6" + +[[package]] +name = "blake2-rfc" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400" +dependencies = [ + "arrayvec 0.4.12", + "constant_time_eq", +] + +[[package]] +name = "block-buffer" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" +dependencies = [ + "block-padding", + "byte-tools", + "byteorder", + "generic-array", +] + +[[package]] +name = "block-padding" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" +dependencies = [ + "byte-tools", +] + +[[package]] +name = "byte-slice-cast" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0a5e3906bcbf133e33c1d4d95afc664ad37fbdb9f6568d8043e7ea8c27d93d3" + +[[package]] +name = "byte-tools" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" + +[[package]] +name = "byteorder" +version = "1.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" + +[[package]] +name = "c2-chacha" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" +dependencies = [ + "ppv-lite86", +] + +[[package]] +name = "cc" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd" + +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + +[[package]] +name = "clear_on_drop" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97276801e127ffb46b66ce23f35cc96bd454fa311294bced4bbace7baa8b1d17" +dependencies = [ + "cc", +] + +[[package]] +name = "cloudabi" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" +dependencies = [ + "bitflags", +] + +[[package]] +name = "const-random" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f1af9ac737b2dd2d577701e59fd09ba34822f6f2ebdb30a7647405d9e55e16a" +dependencies = [ + "const-random-macro", + "proc-macro-hack", +] + +[[package]] +name = "const-random-macro" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25e4c606eb459dd29f7c57b2e0879f2b6f14ee130918c2b78ccb58a9624e6c7a" +dependencies = [ + "getrandom", + "proc-macro-hack", +] + +[[package]] +name = "constant_time_eq" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-mac" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" +dependencies = [ + "generic-array", + "subtle 1.0.0", +] + +[[package]] +name = "curve25519-dalek" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b7dcd30ba50cdf88b55b033456138b7c0ac4afdc436d82e1b79f370f24cc66d" +dependencies = [ + "byteorder", + "clear_on_drop", + "digest", + "rand_core 0.3.1", + "subtle 2.2.2", +] + +[[package]] +name = "derivative" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "942ca430eef7a3806595a6737bc388bf51adb888d3fc0dd1b50f1c170167ee3a" +dependencies = [ + "proc-macro2 0.4.30", + "quote 0.6.13", + "syn 0.15.44", +] + +[[package]] +name = "digest" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" +dependencies = [ + "generic-array", +] + +[[package]] +name = "ed25519-dalek" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d07e8b8a8386c3b89a7a4b329fdfa4cb545de2545e9e2ebbc3dd3929253e426" +dependencies = [ + "clear_on_drop", + "curve25519-dalek", + "failure", + "rand 0.6.5", +] + +[[package]] +name = "elastic-array" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "580f3768bd6465780d063f5b8213a2ebd506e139b345e4a81eb301ceae3d61e1" +dependencies = [ + "heapsize", +] + +[[package]] +name = "environmental" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "516aa8d7a71cb00a1c4146f0798549b93d083d4f189b3ced8f3de6b8f11ee6c4" + +[[package]] +name = "failure" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9" +dependencies = [ + "backtrace", + "failure_derive", +] + +[[package]] +name = "failure_derive" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08" +dependencies = [ + "proc-macro2 1.0.8", + "quote 1.0.2", + "syn 1.0.14", + "synstructure", +] + +[[package]] +name = "fake-simd" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" + +[[package]] +name = "fixed-hash" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "516877b7b9a1cc2d0293cbce23cd6203f0edbfd4090e6ca4489fecb5aa73050e" +dependencies = [ + "byteorder", + "libc", + "rand 0.5.6", + "rustc-hex", + "static_assertions 0.2.5", +] + +[[package]] +name = "fuchsia-cprng" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" + +[[package]] +name = "generic-array" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" +dependencies = [ + "typenum", +] + +[[package]] +name = "getrandom" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "hash-db" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d23bd4e7b5eda0d0f3a307e8b381fdc8ba9000f26fbe912250c0a4cc3956364a" + +[[package]] +name = "hash256-std-hasher" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92c171d55b98633f4ed3860808f004099b36c1cc29c42cfc53aa8591b21efcf2" +dependencies = [ + "crunchy", +] + +[[package]] +name = "hashbrown" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bae29b6653b3412c2e71e9d486db9f9df5d701941d86683005efb9f2d28e3da" +dependencies = [ + "byteorder", + "scopeguard 0.3.3", +] + +[[package]] +name = "hashbrown" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e6073d0ca812575946eb5f35ff68dbe519907b25c42530389ff946dc84c6ead" +dependencies = [ + "ahash", + "autocfg 0.1.7", +] + +[[package]] +name = "heapsize" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1679e6ea370dee694f91f1dc469bf94cf8f52051d147aec3e1f9497c6fc22461" +dependencies = [ + "winapi", +] + +[[package]] +name = "heck" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "hex" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" + +[[package]] +name = "hmac" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dcb5e64cda4c23119ab41ba960d1e170a774c8e4b9d9e6a9bc18aabf5e59695" +dependencies = [ + "crypto-mac", + "digest", +] + +[[package]] +name = "hmac-drbg" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6e570451493f10f6581b48cdd530413b63ea9e780f544bfd3bdcaa0d89d1a7b" +dependencies = [ + "digest", + "generic-array", + "hmac", +] + +[[package]] +name = "impl-codec" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1be51a921b067b0eaca2fad532d9400041561aa922221cc65f95a85641c6bf53" +dependencies = [ + "parity-scale-codec", +] + +[[package]] +name = "impl-serde" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58e3cae7e99c7ff5a995da2cf78dd0a5383740eda71d98cf7b1910c301ac69b8" +dependencies = [ + "serde", +] + +[[package]] +name = "impl-trait-for-tuples" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ef5550a42e3740a0e71f909d4c861056a284060af885ae7aa6242820f920d9d" +dependencies = [ + "proc-macro2 1.0.8", + "quote 1.0.2", + "syn 1.0.14", +] + +[[package]] +name = "integer-sqrt" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f65877bf7d44897a473350b1046277941cee20b263397e90869c50b6e766088b" + +[[package]] +name = "keccak" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558" + +[[package]] +name = "libsecp256k1" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fc1e2c808481a63dc6da2074752fdd4336a3c8fcc68b83db6f1fd5224ae7962" +dependencies = [ + "arrayref", + "crunchy", + "digest", + "hmac-drbg", + "rand 0.7.3", + "sha2", + "subtle 2.2.2", + "typenum", +] + +[[package]] +name = "lock_api" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" +dependencies = [ + "scopeguard 0.3.3", +] + +[[package]] +name = "lock_api" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79b2de95ecb4691949fea4716ca53cdbcfccb2c612e19644a8bad05edcf9f47b" +dependencies = [ + "scopeguard 1.0.0", +] + +[[package]] +name = "log" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "malloc_size_of_derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e37c5d4cd9473c5f4c9c111f033f15d4df9bd378fdf615944e360a4f55a05f0b" +dependencies = [ + "proc-macro2 1.0.8", + "syn 1.0.14", + "synstructure", +] + +[[package]] +name = "maybe-uninit" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" + +[[package]] +name = "memchr" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3197e20c7edb283f87c071ddfc7a2cca8f8e0b888c242959846a6fce03c72223" + +[[package]] +name = "memory-db" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dabfe0a8c69954ae3bcfc5fc14260a85fb80e1bf9f86a155f668d10a67e93dd" +dependencies = [ + "ahash", + "hash-db", + "hashbrown 0.6.3", + "parity-util-mem", +] + +[[package]] +name = "memory_units" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71d96e3f3c0b6325d8ccd83c33b28acb183edcb6c67938ba104ec546854b0882" + +[[package]] +name = "merlin" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b0942b357c1b4d0dc43ba724674ec89c3218e6ca2b3e8269e7cb53bcecd2f6e" +dependencies = [ + "byteorder", + "keccak", + "rand_core 0.4.2", + "zeroize 1.1.0", +] + +[[package]] +name = "nodrop" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" + +[[package]] +name = "num-bigint" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" +dependencies = [ + "autocfg 1.0.0", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-integer" +version = "0.1.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba" +dependencies = [ + "autocfg 1.0.0", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da4dc79f9e6c81bef96148c8f6b8e72ad4541caa4a24373e900a36da07de03a3" +dependencies = [ + "autocfg 1.0.0", + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096" +dependencies = [ + "autocfg 1.0.0", +] + +[[package]] +name = "num_enum" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be601e38e20a6f3d01049d85801cb9b7a34a8da7a0da70df507bbde7735058c8" +dependencies = [ + "derivative", + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b59f30f6a043f2606adbd0addbf1eef6f2e28e8c4968918b63b7ff97ac0db2a7" +dependencies = [ + "proc-macro-crate", + "proc-macro2 1.0.8", + "quote 1.0.2", + "syn 1.0.14", +] + +[[package]] +name = "once_cell" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "532c29a261168a45ce28948f9537ddd7a5dd272cc513b3017b1e82a88f962c37" +dependencies = [ + "parking_lot 0.7.1", +] + +[[package]] +name = "once_cell" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d584f08c2d717d5c23a6414fc2822b71c651560713e54fa7eace675f758a355e" + +[[package]] +name = "opaque-debug" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" + +[[package]] +name = "parity-scale-codec" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f747c06d9f3b2ad387ac881b9667298c81b1243aa9833f086e05996937c35507" +dependencies = [ + "arrayvec 0.5.1", + "bitvec", + "byte-slice-cast", + "parity-scale-codec-derive", + "serde", +] + +[[package]] +name = "parity-scale-codec-derive" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34e513ff3e406f3ede6796dcdc83d0b32ffb86668cea1ccf7363118abeb00476" +dependencies = [ + "proc-macro-crate", + "proc-macro2 1.0.8", + "quote 1.0.2", + "syn 1.0.14", +] + +[[package]] +name = "parity-util-mem" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "570093f39f786beea92dcc09e45d8aae7841516ac19a50431953ac82a0e8f85c" +dependencies = [ + "cfg-if", + "malloc_size_of_derive", + "winapi", +] + +[[package]] +name = "parity-wasm" +version = "0.40.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e39faaa292a687ea15120b1ac31899b13586446521df6c149e46f1584671e0f" + +[[package]] +name = "parking_lot" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337" +dependencies = [ + "lock_api 0.1.5", + "parking_lot_core 0.4.0", +] + +[[package]] +name = "parking_lot" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" +dependencies = [ + "lock_api 0.3.3", + "parking_lot_core 0.6.2", + "rustc_version", +] + +[[package]] +name = "parking_lot_core" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9" +dependencies = [ + "libc", + "rand 0.6.5", + "rustc_version", + "smallvec", + "winapi", +] + +[[package]] +name = "parking_lot_core" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" +dependencies = [ + "cfg-if", + "cloudabi", + "libc", + "redox_syscall", + "rustc_version", + "smallvec", + "winapi", +] + +[[package]] +name = "paste" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "423a519e1c6e828f1e73b720f9d9ed2fa643dce8a7737fb43235ce0b41eeaa49" +dependencies = [ + "paste-impl", + "proc-macro-hack", +] + +[[package]] +name = "paste-impl" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4214c9e912ef61bf42b81ba9a47e8aad1b2ffaf739ab162bf96d1e011f54e6c5" +dependencies = [ + "proc-macro-hack", + "proc-macro2 1.0.8", + "quote 1.0.2", + "syn 1.0.14", +] + +[[package]] +name = "pbkdf2" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "006c038a43a45995a9670da19e67600114740e8511d4333bf97a56e66a7542d9" +dependencies = [ + "byteorder", + "crypto-mac", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" + +[[package]] +name = "primitive-types" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83ef7b3b965c0eadcb6838f34f827e1dfb2939bdd5ebd43f9647e009b12b0371" +dependencies = [ + "fixed-hash", + "impl-codec", + "impl-serde", + "uint", +] + +[[package]] +name = "proc-macro-crate" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e10d4b51f154c8a7fb96fd6dad097cb74b863943ec010ac94b9fd1be8861fe1e" +dependencies = [ + "toml", +] + +[[package]] +name = "proc-macro-hack" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5" +dependencies = [ + "proc-macro2 1.0.8", + "quote 1.0.2", + "syn 1.0.14", +] + +[[package]] +name = "proc-macro2" +version = "0.4.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" +dependencies = [ + "unicode-xid 0.1.0", +] + +[[package]] +name = "proc-macro2" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548" +dependencies = [ + "unicode-xid 0.2.0", +] + +[[package]] +name = "quote" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" +dependencies = [ + "proc-macro2 0.4.30", +] + +[[package]] +name = "quote" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" +dependencies = [ + "proc-macro2 1.0.8", +] + +[[package]] +name = "rand" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9" +dependencies = [ + "cloudabi", + "fuchsia-cprng", + "libc", + "rand_core 0.3.1", + "winapi", +] + +[[package]] +name = "rand" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" +dependencies = [ + "autocfg 0.1.7", + "libc", + "rand_chacha 0.1.1", + "rand_core 0.4.2", + "rand_hc 0.1.0", + "rand_isaac", + "rand_jitter", + "rand_os", + "rand_pcg", + "rand_xorshift", + "winapi", +] + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom", + "libc", + "rand_chacha 0.2.1", + "rand_core 0.5.1", + "rand_hc 0.2.0", +] + +[[package]] +name = "rand_chacha" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" +dependencies = [ + "autocfg 0.1.7", + "rand_core 0.3.1", +] + +[[package]] +name = "rand_chacha" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" +dependencies = [ + "c2-chacha", + "rand_core 0.5.1", +] + +[[package]] +name = "rand_core" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" +dependencies = [ + "rand_core 0.4.2", +] + +[[package]] +name = "rand_core" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rand_hc" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "rand_isaac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "rand_jitter" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" +dependencies = [ + "libc", + "rand_core 0.4.2", + "winapi", +] + +[[package]] +name = "rand_os" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" +dependencies = [ + "cloudabi", + "fuchsia-cprng", + "libc", + "rand_core 0.4.2", + "rdrand", + "winapi", +] + +[[package]] +name = "rand_pcg" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" +dependencies = [ + "autocfg 0.1.7", + "rand_core 0.4.2", +] + +[[package]] +name = "rand_xorshift" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "rdrand" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "redox_syscall" +version = "0.1.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" + +[[package]] +name = "regex" +version = "1.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "322cf97724bea3ee221b78fe25ac9c46114ebb51747ad5babd51a2fc6a8235a8" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", + "thread_local", +] + +[[package]] +name = "regex-syntax" +version = "0.6.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b28dfe3fe9badec5dbf0a79a9cccad2cfc2ab5484bdb3e44cbd1ae8b3ba2be06" + +[[package]] +name = "rustc-demangle" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" + +[[package]] +name = "rustc-hex" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" + +[[package]] +name = "rustc_version" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver", +] + +[[package]] +name = "safe-mix" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d3d055a2582e6b00ed7a31c1524040aa391092bf636328350813f3a0605215c" +dependencies = [ + "rustc_version", +] + +[[package]] +name = "schnorrkel" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eacd8381b3c37840c9c9f40472af529e49975bdcbc24f83c31059fd6539023d3" +dependencies = [ + "curve25519-dalek", + "failure", + "merlin", + "rand 0.6.5", + "rand_core 0.4.2", + "rand_os", + "sha2", + "subtle 2.2.2", + "zeroize 0.9.3", +] + +[[package]] +name = "scopeguard" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" + +[[package]] +name = "scopeguard" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" + +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + +[[package]] +name = "serde" +version = "1.0.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64" +dependencies = [ + "proc-macro2 1.0.8", + "quote 1.0.2", + "syn 1.0.14", +] + +[[package]] +name = "sha2" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27044adfd2e1f077f649f59deb9490d3941d674002f7d062870a60ebe9bd47a0" +dependencies = [ + "block-buffer", + "digest", + "fake-simd", + "opaque-debug", +] + +[[package]] +name = "smallvec" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" +dependencies = [ + "maybe-uninit", +] + +[[package]] +name = "sr-api-macros" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "blake2-rfc", + "proc-macro-crate", + "proc-macro2 0.4.30", + "quote 0.6.13", + "syn 0.15.44", +] + +[[package]] +name = "sr-arithmetic" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "integer-sqrt", + "num-traits", + "parity-scale-codec", + "serde", + "sr-std", + "substrate-debug-derive", +] + +[[package]] +name = "sr-io" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "hash-db", + "libsecp256k1", + "log", + "parity-scale-codec", + "rustc_version", + "sr-std", + "substrate-externalities", + "substrate-primitives", + "substrate-state-machine", + "substrate-trie", + "tiny-keccak", +] + +[[package]] +name = "sr-primitives" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "paste", + "rand 0.7.3", + "serde", + "sr-arithmetic", + "sr-io", + "sr-std", + "substrate-application-crypto", + "substrate-primitives", +] + +[[package]] +name = "sr-staking-primitives" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "parity-scale-codec", + "sr-primitives", + "sr-std", +] + +[[package]] +name = "sr-std" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "rustc_version", +] + +[[package]] +name = "sr-version" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "impl-serde", + "parity-scale-codec", + "serde", + "sr-primitives", + "sr-std", +] + +[[package]] +name = "srml-authorship" +version = "0.1.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "impl-trait-for-tuples", + "parity-scale-codec", + "sr-io", + "sr-primitives", + "sr-std", + "srml-support", + "srml-system", + "substrate-inherents", + "substrate-primitives", +] + +[[package]] +name = "srml-balances" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "parity-scale-codec", + "safe-mix", + "serde", + "sr-primitives", + "sr-std", + "srml-support", + "srml-system", + "substrate-keyring", +] + +[[package]] +name = "srml-metadata" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "parity-scale-codec", + "serde", + "sr-std", + "substrate-primitives", +] + +[[package]] +name = "srml-session" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "impl-trait-for-tuples", + "parity-scale-codec", + "safe-mix", + "serde", + "sr-io", + "sr-primitives", + "sr-staking-primitives", + "sr-std", + "srml-support", + "srml-system", + "srml-timestamp", + "substrate-trie", +] + +[[package]] +name = "srml-staking" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "parity-scale-codec", + "safe-mix", + "serde", + "sr-io", + "sr-primitives", + "sr-staking-primitives", + "sr-std", + "srml-authorship", + "srml-session", + "srml-support", + "srml-system", + "substrate-keyring", + "substrate-phragmen", +] + +[[package]] +name = "srml-support" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "bitmask", + "impl-trait-for-tuples", + "log", + "once_cell 0.2.4", + "parity-scale-codec", + "paste", + "serde", + "sr-io", + "sr-primitives", + "sr-std", + "srml-metadata", + "srml-support-procedural", + "substrate-inherents", + "substrate-primitives", +] + +[[package]] +name = "srml-support-procedural" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "proc-macro2 0.4.30", + "quote 0.6.13", + "sr-api-macros", + "srml-support-procedural-tools", + "syn 0.15.44", +] + +[[package]] +name = "srml-support-procedural-tools" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "proc-macro-crate", + "proc-macro2 0.4.30", + "quote 0.6.13", + "srml-support-procedural-tools-derive", + "syn 0.15.44", +] + +[[package]] +name = "srml-support-procedural-tools-derive" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "proc-macro2 0.4.30", + "quote 0.6.13", + "syn 0.15.44", +] + +[[package]] +name = "srml-system" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "impl-trait-for-tuples", + "parity-scale-codec", + "safe-mix", + "serde", + "sr-io", + "sr-primitives", + "sr-std", + "sr-version", + "srml-support", + "substrate-primitives", +] + +[[package]] +name = "srml-timestamp" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "impl-trait-for-tuples", + "parity-scale-codec", + "serde", + "sr-primitives", + "sr-std", + "srml-support", + "srml-system", + "substrate-inherents", +] + +[[package]] +name = "static_assertions" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c19be23126415861cb3a23e501d34a708f7f9b2183c5252d690941c2e69199d5" + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strum" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d1c33039533f051704951680f1adfd468fd37ac46816ded0d9ee068e60f05f" + +[[package]] +name = "strum_macros" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47cd23f5c7dee395a00fa20135e2ec0fffcdfa151c56182966d7a3261343432e" +dependencies = [ + "heck", + "proc-macro2 0.4.30", + "quote 0.6.13", + "syn 0.15.44", +] + +[[package]] +name = "substrate-application-crypto" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "parity-scale-codec", + "serde", + "sr-io", + "sr-std", + "substrate-primitives", +] + +[[package]] +name = "substrate-bip39" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3be511be555a3633e71739a79e4ddff6a6aaa6579fa6114182a51d72c3eb93c5" +dependencies = [ + "hmac", + "pbkdf2", + "schnorrkel", + "sha2", +] + +[[package]] +name = "substrate-debug-derive" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "proc-macro2 1.0.8", + "quote 1.0.2", + "syn 1.0.14", +] + +[[package]] +name = "substrate-externalities" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "environmental", + "primitive-types", + "sr-std", + "substrate-primitives-storage", +] + +[[package]] +name = "substrate-inherents" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "parity-scale-codec", + "parking_lot 0.9.0", + "sr-primitives", + "sr-std", +] + +[[package]] +name = "substrate-keyring" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "lazy_static", + "sr-primitives", + "strum", + "strum_macros", + "substrate-primitives", +] + +[[package]] +name = "substrate-panic-handler" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "backtrace", + "log", +] + +[[package]] +name = "substrate-phragmen" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "sr-primitives", + "sr-std", +] + +[[package]] +name = "substrate-primitives" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "base58", + "blake2-rfc", + "byteorder", + "ed25519-dalek", + "hash-db", + "hash256-std-hasher", + "hex", + "impl-serde", + "lazy_static", + "libsecp256k1", + "log", + "num-traits", + "parity-scale-codec", + "parking_lot 0.9.0", + "primitive-types", + "rand 0.7.3", + "regex", + "rustc-hex", + "schnorrkel", + "serde", + "sha2", + "sr-std", + "substrate-bip39", + "substrate-debug-derive", + "substrate-externalities", + "substrate-primitives-storage", + "tiny-bip39", + "tiny-keccak", + "twox-hash", + "wasmi", + "zeroize 0.10.1", +] + +[[package]] +name = "substrate-primitives-storage" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "impl-serde", + "serde", + "sr-std", + "substrate-debug-derive", +] + +[[package]] +name = "substrate-proposals-engine-module" +version = "2.0.0" +dependencies = [ + "num_enum", + "parity-scale-codec", + "serde", + "sr-io", + "sr-primitives", + "sr-staking-primitives", + "sr-std", + "srml-balances", + "srml-staking", + "srml-support", + "srml-system", + "srml-timestamp", + "substrate-primitives", +] + +[[package]] +name = "substrate-state-machine" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "hash-db", + "log", + "num-traits", + "parity-scale-codec", + "parking_lot 0.9.0", + "rand 0.7.3", + "substrate-externalities", + "substrate-panic-handler", + "substrate-primitives", + "substrate-trie", + "trie-db", + "trie-root", +] + +[[package]] +name = "substrate-trie" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +dependencies = [ + "hash-db", + "memory-db", + "parity-scale-codec", + "sr-std", + "substrate-primitives", + "trie-db", + "trie-root", +] + +[[package]] +name = "subtle" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" + +[[package]] +name = "subtle" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c65d530b10ccaeac294f349038a597e435b18fb456aadd0840a623f83b9e941" + +[[package]] +name = "syn" +version = "0.15.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" +dependencies = [ + "proc-macro2 0.4.30", + "quote 0.6.13", + "unicode-xid 0.1.0", +] + +[[package]] +name = "syn" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5" +dependencies = [ + "proc-macro2 1.0.8", + "quote 1.0.2", + "unicode-xid 0.2.0", +] + +[[package]] +name = "synstructure" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" +dependencies = [ + "proc-macro2 1.0.8", + "quote 1.0.2", + "syn 1.0.14", + "unicode-xid 0.2.0", +] + +[[package]] +name = "thread_local" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "tiny-bip39" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1c5676413eaeb1ea35300a0224416f57abc3bd251657e0fafc12c47ff98c060" +dependencies = [ + "failure", + "hashbrown 0.1.8", + "hmac", + "once_cell 0.1.8", + "pbkdf2", + "rand 0.6.5", + "sha2", +] + +[[package]] +name = "tiny-keccak" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d8a021c69bb74a44ccedb824a046447e2c84a01df9e5c20779750acb38e11b2" +dependencies = [ + "crunchy", +] + +[[package]] +name = "toml" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" +dependencies = [ + "serde", +] + +[[package]] +name = "trie-db" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0b62d27e8aa1c07414549ac872480ac82380bab39e730242ab08d82d7cc098a" +dependencies = [ + "elastic-array", + "hash-db", + "hashbrown 0.6.3", + "log", + "rand 0.6.5", +] + +[[package]] +name = "trie-root" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b779f7c1c8fe9276365d9d5be5c4b5adeacf545117bb3f64c974305789c5c0b" +dependencies = [ + "hash-db", +] + +[[package]] +name = "twox-hash" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bfd5b7557925ce778ff9b9ef90e3ade34c524b5ff10e239c69a42d546d2af56" +dependencies = [ + "rand 0.7.3", +] + +[[package]] +name = "typenum" +version = "1.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9" + +[[package]] +name = "uint" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e75a4cdd7b87b28840dba13c483b9a88ee6bbf16ba5c951ee1ecfcf723078e0d" +dependencies = [ + "byteorder", + "crunchy", + "rustc-hex", + "static_assertions 1.1.0", +] + +[[package]] +name = "unicode-segmentation" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" + +[[package]] +name = "unicode-xid" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" + +[[package]] +name = "unicode-xid" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "wasmi" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31d26deb2d9a37e6cfed420edce3ed604eab49735ba89035e13c98f9a528313" +dependencies = [ + "libc", + "memory_units", + "num-rational", + "num-traits", + "parity-wasm", + "wasmi-validation", +] + +[[package]] +name = "wasmi-validation" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bc0356e3df56e639fc7f7d8a99741915531e27ed735d911ed83d7e1339c8188" +dependencies = [ + "parity-wasm", +] + +[[package]] +name = "winapi" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "zeroize" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45af6a010d13e4cf5b54c94ba5a2b2eba5596b9e46bf5875612d332a1f2b3f86" + +[[package]] +name = "zeroize" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4090487fa66630f7b166fba2bbb525e247a5449f41c468cc1d98f8ae6ac03120" + +[[package]] +name = "zeroize" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cbac2ed2ba24cc90f5e06485ac8c7c1e5449fe8911aef4d8877218af021a5b8" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de251eec69fc7c1bc3923403d18ececb929380e016afe103da75f396704f8ca2" +dependencies = [ + "proc-macro2 1.0.8", + "quote 1.0.2", + "syn 1.0.14", + "synstructure", +] diff --git a/modules/proposals/engine/Cargo.toml b/modules/proposals/engine/Cargo.toml new file mode 100644 index 0000000000..6656e695ac --- /dev/null +++ b/modules/proposals/engine/Cargo.toml @@ -0,0 +1,98 @@ +[package] +name = 'substrate-proposals-engine-module' +version = '2.0.0' +authors = ['Joystream contributors'] +edition = '2018' + +[features] +default = ['std'] +no_std = [] +std = [ + 'sr-staking-primitives/std', + 'staking/std', + 'codec/std', + 'rstd/std', + 'srml-support/std', + 'balances/std', + 'primitives/std', + 'runtime-primitives/std', + 'system/std', + 'timestamp/std', + 'serde', +] + + +[dependencies.num_enum] +default_features = false +version = "0.4.2" + +[dependencies.serde] +features = ['derive'] +optional = true +version = '1.0.101' + +[dependencies.codec] +default-features = false +features = ['derive'] +package = 'parity-scale-codec' +version = '1.0.0' + +[dependencies.primitives] +default_features = false +git = 'https://github.com/paritytech/substrate.git' +package = 'substrate-primitives' +rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' + +[dependencies.rstd] +default_features = false +git = 'https://github.com/paritytech/substrate.git' +package = 'sr-std' +rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' + +[dependencies.runtime-primitives] +default_features = false +git = 'https://github.com/paritytech/substrate.git' +package = 'sr-primitives' +rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' + +[dependencies.sr-staking-primitives] +default_features = false +git = 'https://github.com/paritytech/substrate.git' +package = 'sr-staking-primitives' +rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' + +[dependencies.srml-support] +default_features = false +git = 'https://github.com/paritytech/substrate.git' +package = 'srml-support' +rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' + +[dependencies.system] +default_features = false +git = 'https://github.com/paritytech/substrate.git' +package = 'srml-system' +rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' + +[dependencies.timestamp] +default_features = false +git = 'https://github.com/paritytech/substrate.git' +package = 'srml-timestamp' +rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' + +[dependencies.staking] +default_features = false +git = 'https://github.com/paritytech/substrate.git' +package = 'srml-staking' +rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' + +[dependencies.balances] +default_features = false +git = 'https://github.com/paritytech/substrate.git' +package = 'srml-balances' +rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' + +[dev-dependencies.runtime-io] +default_features = false +git = 'https://github.com/paritytech/substrate.git' +package = 'sr-io' +rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' diff --git a/modules/proposals/engine/src/errors.rs b/modules/proposals/engine/src/errors.rs new file mode 100644 index 0000000000..602e6ddf98 --- /dev/null +++ b/modules/proposals/engine/src/errors.rs @@ -0,0 +1,17 @@ +pub const MSG_EMPTY_TITLE_PROVIDED: &str = "Proposal cannot have an empty title"; +pub const MSG_EMPTY_BODY_PROVIDED: &str = "Proposal cannot have an empty body"; +pub const MSG_TOO_LONG_TITLE: &str = "Title is too long"; +pub const MSG_TOO_LONG_BODY: &str = "Body is too long"; +pub const MSG_PROPOSAL_NOT_FOUND: &str = "This proposal does not exist"; +pub const MSG_PROPOSAL_EXPIRED: &str = "Voting period is expired for this proposal"; +pub const MSG_PROPOSAL_FINALIZED: &str = "Proposal is finalized already"; +pub const MSG_YOU_ALREADY_VOTED: &str = "You have already voted on this proposal"; +pub const MSG_YOU_DONT_OWN_THIS_PROPOSAL: &str = "You do not own this proposal"; + +//pub const MSG_STAKE_IS_TOO_LOW: &str = "Stake is too low"; +//pub const MSG_STAKE_IS_GREATER_THAN_BALANCE: &str = "Balance is too low to be staked"; +//pub const MSG_ONLY_MEMBERS_CAN_PROPOSE: &str = "Only members can make a proposal"; +//pub const MSG_ONLY_COUNCILORS_CAN_VOTE: &str = "Only councilors can vote on proposals"; +//pub const MSG_PROPOSAL_STATUS_ALREADY_UPDATED: &str = "Proposal status has been updated already"; +//pub const MSG_EMPTY_WASM_CODE_PROVIDED: &str = "Proposal cannot have an empty WASM code"; +//pub const MSG_TOO_LONG_WASM_CODE: &str = "WASM code is too big"; diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs new file mode 100644 index 0000000000..04b641baea --- /dev/null +++ b/modules/proposals/engine/src/lib.rs @@ -0,0 +1,348 @@ +//! Proposals engine module for the Joystream platform. Version 2. +//! Provides methods and extrinsics to create and vote for proposals. +//! +//! Supported extrinsics: +//! - vote +//! - cancel_proposal +//! - veto_proposal +//! +//! Public API (requires root origin): +//! - create_proposal +//! + +// Ensure we're `no_std` when compiling for Wasm. +#![cfg_attr(not(feature = "std"), no_std)] + +// Do not delete! Cannot be uncommented by default, because of Parity decl_module! issue. +//#![warn(missing_docs)] + +pub use types::TallyResult; +pub use types::{Proposal, ProposalParameters, ProposalStatus}; +pub use types::{ProposalCodeDecoder, ProposalExecutable}; +pub use types::{Vote, VoteKind, VotersParameters}; + +mod errors; +mod types; + +#[cfg(test)] +mod tests; + +use rstd::collections::btree_set::BTreeSet; +use rstd::prelude::*; +use runtime_primitives::traits::EnsureOrigin; +use srml_support::{decl_event, decl_module, decl_storage, dispatch, ensure, StorageDoubleMap}; +use system::ensure_root; + +const DEFAULT_TITLE_MAX_LEN: u32 = 100; +const DEFAULT_BODY_MAX_LEN: u32 = 10_000; + +/// Proposals engine trait. +pub trait Trait: system::Trait + timestamp::Trait { + /// Engine event type. + type Event: From> + Into<::Event>; + + /// Origin from which proposals must come. + type ProposalOrigin: EnsureOrigin; + + /// Origin from which votes must come. + type VoteOrigin: EnsureOrigin; + + /// Provides data for voting. Defines maximum voters count for the proposal. + type TotalVotersCounter: VotersParameters; + + /// Converts proposal code binary to executable representation + type ProposalCodeDecoder: ProposalCodeDecoder; +} + +decl_event!( + pub enum Event + where + ::AccountId + { + /// Emits on proposal creation. + /// Params: + /// * Account id of a proposer. + /// * Id of a newly created proposal after it was saved in storage. + ProposalCreated(AccountId, u32), + + /// Emits on proposal cancellation. + /// Params: + /// * Account id of a proposer. + /// * Id of a cancelled proposal. + ProposalCanceled(AccountId, u32), + + /// Emits on proposal veto. + /// Params: + /// * Id of a vetoed proposal. + ProposalVetoed(u32), + + /// Emits on proposal status change. + /// Params: + /// * Id of a updated proposal. + /// * New proposal status + ProposalStatusUpdated(u32, ProposalStatus), + + /// Emits on voting for the proposal + /// Params: + /// * Voter - an account id of a voter. + /// * Id of a proposal. + /// * Kind of vote. + Voted(AccountId, u32, VoteKind), + } +); + +// Storage for the proposals module +decl_storage! { + trait Store for Module as ProposalsEngine{ + /// Map proposal by its id. + pub Proposals get(fn proposals): map u32 => Proposal; + + /// Count of all proposals that have been created. + pub ProposalCount get(fn proposal_count): u32; + + /// Map proposal executable code by proposal id. + ProposalCode get(fn proposal_codes): map u32 => Vec; + + /// Map votes by proposal id. + VotesByProposalId get(fn votes_by_proposal): map u32 => Vec>; + + /// Ids of proposals that are open for voting (have not been finalized yet). + pub ActiveProposalIds get(fn active_proposal_ids): BTreeSet; + + /// Proposal tally results map + pub(crate) TallyResults get(fn tally_results): map u32 => TallyResult; + + /// Double map for preventing duplicate votes + VoteExistsByAccountByProposal get(fn vote_by_proposal_by_account): + double_map T::AccountId, twox_256(u32) => (); + + + /// Defines max allowed proposal title length. Can be configured. + TitleMaxLen get(title_max_len) config(): u32 = DEFAULT_TITLE_MAX_LEN; + + /// Defines max allowed proposal body length. Can be configured. + BodyMaxLen get(body_max_len) config(): u32 = DEFAULT_BODY_MAX_LEN; + } +} + +decl_module! { + /// 'Proposal engine' substrate module + pub struct Module for enum Call where origin: T::Origin { + + /// Emits an event. Default substrate implementation. + fn deposit_event() = default; + + /// Vote extrinsic. Conditions: origin must allow votes. + pub fn vote(origin, proposal_id: u32, vote: VoteKind) { + let voter_id = T::VoteOrigin::ensure_origin(origin)?; + + ensure!(>::exists(proposal_id), errors::MSG_PROPOSAL_NOT_FOUND); + let proposal = Self::proposals(proposal_id); + + let not_expired = !proposal.is_voting_period_expired(Self::current_block()); + ensure!(not_expired, errors::MSG_PROPOSAL_EXPIRED); + + ensure!(proposal.status == ProposalStatus::Active, errors::MSG_PROPOSAL_FINALIZED); + + let did_not_vote_before = !>::exists( + voter_id.clone(), + proposal_id + ); + + ensure!(did_not_vote_before, errors::MSG_YOU_ALREADY_VOTED); + + let new_vote = Vote { + voter_id: voter_id.clone(), + vote_kind: vote.clone(), + }; + + // mutation + + >::mutate(proposal_id, |votes| votes.push(new_vote)); + >::insert(voter_id.clone(), proposal_id, ()); + Self::deposit_event(RawEvent::Voted(voter_id, proposal_id, vote)); + } + + /// Cancel a proposal by its original proposer. + pub fn cancel_proposal(origin, proposal_id: u32) { + let proposer_id = T::ProposalOrigin::ensure_origin(origin)?; + + ensure!(>::exists(proposal_id), errors::MSG_PROPOSAL_NOT_FOUND); + let proposal = Self::proposals(proposal_id); + + ensure!(proposer_id == proposal.proposer_id, errors::MSG_YOU_DONT_OWN_THIS_PROPOSAL); + ensure!(proposal.status == ProposalStatus::Active, errors::MSG_PROPOSAL_FINALIZED); + + // mutation + + Self::update_proposal_status(proposal_id, ProposalStatus::Canceled); + Self::deposit_event(RawEvent::ProposalCanceled(proposer_id, proposal_id)); + } + + /// Veto a proposal. Must be root. + pub fn veto_proposal(origin, proposal_id: u32) { + ensure_root(origin)?; + + ensure!(>::exists(proposal_id), errors::MSG_PROPOSAL_NOT_FOUND); + let proposal = Self::proposals(proposal_id); + + ensure!(proposal.status == ProposalStatus::Active, errors::MSG_PROPOSAL_FINALIZED); + + // mutation + + Self::update_proposal_status(proposal_id, ProposalStatus::Vetoed); + Self::deposit_event(RawEvent::ProposalVetoed(proposal_id)); + } + + /// Block finalization. Perform voting period check and vote result tally. + fn on_finalize(_n: T::BlockNumber) { + let tally_results = Self::tally(); + + // mutation + + for tally_result in tally_results { + >::insert(tally_result.proposal_id, &tally_result); + + Self::update_proposal_status(tally_result.proposal_id, tally_result.status); + } + } + } +} + +impl Module { + /// Create proposal. Requires 'proposal origin' membership. + pub fn create_proposal( + origin: T::Origin, + parameters: ProposalParameters, + title: Vec, + body: Vec, + proposal_type: u32, + proposal_code: Vec, + ) -> dispatch::Result { + let proposer_id = T::ProposalOrigin::ensure_origin(origin)?; + + ensure!(!title.is_empty(), errors::MSG_EMPTY_TITLE_PROVIDED); + ensure!( + title.len() as u32 <= Self::title_max_len(), + errors::MSG_TOO_LONG_TITLE + ); + + ensure!(!body.is_empty(), errors::MSG_EMPTY_BODY_PROVIDED); + ensure!( + body.len() as u32 <= Self::body_max_len(), + errors::MSG_TOO_LONG_BODY + ); + + let next_proposal_count_value = Self::proposal_count() + 1; + let new_proposal_id = next_proposal_count_value; + + let new_proposal = Proposal { + created: Self::current_block(), + parameters, + title, + body, + proposer_id: proposer_id.clone(), + proposal_type, + status: ProposalStatus::Active, + }; + + // mutation + >::insert(new_proposal_id, new_proposal); + ::insert(new_proposal_id, proposal_code); + ActiveProposalIds::mutate(|ids| ids.insert(new_proposal_id)); + ProposalCount::put(next_proposal_count_value); + + Self::deposit_event(RawEvent::ProposalCreated(proposer_id, new_proposal_id)); + + Ok(()) + } +} + +impl Module { + // Wrapper-function over system::block_number() + fn current_block() -> T::BlockNumber { + >::block_number() + } + + // Executes approved proposal code + fn execute_proposal(proposal_id: u32) { + //let origin = system::RawOrigin::Root.into(); + let proposal = Self::proposals(proposal_id); + let proposal_code = Self::proposal_codes(proposal_id); + + let proposal_code_result = + T::ProposalCodeDecoder::decode_proposal(proposal.proposal_type, proposal_code); + + let new_proposal_status = match proposal_code_result { + Ok(proposal_code) => { + if let Err(error) = proposal_code.execute() { + ProposalStatus::Failed { + error: error.as_bytes().to_vec(), + } + } else { + ProposalStatus::Executed + } + } + Err(error) => ProposalStatus::Failed { + error: error.as_bytes().to_vec(), + }, + }; + + Self::update_proposal_status(proposal_id, new_proposal_status) + } + + /// Voting results tally. + /// Returns proposals with changed status and tally results + fn tally() -> Vec> { + let mut results = Vec::new(); + for &proposal_id in Self::active_proposal_ids().iter() { + let votes = Self::votes_by_proposal(proposal_id); + let proposal = Self::proposals(proposal_id); + + if let Some(tally_result) = proposal.tally_results( + proposal_id, + votes, + T::TotalVotersCounter::total_voters_count(), + Self::current_block(), + ) { + results.push(tally_result); + } + } + + results + } + + /// Updates proposal status and removes proposal id from active id set. + fn update_proposal_status(proposal_id: u32, new_status: ProposalStatus) { + >::mutate(proposal_id, |p| p.status = new_status.clone()); + ActiveProposalIds::mutate(|ids| ids.remove(&proposal_id)); + + Self::deposit_event(RawEvent::ProposalStatusUpdated( + proposal_id, + new_status.clone(), + )); + + match new_status { + ProposalStatus::Rejected | ProposalStatus::Expired => { + Self::reject_proposal(proposal_id) + } + ProposalStatus::Approved => Self::approve_proposal(proposal_id), + ProposalStatus::Active => { + // restore active proposal id + ActiveProposalIds::mutate(|ids| ids.insert(proposal_id)); + } + ProposalStatus::Executed + | ProposalStatus::Failed { .. } + | ProposalStatus::Vetoed + | ProposalStatus::Canceled => {} // do nothing + } + } + + /// Reject a proposal. The staked deposit will be returned to a proposer. + fn reject_proposal(_proposal_id: u32) {} + + /// Approve a proposal. The staked deposit will be returned. + fn approve_proposal(proposal_id: u32) { + Self::execute_proposal(proposal_id); + } +} diff --git a/modules/proposals/engine/src/tests/mock.rs b/modules/proposals/engine/src/tests/mock.rs new file mode 100644 index 0000000000..462fa912af --- /dev/null +++ b/modules/proposals/engine/src/tests/mock.rs @@ -0,0 +1,210 @@ +#![cfg(test)] + +pub use system; + +pub use primitives::{Blake2Hasher, H256}; +pub use runtime_primitives::{ + testing::{Digest, DigestItem, Header, UintAuthorityId}, + traits::{BlakeTwo256, Convert, IdentityLookup, OnFinalize}, + weights::Weight, + BuildStorage, Perbill, +}; + +use crate::VotersParameters; +use srml_support::{impl_outer_dispatch, impl_outer_event, impl_outer_origin, parameter_types}; + +impl_outer_origin! { + pub enum Origin for Test {} +} + +// Workaround for https://github.com/rust-lang/rust/issues/26925 . Remove when sorted. +#[derive(Clone, PartialEq, Eq, Debug)] +pub struct Test; +parameter_types! { + pub const BlockHashCount: u64 = 250; + pub const MaximumBlockWeight: u32 = 1024; + pub const MaximumBlockLength: u32 = 2 * 1024; + pub const AvailableBlockRatio: Perbill = Perbill::one(); + pub const MinimumPeriod: u64 = 5; +} + +impl_outer_dispatch! { + pub enum Call for Test where origin: Origin { + proposals::ProposalsEngine, + } +} + +mod engine { + pub use crate::Event; +} + +impl_outer_event! { + pub enum TestEvent for Test { + balances, engine, + } +} + +impl crate::Trait for Test { + type Event = TestEvent; + + type ProposalOrigin = system::EnsureSigned; + + type VoteOrigin = system::EnsureSigned; + + type TotalVotersCounter = (); + + type ProposalCodeDecoder = ProposalType; +} + +impl VotersParameters for () { + fn total_voters_count() -> u32 { + 4 + } +} + +impl system::Trait for Test { + type Origin = Origin; + type Index = u64; + type BlockNumber = u64; + type Call = (); + type Hash = H256; + type Hashing = BlakeTwo256; + type AccountId = u64; + type Lookup = IdentityLookup; + type Header = Header; + type Event = TestEvent; + type BlockHashCount = BlockHashCount; + type MaximumBlockWeight = MaximumBlockWeight; + type MaximumBlockLength = MaximumBlockLength; + type AvailableBlockRatio = AvailableBlockRatio; + type Version = (); +} + +impl timestamp::Trait for Test { + type Moment = u64; + type OnTimestampSet = (); + type MinimumPeriod = MinimumPeriod; +} + +parameter_types! { + pub const ExistentialDeposit: u32 = 0; + pub const TransferFee: u32 = 0; + pub const CreationFee: u32 = 0; + pub const TransactionBaseFee: u32 = 1; + pub const TransactionByteFee: u32 = 0; + pub const InitialMembersBalance: u32 = 0; +} + +impl balances::Trait for Test { + /// The type for recording an account's balance. + type Balance = u64; + /// What to do if an account's free balance gets zeroed. + type OnFreeBalanceZero = (); + /// What to do if a new account is created. + type OnNewAccount = (); + + type Event = TestEvent; + + type DustRemoval = (); + type TransferPayment = (); + type ExistentialDeposit = ExistentialDeposit; + type TransferFee = TransferFee; + type CreationFee = CreationFee; +} + +// TODO add a Hook type to capture TriggerElection and CouncilElected hooks + +// This function basically just builds a genesis storage key/value store according to +// our desired mockup. +pub fn initial_test_ext() -> runtime_io::TestExternalities { + let t = system::GenesisConfig::default() + .build_storage::() + .unwrap(); + + t.into() +} + +pub type ProposalsEngine = crate::Module; +pub type System = system::Module; + +use codec::{Decode, Encode}; +use num_enum::{IntoPrimitive, TryFromPrimitive}; +use rstd::convert::TryFrom; +use rstd::prelude::*; + +use srml_support::dispatch; + +use crate::{ProposalCodeDecoder, ProposalExecutable}; + +/// Defines allowed proposals types. Integer value serves as proposal_type_id. +#[derive(Debug, Eq, PartialEq, TryFromPrimitive, IntoPrimitive)] +#[repr(u32)] +pub enum ProposalType { + /// Dummy(Text) proposal type + Dummy = 1, + + /// Testing proposal type for faults + Faulty = 10001, +} + +impl ProposalType { + fn compose_executable( + &self, + proposal_data: Vec, + ) -> Result, &'static str> { + match self { + ProposalType::Dummy => DummyExecutable::decode(&mut &proposal_data[..]) + .map_err(|err| err.what()) + .map(|obj| Box::new(obj) as Box), + ProposalType::Faulty => FaultyExecutable::decode(&mut &proposal_data[..]) + .map_err(|err| err.what()) + .map(|obj| Box::new(obj) as Box), + } + } +} + +impl ProposalCodeDecoder for ProposalType { + fn decode_proposal( + proposal_type: u32, + proposal_code: Vec, + ) -> Result, &'static str> { + Self::try_from(proposal_type) + .map_err(|_| "Unsupported proposal type")? + .compose_executable(proposal_code) + } +} + +/// Testing proposal type +#[derive(Encode, Decode, Clone, PartialEq, Eq, Debug, Default)] +pub struct DummyExecutable { + pub title: Vec, + pub body: Vec, +} + +impl DummyExecutable { + pub fn proposal_type(&self) -> u32 { + ProposalType::Dummy.into() + } +} + +impl ProposalExecutable for DummyExecutable { + fn execute(&self) -> dispatch::Result { + Ok(()) + } +} + +/// Faulty proposal executable code wrapper. Used for failed proposal execution tests. +#[derive(Encode, Decode, Clone, PartialEq, Eq, Debug, Default)] +pub struct FaultyExecutable; +impl ProposalExecutable for FaultyExecutable { + fn execute(&self) -> dispatch::Result { + Err("Failed") + } +} + +impl FaultyExecutable { + /// Converts faulty proposal type to proposal_type_id + pub fn proposal_type(&self) -> u32 { + ProposalType::Faulty.into() + } +} diff --git a/modules/proposals/engine/src/tests/mod.rs b/modules/proposals/engine/src/tests/mod.rs new file mode 100644 index 0000000000..d76585358d --- /dev/null +++ b/modules/proposals/engine/src/tests/mod.rs @@ -0,0 +1,742 @@ +mod mock; + +use crate::*; +use mock::*; + +use codec::Encode; +use rstd::collections::btree_set::BTreeSet; +use runtime_primitives::traits::{OnFinalize, OnInitialize}; +use srml_support::{dispatch, StorageMap, StorageValue}; +use system::RawOrigin; +use system::{EventRecord, Phase}; + +struct DummyProposalFixture { + parameters: ProposalParameters, + origin: RawOrigin, + proposal_type: u32, + proposal_code: Vec, + title: Vec, + body: Vec, +} + +impl Default for DummyProposalFixture { + fn default() -> Self { + let dummy_proposal = DummyExecutable { + title: b"title".to_vec(), + body: b"body".to_vec(), + }; + + DummyProposalFixture { + parameters: ProposalParameters { + voting_period: 3, + approval_quorum_percentage: 60, + }, + origin: RawOrigin::Signed(1), + proposal_type: dummy_proposal.proposal_type(), + proposal_code: dummy_proposal.encode(), + title: dummy_proposal.title, + body: dummy_proposal.body, + } + } +} + +impl DummyProposalFixture { + fn with_title_and_body(self, title: Vec, body: Vec) -> Self { + DummyProposalFixture { + title, + body, + ..self + } + } + + fn with_parameters(self, parameters: ProposalParameters) -> Self { + DummyProposalFixture { parameters, ..self } + } + + fn with_origin(self, origin: RawOrigin) -> Self { + DummyProposalFixture { origin, ..self } + } + + fn with_proposal_type_and_code(self, proposal_type: u32, proposal_code: Vec) -> Self { + DummyProposalFixture { + proposal_type, + proposal_code, + ..self + } + } + + fn create_proposal_and_assert(self, result: dispatch::Result) { + assert_eq!( + ProposalsEngine::create_proposal( + self.origin.into(), + self.parameters, + self.title, + self.body, + self.proposal_type, + self.proposal_code, + ), + result + ); + } +} + +struct CancelProposalFixture { + origin: RawOrigin, + proposal_id: u32, +} + +impl CancelProposalFixture { + fn new(proposal_id: u32) -> Self { + CancelProposalFixture { + proposal_id, + origin: RawOrigin::Signed(1), + } + } + + fn with_origin(self, origin: RawOrigin) -> Self { + CancelProposalFixture { origin, ..self } + } + + fn cancel_and_assert(self, expected_result: dispatch::Result) { + assert_eq!( + ProposalsEngine::cancel_proposal(self.origin.into(), self.proposal_id,), + expected_result + ); + } +} +struct VetoProposalFixture { + origin: RawOrigin, + proposal_id: u32, +} + +impl VetoProposalFixture { + fn new(proposal_id: u32) -> Self { + VetoProposalFixture { + proposal_id, + origin: RawOrigin::Root, + } + } + + fn with_origin(self, origin: RawOrigin) -> Self { + VetoProposalFixture { origin, ..self } + } + + fn veto_and_assert(self, expected_result: dispatch::Result) { + assert_eq!( + ProposalsEngine::veto_proposal(self.origin.into(), self.proposal_id,), + expected_result + ); + } +} + +struct VoteGenerator { + proposal_id: u32, + current_account_id: u64, + pub auto_increment_voter_id: bool, +} + +impl VoteGenerator { + fn new(proposal_id: u32) -> Self { + VoteGenerator { + proposal_id, + current_account_id: 0, + auto_increment_voter_id: true, + } + } + fn vote_and_assert_ok(&mut self, vote_kind: VoteKind) { + assert_eq!(self.vote(vote_kind), Ok(())); + } + + fn vote_and_assert(&mut self, vote_kind: VoteKind, expected_result: dispatch::Result) { + assert_eq!(self.vote(vote_kind), expected_result); + } + + fn vote(&mut self, vote_kind: VoteKind) -> dispatch::Result { + if self.auto_increment_voter_id { + self.current_account_id += 1; + } + + ProposalsEngine::vote( + system::RawOrigin::Signed(self.current_account_id).into(), + self.proposal_id, + vote_kind, + ) + } +} + +struct EventFixture; +impl EventFixture { + fn assert_events(expected_raw_events: Vec>) { + let expected_events = expected_raw_events + .iter() + .map(|ev| EventRecord { + phase: Phase::ApplyExtrinsic(0), + event: TestEvent::engine(ev.clone()), + topics: vec![], + }) + .collect::>>(); + + assert_eq!(System::events(), expected_events); + } +} + +// Recommendation from Parity on testing on_finalize +// https://substrate.dev/docs/en/next/development/module/tests +fn run_to_block(n: u64) { + while System::block_number() < n { + >::on_finalize(System::block_number()); + >::on_finalize(System::block_number()); + System::set_block_number(System::block_number() + 1); + >::on_initialize(System::block_number()); + >::on_initialize(System::block_number()); + } +} + +fn run_to_block_and_finalize(n: u64) { + run_to_block(n); + >::on_finalize(n); +} + +#[test] +fn create_dummy_proposal_succeeds() { + initial_test_ext().execute_with(|| { + let dummy_proposal = DummyProposalFixture::default(); + + dummy_proposal.create_proposal_and_assert(Ok(())); + }); +} + +#[test] +fn create_dummy_proposal_fails_with_insufficient_rights() { + initial_test_ext().execute_with(|| { + let dummy_proposal = DummyProposalFixture::default().with_origin(RawOrigin::None); + + dummy_proposal.create_proposal_and_assert(Err("Invalid origin")); + }); +} + +#[test] +fn vote_succeeds() { + initial_test_ext().execute_with(|| { + let dummy_proposal = DummyProposalFixture::default(); + dummy_proposal.create_proposal_and_assert(Ok(())); + + // last created proposal id equals current proposal count + let proposal_id = ::get(); + + let mut vote_generator = VoteGenerator::new(proposal_id); + vote_generator.vote_and_assert_ok(VoteKind::Approve); + }); +} + +#[test] +fn vote_fails_with_insufficient_rights() { + initial_test_ext().execute_with(|| { + assert_eq!( + ProposalsEngine::vote(system::RawOrigin::None.into(), 1, VoteKind::Approve), + Err("Invalid origin") + ); + }); +} + +#[test] +fn proposal_execution_succeeds() { + initial_test_ext().execute_with(|| { + let parameters = ProposalParameters { + voting_period: 3, + approval_quorum_percentage: 60, + }; + + let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters); + dummy_proposal.create_proposal_and_assert(Ok(())); + + // last created proposal id equals current proposal count + let proposals_id = ::get(); + + let mut vote_generator = VoteGenerator::new(proposals_id); + vote_generator.vote_and_assert_ok(VoteKind::Approve); + vote_generator.vote_and_assert_ok(VoteKind::Approve); + vote_generator.vote_and_assert_ok(VoteKind::Approve); + vote_generator.vote_and_assert_ok(VoteKind::Approve); + + run_to_block_and_finalize(2); + + let proposal = >::get(proposals_id); + + assert_eq!( + proposal, + Proposal { + proposal_type: 1, + parameters, + proposer_id: 1, + created: 1, + status: ProposalStatus::Executed, + title: b"title".to_vec(), + body: b"body".to_vec(), + } + ) + }); +} + +#[test] +fn proposal_execution_failed() { + initial_test_ext().execute_with(|| { + let parameters = ProposalParameters { + voting_period: 3, + approval_quorum_percentage: 60, + }; + + let faulty_proposal = FaultyExecutable; + + let dummy_proposal = DummyProposalFixture::default() + .with_parameters(parameters) + .with_proposal_type_and_code(faulty_proposal.proposal_type(), faulty_proposal.encode()); + + dummy_proposal.create_proposal_and_assert(Ok(())); + + // last created proposal id equals current proposal count + let proposals_id = ::get(); + + let mut vote_generator = VoteGenerator::new(proposals_id); + vote_generator.vote_and_assert_ok(VoteKind::Approve); + vote_generator.vote_and_assert_ok(VoteKind::Approve); + vote_generator.vote_and_assert_ok(VoteKind::Approve); + vote_generator.vote_and_assert_ok(VoteKind::Approve); + + run_to_block_and_finalize(2); + + let proposal = >::get(proposals_id); + + assert_eq!( + proposal, + Proposal { + proposal_type: faulty_proposal.proposal_type(), + parameters, + proposer_id: 1, + created: 1, + status: ProposalStatus::Failed { + error: "Failed".as_bytes().to_vec() + }, + title: b"title".to_vec(), + body: b"body".to_vec(), + } + ) + }); +} + +#[test] +fn tally_calculation_succeeds() { + initial_test_ext().execute_with(|| { + let parameters = ProposalParameters { + voting_period: 3, + approval_quorum_percentage: 49, + }; + + let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters); + dummy_proposal.create_proposal_and_assert(Ok(())); + + // last created proposal id equals current proposal count + let proposals_id = ::get(); + + let mut vote_generator = VoteGenerator::new(proposals_id); + vote_generator.vote_and_assert_ok(VoteKind::Approve); + vote_generator.vote_and_assert_ok(VoteKind::Approve); + vote_generator.vote_and_assert_ok(VoteKind::Reject); + vote_generator.vote_and_assert_ok(VoteKind::Abstain); + + run_to_block_and_finalize(2); + + let tally_result = >::get(proposals_id); + + assert_eq!( + tally_result, + TallyResult { + proposal_id: proposals_id, + abstentions: 1, + approvals: 2, + rejections: 1, + status: ProposalStatus::Approved, + finalized_at: 1 + } + ) + }); +} + +#[test] +fn rejected_tally_results_and_remove_proposal_id_from_active_succeeds() { + initial_test_ext().execute_with(|| { + let dummy_proposal = DummyProposalFixture::default(); + dummy_proposal.create_proposal_and_assert(Ok(())); + + // last created proposal id equals current proposal count + let proposal_id = ::get(); + + let mut vote_generator = VoteGenerator::new(proposal_id); + vote_generator.vote_and_assert_ok(VoteKind::Reject); + vote_generator.vote_and_assert_ok(VoteKind::Reject); + vote_generator.vote_and_assert_ok(VoteKind::Abstain); + vote_generator.vote_and_assert_ok(VoteKind::Abstain); + + let mut active_proposals_id = ::get(); + + let mut active_proposals_set = BTreeSet::new(); + active_proposals_set.insert(proposal_id); + assert_eq!(active_proposals_id, active_proposals_set); + + run_to_block_and_finalize(2); + + let tally_result = >::get(proposal_id); + + assert_eq!( + tally_result, + TallyResult { + proposal_id, + abstentions: 2, + approvals: 0, + rejections: 2, + status: ProposalStatus::Rejected, + finalized_at: 1 + } + ); + + active_proposals_id = ::get(); + assert_eq!(active_proposals_id, BTreeSet::new()); + }); +} + +#[test] +fn create_proposal_fails_with_invalid_body_or_title() { + initial_test_ext().execute_with(|| { + let mut dummy_proposal = + DummyProposalFixture::default().with_title_and_body(Vec::new(), b"body".to_vec()); + dummy_proposal.create_proposal_and_assert(Err("Proposal cannot have an empty title")); + + dummy_proposal = + DummyProposalFixture::default().with_title_and_body(b"title".to_vec(), Vec::new()); + dummy_proposal.create_proposal_and_assert(Err("Proposal cannot have an empty body")); + + let too_long_title = vec![0; 200]; + dummy_proposal = + DummyProposalFixture::default().with_title_and_body(too_long_title, b"body".to_vec()); + dummy_proposal.create_proposal_and_assert(Err("Title is too long")); + + let too_long_body = vec![0; 11000]; + dummy_proposal = + DummyProposalFixture::default().with_title_and_body(b"title".to_vec(), too_long_body); + dummy_proposal.create_proposal_and_assert(Err("Body is too long")); + }); +} + +#[test] +fn vote_fails_with_expired_voting_period() { + initial_test_ext().execute_with(|| { + let dummy_proposal = DummyProposalFixture::default(); + dummy_proposal.create_proposal_and_assert(Ok(())); + + // last created proposal id equals current proposal count + let proposal_id = ::get(); + + run_to_block_and_finalize(6); + + let mut vote_generator = VoteGenerator::new(proposal_id); + vote_generator.vote_and_assert( + VoteKind::Approve, + Err("Voting period is expired for this proposal"), + ); + }); +} + +#[test] +fn vote_fails_with_not_active_proposal() { + initial_test_ext().execute_with(|| { + let dummy_proposal = DummyProposalFixture::default(); + dummy_proposal.create_proposal_and_assert(Ok(())); + + // last created proposal id equals current proposal count + let proposal_id = ::get(); + + let mut vote_generator = VoteGenerator::new(proposal_id); + vote_generator.vote_and_assert_ok(VoteKind::Reject); + vote_generator.vote_and_assert_ok(VoteKind::Reject); + vote_generator.vote_and_assert_ok(VoteKind::Abstain); + vote_generator.vote_and_assert_ok(VoteKind::Abstain); + + run_to_block_and_finalize(2); + + let mut vote_generator_to_fail = VoteGenerator::new(proposal_id); + vote_generator_to_fail + .vote_and_assert(VoteKind::Approve, Err("Proposal is finalized already")); + }); +} + +#[test] +fn vote_fails_with_absent_proposal() { + initial_test_ext().execute_with(|| { + let mut vote_generator = VoteGenerator::new(2); + vote_generator.vote_and_assert(VoteKind::Approve, Err("This proposal does not exist")); + }); +} + +#[test] +fn vote_fails_on_double_voting() { + initial_test_ext().execute_with(|| { + let dummy_proposal = DummyProposalFixture::default(); + dummy_proposal.create_proposal_and_assert(Ok(())); + + // last created proposal id equals current proposal count + let proposal_id = ::get(); + + let mut vote_generator = VoteGenerator::new(proposal_id); + vote_generator.auto_increment_voter_id = false; + + vote_generator.vote_and_assert_ok(VoteKind::Approve); + vote_generator.vote_and_assert( + VoteKind::Approve, + Err("You have already voted on this proposal"), + ); + }); +} + +#[test] +fn cancel_proposal_succeeds() { + initial_test_ext().execute_with(|| { + let parameters = ProposalParameters { + voting_period: 3, + approval_quorum_percentage: 60, + }; + let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters); + dummy_proposal.create_proposal_and_assert(Ok(())); + + // last created proposal id equals current proposal count + let proposal_id = ::get(); + + let cancel_proposal = CancelProposalFixture::new(proposal_id); + cancel_proposal.cancel_and_assert(Ok(())); + + let proposal = >::get(proposal_id); + + assert_eq!( + proposal, + Proposal { + proposal_type: 1, + parameters, + proposer_id: 1, + created: 1, + status: ProposalStatus::Canceled, + title: b"title".to_vec(), + body: b"body".to_vec(), + } + ) + }); +} + +#[test] +fn cancel_proposal_fails_with_not_active_proposal() { + initial_test_ext().execute_with(|| { + let dummy_proposal = DummyProposalFixture::default(); + dummy_proposal.create_proposal_and_assert(Ok(())); + + // last created proposal id equals current proposal count + let proposal_id = ::get(); + + run_to_block_and_finalize(6); + + let cancel_proposal = CancelProposalFixture::new(proposal_id); + cancel_proposal.cancel_and_assert(Err("Proposal is finalized already")); + }); +} + +#[test] +fn cancel_proposal_fails_with_not_existing_proposal() { + initial_test_ext().execute_with(|| { + let cancel_proposal = CancelProposalFixture::new(2); + cancel_proposal.cancel_and_assert(Err("This proposal does not exist")); + }); +} + +#[test] +fn cancel_proposal_fails_with_insufficient_rights() { + initial_test_ext().execute_with(|| { + let dummy_proposal = DummyProposalFixture::default(); + dummy_proposal.create_proposal_and_assert(Ok(())); + + // last created proposal id equals current proposal count + let proposal_id = ::get(); + + let cancel_proposal = + CancelProposalFixture::new(proposal_id).with_origin(RawOrigin::Signed(2)); + cancel_proposal.cancel_and_assert(Err("You do not own this proposal")); + }); +} + +#[test] +fn veto_proposal_succeeds() { + initial_test_ext().execute_with(|| { + let parameters = ProposalParameters { + voting_period: 3, + approval_quorum_percentage: 60, + }; + let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters); + dummy_proposal.create_proposal_and_assert(Ok(())); + + // last created proposal id equals current proposal count + let proposal_id = ::get(); + + let veto_proposal = VetoProposalFixture::new(proposal_id); + veto_proposal.veto_and_assert(Ok(())); + + let proposal = >::get(proposal_id); + + assert_eq!( + proposal, + Proposal { + proposal_type: 1, + parameters, + proposer_id: 1, + created: 1, + status: ProposalStatus::Vetoed, + title: b"title".to_vec(), + body: b"body".to_vec(), + } + ) + }); +} + +#[test] +fn veto_proposal_fails_with_not_active_proposal() { + initial_test_ext().execute_with(|| { + let dummy_proposal = DummyProposalFixture::default(); + dummy_proposal.create_proposal_and_assert(Ok(())); + + // last created proposal id equals current proposal count + let proposal_id = ::get(); + + run_to_block_and_finalize(6); + + let veto_proposal = VetoProposalFixture::new(proposal_id); + veto_proposal.veto_and_assert(Err("Proposal is finalized already")); + }); +} + +#[test] +fn veto_proposal_fails_with_not_existing_proposal() { + initial_test_ext().execute_with(|| { + let veto_proposal = VetoProposalFixture::new(2); + veto_proposal.veto_and_assert(Err("This proposal does not exist")); + }); +} + +#[test] +fn veto_proposal_fails_with_insufficient_rights() { + initial_test_ext().execute_with(|| { + let dummy_proposal = DummyProposalFixture::default(); + dummy_proposal.create_proposal_and_assert(Ok(())); + + // last created proposal id equals current proposal count + let proposal_id = ::get(); + + let veto_proposal = VetoProposalFixture::new(proposal_id).with_origin(RawOrigin::Signed(2)); + veto_proposal.veto_and_assert(Err("RequireRootOrigin")); + }); +} + +#[test] +fn create_proposal_event_emitted() { + initial_test_ext().execute_with(|| { + let dummy_proposal = DummyProposalFixture::default(); + dummy_proposal.create_proposal_and_assert(Ok(())); + + EventFixture::assert_events(vec![RawEvent::ProposalCreated(1, 1)]); + }); +} + +#[test] +fn veto_proposal_event_emitted() { + initial_test_ext().execute_with(|| { + let dummy_proposal = DummyProposalFixture::default(); + dummy_proposal.create_proposal_and_assert(Ok(())); + + // last created proposal id equals current proposal count + let proposal_id = ::get(); + + let veto_proposal = VetoProposalFixture::new(proposal_id); + veto_proposal.veto_and_assert(Ok(())); + + EventFixture::assert_events(vec![ + RawEvent::ProposalCreated(1, 1), + RawEvent::ProposalStatusUpdated(1, ProposalStatus::Vetoed), + RawEvent::ProposalVetoed(1), + ]); + }); +} + +#[test] +fn cancel_proposal_event_emitted() { + initial_test_ext().execute_with(|| { + let dummy_proposal = DummyProposalFixture::default(); + dummy_proposal.create_proposal_and_assert(Ok(())); + + // last created proposal id equals current proposal count + let proposal_id = ::get(); + + let cancel_proposal = CancelProposalFixture::new(proposal_id); + cancel_proposal.cancel_and_assert(Ok(())); + + EventFixture::assert_events(vec![ + RawEvent::ProposalCreated(1, 1), + RawEvent::ProposalStatusUpdated(1, ProposalStatus::Canceled), + RawEvent::ProposalCanceled(1, 1), + ]); + }); +} + +#[test] +fn vote_proposal_event_emitted() { + initial_test_ext().execute_with(|| { + let dummy_proposal = DummyProposalFixture::default(); + dummy_proposal.create_proposal_and_assert(Ok(())); + + // last created proposal id equals current proposal count + let proposal_id = ::get(); + + let mut vote_generator = VoteGenerator::new(proposal_id); + vote_generator.vote_and_assert_ok(VoteKind::Approve); + + EventFixture::assert_events(vec![ + RawEvent::ProposalCreated(1, 1), + RawEvent::Voted(1, 1, VoteKind::Approve), + ]); + }); +} + +#[test] +fn create_proposal_and_expire_it() { + initial_test_ext().execute_with(|| { + let parameters = ProposalParameters { + voting_period: 3, + approval_quorum_percentage: 49, + }; + + let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters.clone()); + dummy_proposal.create_proposal_and_assert(Ok(())); + + run_to_block_and_finalize(8); + + // last created proposal id equals current proposal count + let proposal_id = ::get(); + let proposal = >::get(proposal_id); + + assert_eq!( + proposal, + Proposal { + proposal_type: 1, + parameters, + proposer_id: 1, + created: 1, + status: ProposalStatus::Expired, + title: b"title".to_vec(), + body: b"body".to_vec(), + } + ) + }); +} diff --git a/modules/proposals/engine/src/types.rs b/modules/proposals/engine/src/types.rs new file mode 100644 index 0000000000..06656def86 --- /dev/null +++ b/modules/proposals/engine/src/types.rs @@ -0,0 +1,435 @@ +//! Proposals types module for the Joystream platform. Version 2. +//! Provides types for the proposal engine. + +use codec::{Decode, Encode}; +use rstd::cmp::PartialOrd; +use rstd::ops::Add; +use rstd::prelude::*; + +#[cfg(feature = "std")] +use serde::{Deserialize, Serialize}; +use srml_support::dispatch; + +/// Current status of the proposal +#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive(Encode, Decode, Clone, PartialEq, Eq, Debug)] +pub enum ProposalStatus { + /// A new proposal that is available for voting. + Active, + + /// To clear the quorum requirement, the percentage of council members with revealed votes + /// must be no less than the quorum value for the given proposal type. + Approved, + + /// A proposal was rejected + Rejected, + + /// Not enough votes and voting period expired. + Expired, + + /// Proposal was successfully executed + Executed, + + /// Proposal was executed and failed with an error + Failed { + /// Fail error + error: Vec, + }, + + /// Proposal was withdrawn by its proposer. + Canceled, + + /// Proposal was vetoed by root. + Vetoed, +} + +impl Default for ProposalStatus { + fn default() -> Self { + ProposalStatus::Active + } +} + +/// Vote kind for the proposal. Sum of all votes defines proposal status. +#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive(Encode, Decode, Clone, PartialEq, Eq, Debug)] +pub enum VoteKind { + /// Pass, an alternative or a ranking, for binary, multiple choice + /// and ranked choice propositions, respectively. + Approve, + + /// Against proposal. + Reject, + + /// Signals presence, but unwillingness to cast judgment on substance of vote. + Abstain, +} + +impl Default for VoteKind { + fn default() -> Self { + VoteKind::Reject + } +} + +/// Proposal parameters required to manage proposal risk. +#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive(Encode, Decode, Default, Clone, Copy, PartialEq, Eq, Debug)] +pub struct ProposalParameters { + /// During this period, votes can be accepted + pub voting_period: BlockNumber, + + /// Quorum percentage of approving voters required to pass a proposal. + pub approval_quorum_percentage: u32, + // /// Temporary field which defines expected threshold to pass the vote. + // /// Will be changed to percentage + // pub temp_threshold_vote_count: u32, + + //pub stake: BalanceOf, // +} + +/// 'Proposal' contains information necessary for the proposal system functioning. +#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive(Encode, Decode, Default, Clone, PartialEq, Eq, Debug)] +pub struct Proposal { + /// Proposal type id + pub proposal_type: u32, + + /// Proposals parameter, characterize different proposal types. + pub parameters: ProposalParameters, + + /// Identifier of member proposing. + pub proposer_id: AccountId, + + /// Proposal title + pub title: Vec, + + /// Proposal body + pub body: Vec, + + /// When it was created. + pub created: BlockNumber, + + // Any stake associated with the proposal. + //pub stake: Option> + /// Current proposal status + pub status: ProposalStatus, +} + +impl + PartialOrd + Copy, AccountId> + Proposal +{ + /// Returns whether voting period expired by now + pub fn is_voting_period_expired(&self, now: BlockNumber) -> bool { + now >= self.created + self.parameters.voting_period + } + + /// Voting results tally for single proposal. + /// Parameters: own proposal id, current time, votes. + /// Returns tally results if proposal status will should change + pub fn tally_results( + self, + proposal_id: u32, + votes: Vec>, + total_voters_count: u32, + now: BlockNumber, + ) -> Option> { + let mut abstentions: u32 = 0; + let mut approvals: u32 = 0; + let mut rejections: u32 = 0; + + for vote in votes.iter() { + match vote.vote_kind { + VoteKind::Abstain => abstentions += 1, + VoteKind::Approve => approvals += 1, + VoteKind::Reject => rejections += 1, + } + } + + let proposal_status_decision = ProposalStatusDecision { + proposal: &self, + approvals, + now, + votes_count: votes.len() as u32, + total_voters_count, + }; + + let new_status: Option = + if proposal_status_decision.is_approval_quorum_reached() { + Some(ProposalStatus::Approved) + } else if proposal_status_decision.is_expired() { + Some(ProposalStatus::Expired) + } else if proposal_status_decision.is_voting_completed() { + Some(ProposalStatus::Rejected) + } else { + None + }; + + if let Some(status) = new_status { + Some(TallyResult { + proposal_id, + abstentions, + approvals, + rejections, + status, + finalized_at: now, + }) + } else { + None + } + } +} + +/// Vote. Characterized by voter and vote kind. +#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive(Encode, Decode, Default, Clone, PartialEq, Eq, Debug)] +pub struct Vote { + /// Origin of the vote + pub voter_id: AccountId, + + /// Vote kind + pub vote_kind: VoteKind, +} + +/// Tally result for the proposal +#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))] +#[derive(Encode, Decode, Default, Clone, PartialEq, Eq)] +pub struct TallyResult { + /// Proposal Id + pub proposal_id: u32, + + /// 'Abstention' votes count + pub abstentions: u32, + + /// 'Approve' votes count + pub approvals: u32, + + /// 'Reject' votes count + pub rejections: u32, + + /// Proposal status after tally + pub status: ProposalStatus, + + /// Proposal finalization block number + pub finalized_at: BlockNumber, +} + +/// Provides data for voting. +pub trait VotersParameters { + /// Defines maximum voters count for the proposal + fn total_voters_count() -> u32; +} + +// Calculates quorum, votes threshold, expiration status +struct ProposalStatusDecision<'a, BlockNumber, AccountId> { + proposal: &'a Proposal, + now: BlockNumber, + votes_count: u32, + total_voters_count: u32, + approvals: u32, +} + +impl<'a, BlockNumber, AccountId> ProposalStatusDecision<'a, BlockNumber, AccountId> +where + BlockNumber: Add + PartialOrd + Copy, +{ + // Proposal has been expired and quorum not reached. + pub fn is_expired(&self) -> bool { + self.proposal.is_voting_period_expired(self.now) + } + + // Approval quorum reached for the proposal + pub fn is_approval_quorum_reached(&self) -> bool { + let approval_votes_fraction: f32 = self.approvals as f32 / self.total_voters_count as f32; + + let approval_quorum_fraction = + self.proposal.parameters.approval_quorum_percentage as f32 / 100.0; + + approval_votes_fraction >= approval_quorum_fraction + } + + // All voters had voted + pub fn is_voting_completed(&self) -> bool { + self.votes_count == self.total_voters_count + } +} + +/// Proposal executable code wrapper +pub trait ProposalExecutable { + /// Executes proposal code + fn execute(&self) -> dispatch::Result; +} + +/// Proposal code binary converter +pub trait ProposalCodeDecoder { + /// Converts proposal code binary to executable representation + fn decode_proposal( + proposal_type: u32, + proposal_code: Vec, + ) -> Result, &'static str>; +} + +#[cfg(test)] +mod tests { + use crate::*; + + #[test] + fn proposal_voting_period_expired() { + let mut proposal = Proposal::::default(); + + proposal.created = 1; + proposal.parameters.voting_period = 3; + + assert!(proposal.is_voting_period_expired(4)); + } + + #[test] + fn proposal_voting_period_not_expired() { + let mut proposal = Proposal::::default(); + + proposal.created = 1; + proposal.parameters.voting_period = 3; + + assert!(!proposal.is_voting_period_expired(3)); + } + + #[test] + fn tally_results_proposal_expired() { + let mut proposal = Proposal::::default(); + let proposal_id = 1; + let now = 5; + proposal.created = 1; + proposal.parameters.voting_period = 3; + proposal.parameters.approval_quorum_percentage = 60; + + let votes = vec![ + Vote { + voter_id: 1, + vote_kind: VoteKind::Approve, + }, + Vote { + voter_id: 2, + vote_kind: VoteKind::Approve, + }, + Vote { + voter_id: 4, + vote_kind: VoteKind::Reject, + }, + ]; + + let expected_tally_results = TallyResult { + proposal_id, + abstentions: 0, + approvals: 2, + rejections: 1, + status: ProposalStatus::Expired, + finalized_at: now, + }; + + assert_eq!( + proposal.tally_results(proposal_id, votes, 5, now), + Some(expected_tally_results) + ); + } + #[test] + fn tally_results_proposal_approved() { + let mut proposal = Proposal::::default(); + let proposal_id = 1; + proposal.created = 1; + proposal.parameters.voting_period = 3; + proposal.parameters.approval_quorum_percentage = 60; + + let votes = vec![ + Vote { + voter_id: 1, + vote_kind: VoteKind::Approve, + }, + Vote { + voter_id: 2, + vote_kind: VoteKind::Approve, + }, + Vote { + voter_id: 3, + vote_kind: VoteKind::Approve, + }, + Vote { + voter_id: 4, + vote_kind: VoteKind::Reject, + }, + ]; + + let expected_tally_results = TallyResult { + proposal_id, + abstentions: 0, + approvals: 3, + rejections: 1, + status: ProposalStatus::Approved, + finalized_at: 2, + }; + + assert_eq!( + proposal.tally_results(proposal_id, votes, 5, 2), + Some(expected_tally_results) + ); + } + + #[test] + fn tally_results_proposal_rejected() { + let mut proposal = Proposal::::default(); + let proposal_id = 1; + let now = 2; + + proposal.created = 1; + proposal.parameters.voting_period = 3; + proposal.parameters.approval_quorum_percentage = 60; + + let votes = vec![ + Vote { + voter_id: 1, + vote_kind: VoteKind::Reject, + }, + Vote { + voter_id: 2, + vote_kind: VoteKind::Reject, + }, + Vote { + voter_id: 3, + vote_kind: VoteKind::Abstain, + }, + Vote { + voter_id: 4, + vote_kind: VoteKind::Approve, + }, + ]; + + let expected_tally_results = TallyResult { + proposal_id, + abstentions: 1, + approvals: 1, + rejections: 2, + status: ProposalStatus::Rejected, + finalized_at: now, + }; + + assert_eq!( + proposal.tally_results(proposal_id, votes, 4, now), + Some(expected_tally_results) + ); + } + + #[test] + fn tally_results_are_empty_with_not_expired_voting_period() { + let mut proposal = Proposal::::default(); + let proposal_id = 1; + let now = 2; + + proposal.created = 1; + proposal.parameters.voting_period = 3; + proposal.parameters.approval_quorum_percentage = 60; + + let votes = vec![Vote { + voter_id: 1, + vote_kind: VoteKind::Abstain, + }]; + + assert_eq!(proposal.tally_results(proposal_id, votes, 5, now), None); + } +} From 979b8a40d5d6ea78450d5952e304364b4b586f6c Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 11 Feb 2020 16:36:08 +0300 Subject: [PATCH 002/286] Delete modules *.lock files - delete codex/Cargo.lock - delete engine/Cargo.lock - update gitignore --- .gitignore | 2 + modules/proposals/codex/Cargo.lock | 1913 --------------------------- modules/proposals/engine/Cargo.lock | 1895 -------------------------- 3 files changed, 2 insertions(+), 3808 deletions(-) delete mode 100644 modules/proposals/codex/Cargo.lock delete mode 100644 modules/proposals/engine/Cargo.lock diff --git a/.gitignore b/.gitignore index 7aad7a3ccb..15b05219df 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,5 @@ joystream_runtime.wasm # Vim .*.sw* + +/modules/**/*.lock \ No newline at end of file diff --git a/modules/proposals/codex/Cargo.lock b/modules/proposals/codex/Cargo.lock deleted file mode 100644 index 8735dda80e..0000000000 --- a/modules/proposals/codex/Cargo.lock +++ /dev/null @@ -1,1913 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -[[package]] -name = "ahash" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f33b5018f120946c1dcf279194f238a9f146725593ead1c08fa47ff22b0b5d3" -dependencies = [ - "const-random", -] - -[[package]] -name = "aho-corasick" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "743ad5a418686aad3b87fd14c43badd828cf26e214a00f92a384291cf22e1811" -dependencies = [ - "memchr", -] - -[[package]] -name = "arrayref" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" - -[[package]] -name = "arrayvec" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" -dependencies = [ - "nodrop", -] - -[[package]] -name = "arrayvec" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" - -[[package]] -name = "autocfg" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" - -[[package]] -name = "autocfg" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" - -[[package]] -name = "backtrace" -version = "0.3.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f80256bc78f67e7df7e36d77366f636ed976895d91fe2ab9efa3973e8fe8c4f" -dependencies = [ - "backtrace-sys", - "cfg-if", - "libc", - "rustc-demangle", -] - -[[package]] -name = "backtrace-sys" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "base58" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5024ee8015f02155eee35c711107ddd9a9bf3cb689cf2a9089c97e79b6e1ae83" - -[[package]] -name = "bitflags" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - -[[package]] -name = "bitmask" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5da9b3d9f6f585199287a473f4f8dfab6566cf827d15c00c219f53c645687ead" - -[[package]] -name = "bitvec" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a993f74b4c99c1908d156b8d2e0fb6277736b0ecbd833982fd1241d39b2766a6" - -[[package]] -name = "blake2-rfc" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400" -dependencies = [ - "arrayvec 0.4.12", - "constant_time_eq", -] - -[[package]] -name = "block-buffer" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" -dependencies = [ - "block-padding", - "byte-tools", - "byteorder", - "generic-array", -] - -[[package]] -name = "block-padding" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" -dependencies = [ - "byte-tools", -] - -[[package]] -name = "byte-slice-cast" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0a5e3906bcbf133e33c1d4d95afc664ad37fbdb9f6568d8043e7ea8c27d93d3" - -[[package]] -name = "byte-tools" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" - -[[package]] -name = "byteorder" -version = "1.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" - -[[package]] -name = "c2-chacha" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" -dependencies = [ - "ppv-lite86", -] - -[[package]] -name = "cc" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd" - -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - -[[package]] -name = "clear_on_drop" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97276801e127ffb46b66ce23f35cc96bd454fa311294bced4bbace7baa8b1d17" -dependencies = [ - "cc", -] - -[[package]] -name = "cloudabi" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -dependencies = [ - "bitflags", -] - -[[package]] -name = "const-random" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f1af9ac737b2dd2d577701e59fd09ba34822f6f2ebdb30a7647405d9e55e16a" -dependencies = [ - "const-random-macro", - "proc-macro-hack", -] - -[[package]] -name = "const-random-macro" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25e4c606eb459dd29f7c57b2e0879f2b6f14ee130918c2b78ccb58a9624e6c7a" -dependencies = [ - "getrandom", - "proc-macro-hack", -] - -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "crypto-mac" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" -dependencies = [ - "generic-array", - "subtle 1.0.0", -] - -[[package]] -name = "curve25519-dalek" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b7dcd30ba50cdf88b55b033456138b7c0ac4afdc436d82e1b79f370f24cc66d" -dependencies = [ - "byteorder", - "clear_on_drop", - "digest", - "rand_core 0.3.1", - "subtle 2.2.2", -] - -[[package]] -name = "derivative" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942ca430eef7a3806595a6737bc388bf51adb888d3fc0dd1b50f1c170167ee3a" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "syn 0.15.44", -] - -[[package]] -name = "digest" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" -dependencies = [ - "generic-array", -] - -[[package]] -name = "ed25519-dalek" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d07e8b8a8386c3b89a7a4b329fdfa4cb545de2545e9e2ebbc3dd3929253e426" -dependencies = [ - "clear_on_drop", - "curve25519-dalek", - "failure", - "rand 0.6.5", -] - -[[package]] -name = "elastic-array" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "580f3768bd6465780d063f5b8213a2ebd506e139b345e4a81eb301ceae3d61e1" -dependencies = [ - "heapsize", -] - -[[package]] -name = "environmental" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516aa8d7a71cb00a1c4146f0798549b93d083d4f189b3ced8f3de6b8f11ee6c4" - -[[package]] -name = "failure" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9" -dependencies = [ - "backtrace", - "failure_derive", -] - -[[package]] -name = "failure_derive" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08" -dependencies = [ - "proc-macro2 1.0.8", - "quote 1.0.2", - "syn 1.0.14", - "synstructure", -] - -[[package]] -name = "fake-simd" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" - -[[package]] -name = "fixed-hash" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516877b7b9a1cc2d0293cbce23cd6203f0edbfd4090e6ca4489fecb5aa73050e" -dependencies = [ - "byteorder", - "libc", - "rand 0.5.6", - "rustc-hex", - "static_assertions 0.2.5", -] - -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - -[[package]] -name = "generic-array" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" -dependencies = [ - "typenum", -] - -[[package]] -name = "getrandom" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "hash-db" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d23bd4e7b5eda0d0f3a307e8b381fdc8ba9000f26fbe912250c0a4cc3956364a" - -[[package]] -name = "hash256-std-hasher" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92c171d55b98633f4ed3860808f004099b36c1cc29c42cfc53aa8591b21efcf2" -dependencies = [ - "crunchy", -] - -[[package]] -name = "hashbrown" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bae29b6653b3412c2e71e9d486db9f9df5d701941d86683005efb9f2d28e3da" -dependencies = [ - "byteorder", - "scopeguard 0.3.3", -] - -[[package]] -name = "hashbrown" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6073d0ca812575946eb5f35ff68dbe519907b25c42530389ff946dc84c6ead" -dependencies = [ - "ahash", - "autocfg 0.1.7", -] - -[[package]] -name = "heapsize" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1679e6ea370dee694f91f1dc469bf94cf8f52051d147aec3e1f9497c6fc22461" -dependencies = [ - "winapi", -] - -[[package]] -name = "heck" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "hex" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" - -[[package]] -name = "hmac" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dcb5e64cda4c23119ab41ba960d1e170a774c8e4b9d9e6a9bc18aabf5e59695" -dependencies = [ - "crypto-mac", - "digest", -] - -[[package]] -name = "hmac-drbg" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6e570451493f10f6581b48cdd530413b63ea9e780f544bfd3bdcaa0d89d1a7b" -dependencies = [ - "digest", - "generic-array", - "hmac", -] - -[[package]] -name = "impl-codec" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1be51a921b067b0eaca2fad532d9400041561aa922221cc65f95a85641c6bf53" -dependencies = [ - "parity-scale-codec", -] - -[[package]] -name = "impl-serde" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58e3cae7e99c7ff5a995da2cf78dd0a5383740eda71d98cf7b1910c301ac69b8" -dependencies = [ - "serde", -] - -[[package]] -name = "impl-trait-for-tuples" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef5550a42e3740a0e71f909d4c861056a284060af885ae7aa6242820f920d9d" -dependencies = [ - "proc-macro2 1.0.8", - "quote 1.0.2", - "syn 1.0.14", -] - -[[package]] -name = "integer-sqrt" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f65877bf7d44897a473350b1046277941cee20b263397e90869c50b6e766088b" - -[[package]] -name = "keccak" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558" - -[[package]] -name = "libsecp256k1" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc1e2c808481a63dc6da2074752fdd4336a3c8fcc68b83db6f1fd5224ae7962" -dependencies = [ - "arrayref", - "crunchy", - "digest", - "hmac-drbg", - "rand 0.7.3", - "sha2", - "subtle 2.2.2", - "typenum", -] - -[[package]] -name = "lock_api" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" -dependencies = [ - "scopeguard 0.3.3", -] - -[[package]] -name = "lock_api" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79b2de95ecb4691949fea4716ca53cdbcfccb2c612e19644a8bad05edcf9f47b" -dependencies = [ - "scopeguard 1.0.0", -] - -[[package]] -name = "log" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "malloc_size_of_derive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e37c5d4cd9473c5f4c9c111f033f15d4df9bd378fdf615944e360a4f55a05f0b" -dependencies = [ - "proc-macro2 1.0.8", - "syn 1.0.14", - "synstructure", -] - -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - -[[package]] -name = "memchr" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3197e20c7edb283f87c071ddfc7a2cca8f8e0b888c242959846a6fce03c72223" - -[[package]] -name = "memory-db" -version = "0.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dabfe0a8c69954ae3bcfc5fc14260a85fb80e1bf9f86a155f668d10a67e93dd" -dependencies = [ - "ahash", - "hash-db", - "hashbrown 0.6.3", - "parity-util-mem", -] - -[[package]] -name = "memory_units" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d96e3f3c0b6325d8ccd83c33b28acb183edcb6c67938ba104ec546854b0882" - -[[package]] -name = "merlin" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b0942b357c1b4d0dc43ba724674ec89c3218e6ca2b3e8269e7cb53bcecd2f6e" -dependencies = [ - "byteorder", - "keccak", - "rand_core 0.4.2", - "zeroize 1.1.0", -] - -[[package]] -name = "nodrop" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" - -[[package]] -name = "num-bigint" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" -dependencies = [ - "autocfg 1.0.0", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-integer" -version = "0.1.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba" -dependencies = [ - "autocfg 1.0.0", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da4dc79f9e6c81bef96148c8f6b8e72ad4541caa4a24373e900a36da07de03a3" -dependencies = [ - "autocfg 1.0.0", - "num-bigint", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096" -dependencies = [ - "autocfg 1.0.0", -] - -[[package]] -name = "num_enum" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be601e38e20a6f3d01049d85801cb9b7a34a8da7a0da70df507bbde7735058c8" -dependencies = [ - "derivative", - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b59f30f6a043f2606adbd0addbf1eef6f2e28e8c4968918b63b7ff97ac0db2a7" -dependencies = [ - "proc-macro-crate", - "proc-macro2 1.0.8", - "quote 1.0.2", - "syn 1.0.14", -] - -[[package]] -name = "once_cell" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532c29a261168a45ce28948f9537ddd7a5dd272cc513b3017b1e82a88f962c37" -dependencies = [ - "parking_lot 0.7.1", -] - -[[package]] -name = "once_cell" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d584f08c2d717d5c23a6414fc2822b71c651560713e54fa7eace675f758a355e" - -[[package]] -name = "opaque-debug" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" - -[[package]] -name = "parity-scale-codec" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f747c06d9f3b2ad387ac881b9667298c81b1243aa9833f086e05996937c35507" -dependencies = [ - "arrayvec 0.5.1", - "bitvec", - "byte-slice-cast", - "parity-scale-codec-derive", - "serde", -] - -[[package]] -name = "parity-scale-codec-derive" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34e513ff3e406f3ede6796dcdc83d0b32ffb86668cea1ccf7363118abeb00476" -dependencies = [ - "proc-macro-crate", - "proc-macro2 1.0.8", - "quote 1.0.2", - "syn 1.0.14", -] - -[[package]] -name = "parity-util-mem" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "570093f39f786beea92dcc09e45d8aae7841516ac19a50431953ac82a0e8f85c" -dependencies = [ - "cfg-if", - "malloc_size_of_derive", - "winapi", -] - -[[package]] -name = "parity-wasm" -version = "0.40.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e39faaa292a687ea15120b1ac31899b13586446521df6c149e46f1584671e0f" - -[[package]] -name = "parking_lot" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337" -dependencies = [ - "lock_api 0.1.5", - "parking_lot_core 0.4.0", -] - -[[package]] -name = "parking_lot" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" -dependencies = [ - "lock_api 0.3.3", - "parking_lot_core 0.6.2", - "rustc_version", -] - -[[package]] -name = "parking_lot_core" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9" -dependencies = [ - "libc", - "rand 0.6.5", - "rustc_version", - "smallvec", - "winapi", -] - -[[package]] -name = "parking_lot_core" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" -dependencies = [ - "cfg-if", - "cloudabi", - "libc", - "redox_syscall", - "rustc_version", - "smallvec", - "winapi", -] - -[[package]] -name = "paste" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "423a519e1c6e828f1e73b720f9d9ed2fa643dce8a7737fb43235ce0b41eeaa49" -dependencies = [ - "paste-impl", - "proc-macro-hack", -] - -[[package]] -name = "paste-impl" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4214c9e912ef61bf42b81ba9a47e8aad1b2ffaf739ab162bf96d1e011f54e6c5" -dependencies = [ - "proc-macro-hack", - "proc-macro2 1.0.8", - "quote 1.0.2", - "syn 1.0.14", -] - -[[package]] -name = "pbkdf2" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006c038a43a45995a9670da19e67600114740e8511d4333bf97a56e66a7542d9" -dependencies = [ - "byteorder", - "crypto-mac", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" - -[[package]] -name = "primitive-types" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83ef7b3b965c0eadcb6838f34f827e1dfb2939bdd5ebd43f9647e009b12b0371" -dependencies = [ - "fixed-hash", - "impl-codec", - "impl-serde", - "uint", -] - -[[package]] -name = "proc-macro-crate" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e10d4b51f154c8a7fb96fd6dad097cb74b863943ec010ac94b9fd1be8861fe1e" -dependencies = [ - "toml", -] - -[[package]] -name = "proc-macro-hack" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5" -dependencies = [ - "proc-macro2 1.0.8", - "quote 1.0.2", - "syn 1.0.14", -] - -[[package]] -name = "proc-macro2" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -dependencies = [ - "unicode-xid 0.1.0", -] - -[[package]] -name = "proc-macro2" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548" -dependencies = [ - "unicode-xid 0.2.0", -] - -[[package]] -name = "quote" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" -dependencies = [ - "proc-macro2 0.4.30", -] - -[[package]] -name = "quote" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" -dependencies = [ - "proc-macro2 1.0.8", -] - -[[package]] -name = "rand" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9" -dependencies = [ - "cloudabi", - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "winapi", -] - -[[package]] -name = "rand" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" -dependencies = [ - "autocfg 0.1.7", - "libc", - "rand_chacha 0.1.1", - "rand_core 0.4.2", - "rand_hc 0.1.0", - "rand_isaac", - "rand_jitter", - "rand_os", - "rand_pcg", - "rand_xorshift", - "winapi", -] - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom", - "libc", - "rand_chacha 0.2.1", - "rand_core 0.5.1", - "rand_hc 0.2.0", -] - -[[package]] -name = "rand_chacha" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" -dependencies = [ - "autocfg 0.1.7", - "rand_core 0.3.1", -] - -[[package]] -name = "rand_chacha" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" -dependencies = [ - "c2-chacha", - "rand_core 0.5.1", -] - -[[package]] -name = "rand_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -dependencies = [ - "rand_core 0.4.2", -] - -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rand_hc" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rand_isaac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "rand_jitter" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" -dependencies = [ - "libc", - "rand_core 0.4.2", - "winapi", -] - -[[package]] -name = "rand_os" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" -dependencies = [ - "cloudabi", - "fuchsia-cprng", - "libc", - "rand_core 0.4.2", - "rdrand", - "winapi", -] - -[[package]] -name = "rand_pcg" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" -dependencies = [ - "autocfg 0.1.7", - "rand_core 0.4.2", -] - -[[package]] -name = "rand_xorshift" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "rdrand" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "redox_syscall" -version = "0.1.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" - -[[package]] -name = "regex" -version = "1.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322cf97724bea3ee221b78fe25ac9c46114ebb51747ad5babd51a2fc6a8235a8" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", - "thread_local", -] - -[[package]] -name = "regex-syntax" -version = "0.6.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b28dfe3fe9badec5dbf0a79a9cccad2cfc2ab5484bdb3e44cbd1ae8b3ba2be06" - -[[package]] -name = "rustc-demangle" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" - -[[package]] -name = "rustc-hex" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" - -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver", -] - -[[package]] -name = "safe-mix" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d3d055a2582e6b00ed7a31c1524040aa391092bf636328350813f3a0605215c" -dependencies = [ - "rustc_version", -] - -[[package]] -name = "schnorrkel" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eacd8381b3c37840c9c9f40472af529e49975bdcbc24f83c31059fd6539023d3" -dependencies = [ - "curve25519-dalek", - "failure", - "merlin", - "rand 0.6.5", - "rand_core 0.4.2", - "rand_os", - "sha2", - "subtle 2.2.2", - "zeroize 0.9.3", -] - -[[package]] -name = "scopeguard" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" - -[[package]] -name = "scopeguard" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" - -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - -[[package]] -name = "serde" -version = "1.0.104" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.104" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64" -dependencies = [ - "proc-macro2 1.0.8", - "quote 1.0.2", - "syn 1.0.14", -] - -[[package]] -name = "sha2" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27044adfd2e1f077f649f59deb9490d3941d674002f7d062870a60ebe9bd47a0" -dependencies = [ - "block-buffer", - "digest", - "fake-simd", - "opaque-debug", -] - -[[package]] -name = "smallvec" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" -dependencies = [ - "maybe-uninit", -] - -[[package]] -name = "sr-api-macros" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "blake2-rfc", - "proc-macro-crate", - "proc-macro2 0.4.30", - "quote 0.6.13", - "syn 0.15.44", -] - -[[package]] -name = "sr-arithmetic" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "integer-sqrt", - "num-traits", - "parity-scale-codec", - "serde", - "sr-std", - "substrate-debug-derive", -] - -[[package]] -name = "sr-io" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "hash-db", - "libsecp256k1", - "log", - "parity-scale-codec", - "rustc_version", - "sr-std", - "substrate-externalities", - "substrate-primitives", - "substrate-state-machine", - "substrate-trie", - "tiny-keccak", -] - -[[package]] -name = "sr-primitives" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "paste", - "rand 0.7.3", - "serde", - "sr-arithmetic", - "sr-io", - "sr-std", - "substrate-application-crypto", - "substrate-primitives", -] - -[[package]] -name = "sr-staking-primitives" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "parity-scale-codec", - "sr-primitives", - "sr-std", -] - -[[package]] -name = "sr-std" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "rustc_version", -] - -[[package]] -name = "sr-version" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "impl-serde", - "parity-scale-codec", - "serde", - "sr-primitives", - "sr-std", -] - -[[package]] -name = "srml-authorship" -version = "0.1.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "impl-trait-for-tuples", - "parity-scale-codec", - "sr-io", - "sr-primitives", - "sr-std", - "srml-support", - "srml-system", - "substrate-inherents", - "substrate-primitives", -] - -[[package]] -name = "srml-balances" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "parity-scale-codec", - "safe-mix", - "serde", - "sr-primitives", - "sr-std", - "srml-support", - "srml-system", - "substrate-keyring", -] - -[[package]] -name = "srml-metadata" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "parity-scale-codec", - "serde", - "sr-std", - "substrate-primitives", -] - -[[package]] -name = "srml-session" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "impl-trait-for-tuples", - "parity-scale-codec", - "safe-mix", - "serde", - "sr-io", - "sr-primitives", - "sr-staking-primitives", - "sr-std", - "srml-support", - "srml-system", - "srml-timestamp", - "substrate-trie", -] - -[[package]] -name = "srml-staking" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "parity-scale-codec", - "safe-mix", - "serde", - "sr-io", - "sr-primitives", - "sr-staking-primitives", - "sr-std", - "srml-authorship", - "srml-session", - "srml-support", - "srml-system", - "substrate-keyring", - "substrate-phragmen", -] - -[[package]] -name = "srml-support" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "bitmask", - "impl-trait-for-tuples", - "log", - "once_cell 0.2.4", - "parity-scale-codec", - "paste", - "serde", - "sr-io", - "sr-primitives", - "sr-std", - "srml-metadata", - "srml-support-procedural", - "substrate-inherents", - "substrate-primitives", -] - -[[package]] -name = "srml-support-procedural" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "sr-api-macros", - "srml-support-procedural-tools", - "syn 0.15.44", -] - -[[package]] -name = "srml-support-procedural-tools" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "proc-macro-crate", - "proc-macro2 0.4.30", - "quote 0.6.13", - "srml-support-procedural-tools-derive", - "syn 0.15.44", -] - -[[package]] -name = "srml-support-procedural-tools-derive" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "syn 0.15.44", -] - -[[package]] -name = "srml-system" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "impl-trait-for-tuples", - "parity-scale-codec", - "safe-mix", - "serde", - "sr-io", - "sr-primitives", - "sr-std", - "sr-version", - "srml-support", - "substrate-primitives", -] - -[[package]] -name = "srml-timestamp" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "impl-trait-for-tuples", - "parity-scale-codec", - "serde", - "sr-primitives", - "sr-std", - "srml-support", - "srml-system", - "substrate-inherents", -] - -[[package]] -name = "static_assertions" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c19be23126415861cb3a23e501d34a708f7f9b2183c5252d690941c2e69199d5" - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strum" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d1c33039533f051704951680f1adfd468fd37ac46816ded0d9ee068e60f05f" - -[[package]] -name = "strum_macros" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47cd23f5c7dee395a00fa20135e2ec0fffcdfa151c56182966d7a3261343432e" -dependencies = [ - "heck", - "proc-macro2 0.4.30", - "quote 0.6.13", - "syn 0.15.44", -] - -[[package]] -name = "substrate-application-crypto" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "parity-scale-codec", - "serde", - "sr-io", - "sr-std", - "substrate-primitives", -] - -[[package]] -name = "substrate-bip39" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be511be555a3633e71739a79e4ddff6a6aaa6579fa6114182a51d72c3eb93c5" -dependencies = [ - "hmac", - "pbkdf2", - "schnorrkel", - "sha2", -] - -[[package]] -name = "substrate-debug-derive" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "proc-macro2 1.0.8", - "quote 1.0.2", - "syn 1.0.14", -] - -[[package]] -name = "substrate-externalities" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "environmental", - "primitive-types", - "sr-std", - "substrate-primitives-storage", -] - -[[package]] -name = "substrate-inherents" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "parity-scale-codec", - "parking_lot 0.9.0", - "sr-primitives", - "sr-std", -] - -[[package]] -name = "substrate-keyring" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "lazy_static", - "sr-primitives", - "strum", - "strum_macros", - "substrate-primitives", -] - -[[package]] -name = "substrate-panic-handler" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "backtrace", - "log", -] - -[[package]] -name = "substrate-phragmen" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "sr-primitives", - "sr-std", -] - -[[package]] -name = "substrate-primitives" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "base58", - "blake2-rfc", - "byteorder", - "ed25519-dalek", - "hash-db", - "hash256-std-hasher", - "hex", - "impl-serde", - "lazy_static", - "libsecp256k1", - "log", - "num-traits", - "parity-scale-codec", - "parking_lot 0.9.0", - "primitive-types", - "rand 0.7.3", - "regex", - "rustc-hex", - "schnorrkel", - "serde", - "sha2", - "sr-std", - "substrate-bip39", - "substrate-debug-derive", - "substrate-externalities", - "substrate-primitives-storage", - "tiny-bip39", - "tiny-keccak", - "twox-hash", - "wasmi", - "zeroize 0.10.1", -] - -[[package]] -name = "substrate-primitives-storage" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "impl-serde", - "serde", - "sr-std", - "substrate-debug-derive", -] - -[[package]] -name = "substrate-proposals-codex-module" -version = "2.0.0" -dependencies = [ - "num_enum", - "parity-scale-codec", - "serde", - "sr-io", - "sr-primitives", - "sr-staking-primitives", - "sr-std", - "srml-balances", - "srml-staking", - "srml-support", - "srml-system", - "srml-timestamp", - "substrate-primitives", - "substrate-proposals-engine-module", -] - -[[package]] -name = "substrate-proposals-engine-module" -version = "2.0.0" -dependencies = [ - "num_enum", - "parity-scale-codec", - "sr-primitives", - "sr-staking-primitives", - "sr-std", - "srml-balances", - "srml-staking", - "srml-support", - "srml-system", - "srml-timestamp", - "substrate-primitives", -] - -[[package]] -name = "substrate-state-machine" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "hash-db", - "log", - "num-traits", - "parity-scale-codec", - "parking_lot 0.9.0", - "rand 0.7.3", - "substrate-externalities", - "substrate-panic-handler", - "substrate-primitives", - "substrate-trie", - "trie-db", - "trie-root", -] - -[[package]] -name = "substrate-trie" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "hash-db", - "memory-db", - "parity-scale-codec", - "sr-std", - "substrate-primitives", - "trie-db", - "trie-root", -] - -[[package]] -name = "subtle" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" - -[[package]] -name = "subtle" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c65d530b10ccaeac294f349038a597e435b18fb456aadd0840a623f83b9e941" - -[[package]] -name = "syn" -version = "0.15.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "unicode-xid 0.1.0", -] - -[[package]] -name = "syn" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5" -dependencies = [ - "proc-macro2 1.0.8", - "quote 1.0.2", - "unicode-xid 0.2.0", -] - -[[package]] -name = "synstructure" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" -dependencies = [ - "proc-macro2 1.0.8", - "quote 1.0.2", - "syn 1.0.14", - "unicode-xid 0.2.0", -] - -[[package]] -name = "thread_local" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "tiny-bip39" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1c5676413eaeb1ea35300a0224416f57abc3bd251657e0fafc12c47ff98c060" -dependencies = [ - "failure", - "hashbrown 0.1.8", - "hmac", - "once_cell 0.1.8", - "pbkdf2", - "rand 0.6.5", - "sha2", -] - -[[package]] -name = "tiny-keccak" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d8a021c69bb74a44ccedb824a046447e2c84a01df9e5c20779750acb38e11b2" -dependencies = [ - "crunchy", -] - -[[package]] -name = "toml" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" -dependencies = [ - "serde", -] - -[[package]] -name = "trie-db" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0b62d27e8aa1c07414549ac872480ac82380bab39e730242ab08d82d7cc098a" -dependencies = [ - "elastic-array", - "hash-db", - "hashbrown 0.6.3", - "log", - "rand 0.6.5", -] - -[[package]] -name = "trie-root" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b779f7c1c8fe9276365d9d5be5c4b5adeacf545117bb3f64c974305789c5c0b" -dependencies = [ - "hash-db", -] - -[[package]] -name = "twox-hash" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bfd5b7557925ce778ff9b9ef90e3ade34c524b5ff10e239c69a42d546d2af56" -dependencies = [ - "rand 0.7.3", -] - -[[package]] -name = "typenum" -version = "1.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9" - -[[package]] -name = "uint" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e75a4cdd7b87b28840dba13c483b9a88ee6bbf16ba5c951ee1ecfcf723078e0d" -dependencies = [ - "byteorder", - "crunchy", - "rustc-hex", - "static_assertions 1.1.0", -] - -[[package]] -name = "unicode-segmentation" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" - -[[package]] -name = "unicode-xid" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" - -[[package]] -name = "unicode-xid" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasmi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31d26deb2d9a37e6cfed420edce3ed604eab49735ba89035e13c98f9a528313" -dependencies = [ - "libc", - "memory_units", - "num-rational", - "num-traits", - "parity-wasm", - "wasmi-validation", -] - -[[package]] -name = "wasmi-validation" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bc0356e3df56e639fc7f7d8a99741915531e27ed735d911ed83d7e1339c8188" -dependencies = [ - "parity-wasm", -] - -[[package]] -name = "winapi" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "zeroize" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45af6a010d13e4cf5b54c94ba5a2b2eba5596b9e46bf5875612d332a1f2b3f86" - -[[package]] -name = "zeroize" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4090487fa66630f7b166fba2bbb525e247a5449f41c468cc1d98f8ae6ac03120" - -[[package]] -name = "zeroize" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cbac2ed2ba24cc90f5e06485ac8c7c1e5449fe8911aef4d8877218af021a5b8" -dependencies = [ - "zeroize_derive", -] - -[[package]] -name = "zeroize_derive" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de251eec69fc7c1bc3923403d18ececb929380e016afe103da75f396704f8ca2" -dependencies = [ - "proc-macro2 1.0.8", - "quote 1.0.2", - "syn 1.0.14", - "synstructure", -] diff --git a/modules/proposals/engine/Cargo.lock b/modules/proposals/engine/Cargo.lock deleted file mode 100644 index 1d76a22622..0000000000 --- a/modules/proposals/engine/Cargo.lock +++ /dev/null @@ -1,1895 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -[[package]] -name = "ahash" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f33b5018f120946c1dcf279194f238a9f146725593ead1c08fa47ff22b0b5d3" -dependencies = [ - "const-random", -] - -[[package]] -name = "aho-corasick" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "743ad5a418686aad3b87fd14c43badd828cf26e214a00f92a384291cf22e1811" -dependencies = [ - "memchr", -] - -[[package]] -name = "arrayref" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" - -[[package]] -name = "arrayvec" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" -dependencies = [ - "nodrop", -] - -[[package]] -name = "arrayvec" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" - -[[package]] -name = "autocfg" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" - -[[package]] -name = "autocfg" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" - -[[package]] -name = "backtrace" -version = "0.3.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f80256bc78f67e7df7e36d77366f636ed976895d91fe2ab9efa3973e8fe8c4f" -dependencies = [ - "backtrace-sys", - "cfg-if", - "libc", - "rustc-demangle", -] - -[[package]] -name = "backtrace-sys" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "base58" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5024ee8015f02155eee35c711107ddd9a9bf3cb689cf2a9089c97e79b6e1ae83" - -[[package]] -name = "bitflags" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - -[[package]] -name = "bitmask" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5da9b3d9f6f585199287a473f4f8dfab6566cf827d15c00c219f53c645687ead" - -[[package]] -name = "bitvec" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a993f74b4c99c1908d156b8d2e0fb6277736b0ecbd833982fd1241d39b2766a6" - -[[package]] -name = "blake2-rfc" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400" -dependencies = [ - "arrayvec 0.4.12", - "constant_time_eq", -] - -[[package]] -name = "block-buffer" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" -dependencies = [ - "block-padding", - "byte-tools", - "byteorder", - "generic-array", -] - -[[package]] -name = "block-padding" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" -dependencies = [ - "byte-tools", -] - -[[package]] -name = "byte-slice-cast" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0a5e3906bcbf133e33c1d4d95afc664ad37fbdb9f6568d8043e7ea8c27d93d3" - -[[package]] -name = "byte-tools" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" - -[[package]] -name = "byteorder" -version = "1.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" - -[[package]] -name = "c2-chacha" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" -dependencies = [ - "ppv-lite86", -] - -[[package]] -name = "cc" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd" - -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - -[[package]] -name = "clear_on_drop" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97276801e127ffb46b66ce23f35cc96bd454fa311294bced4bbace7baa8b1d17" -dependencies = [ - "cc", -] - -[[package]] -name = "cloudabi" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -dependencies = [ - "bitflags", -] - -[[package]] -name = "const-random" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f1af9ac737b2dd2d577701e59fd09ba34822f6f2ebdb30a7647405d9e55e16a" -dependencies = [ - "const-random-macro", - "proc-macro-hack", -] - -[[package]] -name = "const-random-macro" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25e4c606eb459dd29f7c57b2e0879f2b6f14ee130918c2b78ccb58a9624e6c7a" -dependencies = [ - "getrandom", - "proc-macro-hack", -] - -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "crypto-mac" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" -dependencies = [ - "generic-array", - "subtle 1.0.0", -] - -[[package]] -name = "curve25519-dalek" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b7dcd30ba50cdf88b55b033456138b7c0ac4afdc436d82e1b79f370f24cc66d" -dependencies = [ - "byteorder", - "clear_on_drop", - "digest", - "rand_core 0.3.1", - "subtle 2.2.2", -] - -[[package]] -name = "derivative" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942ca430eef7a3806595a6737bc388bf51adb888d3fc0dd1b50f1c170167ee3a" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "syn 0.15.44", -] - -[[package]] -name = "digest" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" -dependencies = [ - "generic-array", -] - -[[package]] -name = "ed25519-dalek" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d07e8b8a8386c3b89a7a4b329fdfa4cb545de2545e9e2ebbc3dd3929253e426" -dependencies = [ - "clear_on_drop", - "curve25519-dalek", - "failure", - "rand 0.6.5", -] - -[[package]] -name = "elastic-array" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "580f3768bd6465780d063f5b8213a2ebd506e139b345e4a81eb301ceae3d61e1" -dependencies = [ - "heapsize", -] - -[[package]] -name = "environmental" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516aa8d7a71cb00a1c4146f0798549b93d083d4f189b3ced8f3de6b8f11ee6c4" - -[[package]] -name = "failure" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9" -dependencies = [ - "backtrace", - "failure_derive", -] - -[[package]] -name = "failure_derive" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08" -dependencies = [ - "proc-macro2 1.0.8", - "quote 1.0.2", - "syn 1.0.14", - "synstructure", -] - -[[package]] -name = "fake-simd" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" - -[[package]] -name = "fixed-hash" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516877b7b9a1cc2d0293cbce23cd6203f0edbfd4090e6ca4489fecb5aa73050e" -dependencies = [ - "byteorder", - "libc", - "rand 0.5.6", - "rustc-hex", - "static_assertions 0.2.5", -] - -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - -[[package]] -name = "generic-array" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" -dependencies = [ - "typenum", -] - -[[package]] -name = "getrandom" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "hash-db" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d23bd4e7b5eda0d0f3a307e8b381fdc8ba9000f26fbe912250c0a4cc3956364a" - -[[package]] -name = "hash256-std-hasher" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92c171d55b98633f4ed3860808f004099b36c1cc29c42cfc53aa8591b21efcf2" -dependencies = [ - "crunchy", -] - -[[package]] -name = "hashbrown" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bae29b6653b3412c2e71e9d486db9f9df5d701941d86683005efb9f2d28e3da" -dependencies = [ - "byteorder", - "scopeguard 0.3.3", -] - -[[package]] -name = "hashbrown" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6073d0ca812575946eb5f35ff68dbe519907b25c42530389ff946dc84c6ead" -dependencies = [ - "ahash", - "autocfg 0.1.7", -] - -[[package]] -name = "heapsize" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1679e6ea370dee694f91f1dc469bf94cf8f52051d147aec3e1f9497c6fc22461" -dependencies = [ - "winapi", -] - -[[package]] -name = "heck" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "hex" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" - -[[package]] -name = "hmac" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dcb5e64cda4c23119ab41ba960d1e170a774c8e4b9d9e6a9bc18aabf5e59695" -dependencies = [ - "crypto-mac", - "digest", -] - -[[package]] -name = "hmac-drbg" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6e570451493f10f6581b48cdd530413b63ea9e780f544bfd3bdcaa0d89d1a7b" -dependencies = [ - "digest", - "generic-array", - "hmac", -] - -[[package]] -name = "impl-codec" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1be51a921b067b0eaca2fad532d9400041561aa922221cc65f95a85641c6bf53" -dependencies = [ - "parity-scale-codec", -] - -[[package]] -name = "impl-serde" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58e3cae7e99c7ff5a995da2cf78dd0a5383740eda71d98cf7b1910c301ac69b8" -dependencies = [ - "serde", -] - -[[package]] -name = "impl-trait-for-tuples" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef5550a42e3740a0e71f909d4c861056a284060af885ae7aa6242820f920d9d" -dependencies = [ - "proc-macro2 1.0.8", - "quote 1.0.2", - "syn 1.0.14", -] - -[[package]] -name = "integer-sqrt" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f65877bf7d44897a473350b1046277941cee20b263397e90869c50b6e766088b" - -[[package]] -name = "keccak" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558" - -[[package]] -name = "libsecp256k1" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc1e2c808481a63dc6da2074752fdd4336a3c8fcc68b83db6f1fd5224ae7962" -dependencies = [ - "arrayref", - "crunchy", - "digest", - "hmac-drbg", - "rand 0.7.3", - "sha2", - "subtle 2.2.2", - "typenum", -] - -[[package]] -name = "lock_api" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" -dependencies = [ - "scopeguard 0.3.3", -] - -[[package]] -name = "lock_api" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79b2de95ecb4691949fea4716ca53cdbcfccb2c612e19644a8bad05edcf9f47b" -dependencies = [ - "scopeguard 1.0.0", -] - -[[package]] -name = "log" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "malloc_size_of_derive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e37c5d4cd9473c5f4c9c111f033f15d4df9bd378fdf615944e360a4f55a05f0b" -dependencies = [ - "proc-macro2 1.0.8", - "syn 1.0.14", - "synstructure", -] - -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - -[[package]] -name = "memchr" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3197e20c7edb283f87c071ddfc7a2cca8f8e0b888c242959846a6fce03c72223" - -[[package]] -name = "memory-db" -version = "0.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dabfe0a8c69954ae3bcfc5fc14260a85fb80e1bf9f86a155f668d10a67e93dd" -dependencies = [ - "ahash", - "hash-db", - "hashbrown 0.6.3", - "parity-util-mem", -] - -[[package]] -name = "memory_units" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d96e3f3c0b6325d8ccd83c33b28acb183edcb6c67938ba104ec546854b0882" - -[[package]] -name = "merlin" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b0942b357c1b4d0dc43ba724674ec89c3218e6ca2b3e8269e7cb53bcecd2f6e" -dependencies = [ - "byteorder", - "keccak", - "rand_core 0.4.2", - "zeroize 1.1.0", -] - -[[package]] -name = "nodrop" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" - -[[package]] -name = "num-bigint" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" -dependencies = [ - "autocfg 1.0.0", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-integer" -version = "0.1.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba" -dependencies = [ - "autocfg 1.0.0", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da4dc79f9e6c81bef96148c8f6b8e72ad4541caa4a24373e900a36da07de03a3" -dependencies = [ - "autocfg 1.0.0", - "num-bigint", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096" -dependencies = [ - "autocfg 1.0.0", -] - -[[package]] -name = "num_enum" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be601e38e20a6f3d01049d85801cb9b7a34a8da7a0da70df507bbde7735058c8" -dependencies = [ - "derivative", - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b59f30f6a043f2606adbd0addbf1eef6f2e28e8c4968918b63b7ff97ac0db2a7" -dependencies = [ - "proc-macro-crate", - "proc-macro2 1.0.8", - "quote 1.0.2", - "syn 1.0.14", -] - -[[package]] -name = "once_cell" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532c29a261168a45ce28948f9537ddd7a5dd272cc513b3017b1e82a88f962c37" -dependencies = [ - "parking_lot 0.7.1", -] - -[[package]] -name = "once_cell" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d584f08c2d717d5c23a6414fc2822b71c651560713e54fa7eace675f758a355e" - -[[package]] -name = "opaque-debug" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" - -[[package]] -name = "parity-scale-codec" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f747c06d9f3b2ad387ac881b9667298c81b1243aa9833f086e05996937c35507" -dependencies = [ - "arrayvec 0.5.1", - "bitvec", - "byte-slice-cast", - "parity-scale-codec-derive", - "serde", -] - -[[package]] -name = "parity-scale-codec-derive" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34e513ff3e406f3ede6796dcdc83d0b32ffb86668cea1ccf7363118abeb00476" -dependencies = [ - "proc-macro-crate", - "proc-macro2 1.0.8", - "quote 1.0.2", - "syn 1.0.14", -] - -[[package]] -name = "parity-util-mem" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "570093f39f786beea92dcc09e45d8aae7841516ac19a50431953ac82a0e8f85c" -dependencies = [ - "cfg-if", - "malloc_size_of_derive", - "winapi", -] - -[[package]] -name = "parity-wasm" -version = "0.40.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e39faaa292a687ea15120b1ac31899b13586446521df6c149e46f1584671e0f" - -[[package]] -name = "parking_lot" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337" -dependencies = [ - "lock_api 0.1.5", - "parking_lot_core 0.4.0", -] - -[[package]] -name = "parking_lot" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" -dependencies = [ - "lock_api 0.3.3", - "parking_lot_core 0.6.2", - "rustc_version", -] - -[[package]] -name = "parking_lot_core" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9" -dependencies = [ - "libc", - "rand 0.6.5", - "rustc_version", - "smallvec", - "winapi", -] - -[[package]] -name = "parking_lot_core" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" -dependencies = [ - "cfg-if", - "cloudabi", - "libc", - "redox_syscall", - "rustc_version", - "smallvec", - "winapi", -] - -[[package]] -name = "paste" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "423a519e1c6e828f1e73b720f9d9ed2fa643dce8a7737fb43235ce0b41eeaa49" -dependencies = [ - "paste-impl", - "proc-macro-hack", -] - -[[package]] -name = "paste-impl" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4214c9e912ef61bf42b81ba9a47e8aad1b2ffaf739ab162bf96d1e011f54e6c5" -dependencies = [ - "proc-macro-hack", - "proc-macro2 1.0.8", - "quote 1.0.2", - "syn 1.0.14", -] - -[[package]] -name = "pbkdf2" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006c038a43a45995a9670da19e67600114740e8511d4333bf97a56e66a7542d9" -dependencies = [ - "byteorder", - "crypto-mac", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" - -[[package]] -name = "primitive-types" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83ef7b3b965c0eadcb6838f34f827e1dfb2939bdd5ebd43f9647e009b12b0371" -dependencies = [ - "fixed-hash", - "impl-codec", - "impl-serde", - "uint", -] - -[[package]] -name = "proc-macro-crate" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e10d4b51f154c8a7fb96fd6dad097cb74b863943ec010ac94b9fd1be8861fe1e" -dependencies = [ - "toml", -] - -[[package]] -name = "proc-macro-hack" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5" -dependencies = [ - "proc-macro2 1.0.8", - "quote 1.0.2", - "syn 1.0.14", -] - -[[package]] -name = "proc-macro2" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -dependencies = [ - "unicode-xid 0.1.0", -] - -[[package]] -name = "proc-macro2" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548" -dependencies = [ - "unicode-xid 0.2.0", -] - -[[package]] -name = "quote" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" -dependencies = [ - "proc-macro2 0.4.30", -] - -[[package]] -name = "quote" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" -dependencies = [ - "proc-macro2 1.0.8", -] - -[[package]] -name = "rand" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9" -dependencies = [ - "cloudabi", - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "winapi", -] - -[[package]] -name = "rand" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" -dependencies = [ - "autocfg 0.1.7", - "libc", - "rand_chacha 0.1.1", - "rand_core 0.4.2", - "rand_hc 0.1.0", - "rand_isaac", - "rand_jitter", - "rand_os", - "rand_pcg", - "rand_xorshift", - "winapi", -] - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom", - "libc", - "rand_chacha 0.2.1", - "rand_core 0.5.1", - "rand_hc 0.2.0", -] - -[[package]] -name = "rand_chacha" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" -dependencies = [ - "autocfg 0.1.7", - "rand_core 0.3.1", -] - -[[package]] -name = "rand_chacha" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" -dependencies = [ - "c2-chacha", - "rand_core 0.5.1", -] - -[[package]] -name = "rand_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -dependencies = [ - "rand_core 0.4.2", -] - -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rand_hc" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rand_isaac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "rand_jitter" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" -dependencies = [ - "libc", - "rand_core 0.4.2", - "winapi", -] - -[[package]] -name = "rand_os" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" -dependencies = [ - "cloudabi", - "fuchsia-cprng", - "libc", - "rand_core 0.4.2", - "rdrand", - "winapi", -] - -[[package]] -name = "rand_pcg" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" -dependencies = [ - "autocfg 0.1.7", - "rand_core 0.4.2", -] - -[[package]] -name = "rand_xorshift" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "rdrand" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "redox_syscall" -version = "0.1.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" - -[[package]] -name = "regex" -version = "1.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322cf97724bea3ee221b78fe25ac9c46114ebb51747ad5babd51a2fc6a8235a8" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", - "thread_local", -] - -[[package]] -name = "regex-syntax" -version = "0.6.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b28dfe3fe9badec5dbf0a79a9cccad2cfc2ab5484bdb3e44cbd1ae8b3ba2be06" - -[[package]] -name = "rustc-demangle" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" - -[[package]] -name = "rustc-hex" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" - -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver", -] - -[[package]] -name = "safe-mix" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d3d055a2582e6b00ed7a31c1524040aa391092bf636328350813f3a0605215c" -dependencies = [ - "rustc_version", -] - -[[package]] -name = "schnorrkel" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eacd8381b3c37840c9c9f40472af529e49975bdcbc24f83c31059fd6539023d3" -dependencies = [ - "curve25519-dalek", - "failure", - "merlin", - "rand 0.6.5", - "rand_core 0.4.2", - "rand_os", - "sha2", - "subtle 2.2.2", - "zeroize 0.9.3", -] - -[[package]] -name = "scopeguard" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" - -[[package]] -name = "scopeguard" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" - -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - -[[package]] -name = "serde" -version = "1.0.104" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.104" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64" -dependencies = [ - "proc-macro2 1.0.8", - "quote 1.0.2", - "syn 1.0.14", -] - -[[package]] -name = "sha2" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27044adfd2e1f077f649f59deb9490d3941d674002f7d062870a60ebe9bd47a0" -dependencies = [ - "block-buffer", - "digest", - "fake-simd", - "opaque-debug", -] - -[[package]] -name = "smallvec" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" -dependencies = [ - "maybe-uninit", -] - -[[package]] -name = "sr-api-macros" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "blake2-rfc", - "proc-macro-crate", - "proc-macro2 0.4.30", - "quote 0.6.13", - "syn 0.15.44", -] - -[[package]] -name = "sr-arithmetic" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "integer-sqrt", - "num-traits", - "parity-scale-codec", - "serde", - "sr-std", - "substrate-debug-derive", -] - -[[package]] -name = "sr-io" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "hash-db", - "libsecp256k1", - "log", - "parity-scale-codec", - "rustc_version", - "sr-std", - "substrate-externalities", - "substrate-primitives", - "substrate-state-machine", - "substrate-trie", - "tiny-keccak", -] - -[[package]] -name = "sr-primitives" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "paste", - "rand 0.7.3", - "serde", - "sr-arithmetic", - "sr-io", - "sr-std", - "substrate-application-crypto", - "substrate-primitives", -] - -[[package]] -name = "sr-staking-primitives" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "parity-scale-codec", - "sr-primitives", - "sr-std", -] - -[[package]] -name = "sr-std" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "rustc_version", -] - -[[package]] -name = "sr-version" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "impl-serde", - "parity-scale-codec", - "serde", - "sr-primitives", - "sr-std", -] - -[[package]] -name = "srml-authorship" -version = "0.1.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "impl-trait-for-tuples", - "parity-scale-codec", - "sr-io", - "sr-primitives", - "sr-std", - "srml-support", - "srml-system", - "substrate-inherents", - "substrate-primitives", -] - -[[package]] -name = "srml-balances" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "parity-scale-codec", - "safe-mix", - "serde", - "sr-primitives", - "sr-std", - "srml-support", - "srml-system", - "substrate-keyring", -] - -[[package]] -name = "srml-metadata" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "parity-scale-codec", - "serde", - "sr-std", - "substrate-primitives", -] - -[[package]] -name = "srml-session" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "impl-trait-for-tuples", - "parity-scale-codec", - "safe-mix", - "serde", - "sr-io", - "sr-primitives", - "sr-staking-primitives", - "sr-std", - "srml-support", - "srml-system", - "srml-timestamp", - "substrate-trie", -] - -[[package]] -name = "srml-staking" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "parity-scale-codec", - "safe-mix", - "serde", - "sr-io", - "sr-primitives", - "sr-staking-primitives", - "sr-std", - "srml-authorship", - "srml-session", - "srml-support", - "srml-system", - "substrate-keyring", - "substrate-phragmen", -] - -[[package]] -name = "srml-support" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "bitmask", - "impl-trait-for-tuples", - "log", - "once_cell 0.2.4", - "parity-scale-codec", - "paste", - "serde", - "sr-io", - "sr-primitives", - "sr-std", - "srml-metadata", - "srml-support-procedural", - "substrate-inherents", - "substrate-primitives", -] - -[[package]] -name = "srml-support-procedural" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "sr-api-macros", - "srml-support-procedural-tools", - "syn 0.15.44", -] - -[[package]] -name = "srml-support-procedural-tools" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "proc-macro-crate", - "proc-macro2 0.4.30", - "quote 0.6.13", - "srml-support-procedural-tools-derive", - "syn 0.15.44", -] - -[[package]] -name = "srml-support-procedural-tools-derive" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "syn 0.15.44", -] - -[[package]] -name = "srml-system" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "impl-trait-for-tuples", - "parity-scale-codec", - "safe-mix", - "serde", - "sr-io", - "sr-primitives", - "sr-std", - "sr-version", - "srml-support", - "substrate-primitives", -] - -[[package]] -name = "srml-timestamp" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "impl-trait-for-tuples", - "parity-scale-codec", - "serde", - "sr-primitives", - "sr-std", - "srml-support", - "srml-system", - "substrate-inherents", -] - -[[package]] -name = "static_assertions" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c19be23126415861cb3a23e501d34a708f7f9b2183c5252d690941c2e69199d5" - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strum" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d1c33039533f051704951680f1adfd468fd37ac46816ded0d9ee068e60f05f" - -[[package]] -name = "strum_macros" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47cd23f5c7dee395a00fa20135e2ec0fffcdfa151c56182966d7a3261343432e" -dependencies = [ - "heck", - "proc-macro2 0.4.30", - "quote 0.6.13", - "syn 0.15.44", -] - -[[package]] -name = "substrate-application-crypto" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "parity-scale-codec", - "serde", - "sr-io", - "sr-std", - "substrate-primitives", -] - -[[package]] -name = "substrate-bip39" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be511be555a3633e71739a79e4ddff6a6aaa6579fa6114182a51d72c3eb93c5" -dependencies = [ - "hmac", - "pbkdf2", - "schnorrkel", - "sha2", -] - -[[package]] -name = "substrate-debug-derive" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "proc-macro2 1.0.8", - "quote 1.0.2", - "syn 1.0.14", -] - -[[package]] -name = "substrate-externalities" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "environmental", - "primitive-types", - "sr-std", - "substrate-primitives-storage", -] - -[[package]] -name = "substrate-inherents" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "parity-scale-codec", - "parking_lot 0.9.0", - "sr-primitives", - "sr-std", -] - -[[package]] -name = "substrate-keyring" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "lazy_static", - "sr-primitives", - "strum", - "strum_macros", - "substrate-primitives", -] - -[[package]] -name = "substrate-panic-handler" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "backtrace", - "log", -] - -[[package]] -name = "substrate-phragmen" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "sr-primitives", - "sr-std", -] - -[[package]] -name = "substrate-primitives" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "base58", - "blake2-rfc", - "byteorder", - "ed25519-dalek", - "hash-db", - "hash256-std-hasher", - "hex", - "impl-serde", - "lazy_static", - "libsecp256k1", - "log", - "num-traits", - "parity-scale-codec", - "parking_lot 0.9.0", - "primitive-types", - "rand 0.7.3", - "regex", - "rustc-hex", - "schnorrkel", - "serde", - "sha2", - "sr-std", - "substrate-bip39", - "substrate-debug-derive", - "substrate-externalities", - "substrate-primitives-storage", - "tiny-bip39", - "tiny-keccak", - "twox-hash", - "wasmi", - "zeroize 0.10.1", -] - -[[package]] -name = "substrate-primitives-storage" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "impl-serde", - "serde", - "sr-std", - "substrate-debug-derive", -] - -[[package]] -name = "substrate-proposals-engine-module" -version = "2.0.0" -dependencies = [ - "num_enum", - "parity-scale-codec", - "serde", - "sr-io", - "sr-primitives", - "sr-staking-primitives", - "sr-std", - "srml-balances", - "srml-staking", - "srml-support", - "srml-system", - "srml-timestamp", - "substrate-primitives", -] - -[[package]] -name = "substrate-state-machine" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "hash-db", - "log", - "num-traits", - "parity-scale-codec", - "parking_lot 0.9.0", - "rand 0.7.3", - "substrate-externalities", - "substrate-panic-handler", - "substrate-primitives", - "substrate-trie", - "trie-db", - "trie-root", -] - -[[package]] -name = "substrate-trie" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" -dependencies = [ - "hash-db", - "memory-db", - "parity-scale-codec", - "sr-std", - "substrate-primitives", - "trie-db", - "trie-root", -] - -[[package]] -name = "subtle" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" - -[[package]] -name = "subtle" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c65d530b10ccaeac294f349038a597e435b18fb456aadd0840a623f83b9e941" - -[[package]] -name = "syn" -version = "0.15.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "unicode-xid 0.1.0", -] - -[[package]] -name = "syn" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5" -dependencies = [ - "proc-macro2 1.0.8", - "quote 1.0.2", - "unicode-xid 0.2.0", -] - -[[package]] -name = "synstructure" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" -dependencies = [ - "proc-macro2 1.0.8", - "quote 1.0.2", - "syn 1.0.14", - "unicode-xid 0.2.0", -] - -[[package]] -name = "thread_local" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "tiny-bip39" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1c5676413eaeb1ea35300a0224416f57abc3bd251657e0fafc12c47ff98c060" -dependencies = [ - "failure", - "hashbrown 0.1.8", - "hmac", - "once_cell 0.1.8", - "pbkdf2", - "rand 0.6.5", - "sha2", -] - -[[package]] -name = "tiny-keccak" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d8a021c69bb74a44ccedb824a046447e2c84a01df9e5c20779750acb38e11b2" -dependencies = [ - "crunchy", -] - -[[package]] -name = "toml" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" -dependencies = [ - "serde", -] - -[[package]] -name = "trie-db" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0b62d27e8aa1c07414549ac872480ac82380bab39e730242ab08d82d7cc098a" -dependencies = [ - "elastic-array", - "hash-db", - "hashbrown 0.6.3", - "log", - "rand 0.6.5", -] - -[[package]] -name = "trie-root" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b779f7c1c8fe9276365d9d5be5c4b5adeacf545117bb3f64c974305789c5c0b" -dependencies = [ - "hash-db", -] - -[[package]] -name = "twox-hash" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bfd5b7557925ce778ff9b9ef90e3ade34c524b5ff10e239c69a42d546d2af56" -dependencies = [ - "rand 0.7.3", -] - -[[package]] -name = "typenum" -version = "1.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9" - -[[package]] -name = "uint" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e75a4cdd7b87b28840dba13c483b9a88ee6bbf16ba5c951ee1ecfcf723078e0d" -dependencies = [ - "byteorder", - "crunchy", - "rustc-hex", - "static_assertions 1.1.0", -] - -[[package]] -name = "unicode-segmentation" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" - -[[package]] -name = "unicode-xid" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" - -[[package]] -name = "unicode-xid" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasmi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31d26deb2d9a37e6cfed420edce3ed604eab49735ba89035e13c98f9a528313" -dependencies = [ - "libc", - "memory_units", - "num-rational", - "num-traits", - "parity-wasm", - "wasmi-validation", -] - -[[package]] -name = "wasmi-validation" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bc0356e3df56e639fc7f7d8a99741915531e27ed735d911ed83d7e1339c8188" -dependencies = [ - "parity-wasm", -] - -[[package]] -name = "winapi" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "zeroize" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45af6a010d13e4cf5b54c94ba5a2b2eba5596b9e46bf5875612d332a1f2b3f86" - -[[package]] -name = "zeroize" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4090487fa66630f7b166fba2bbb525e247a5449f41c468cc1d98f8ae6ac03120" - -[[package]] -name = "zeroize" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cbac2ed2ba24cc90f5e06485ac8c7c1e5449fe8911aef4d8877218af021a5b8" -dependencies = [ - "zeroize_derive", -] - -[[package]] -name = "zeroize_derive" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de251eec69fc7c1bc3923403d18ececb929380e016afe103da75f396704f8ca2" -dependencies = [ - "proc-macro2 1.0.8", - "quote 1.0.2", - "syn 1.0.14", - "synstructure", -] From cae4ee8009b828f45289003a4ef4ec6a348592a5 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 11 Feb 2020 17:17:45 +0300 Subject: [PATCH 003/286] Change proposal approval algorithm - change approval quorum - introduce approval threshold - add tests --- modules/proposals/engine/src/lib.rs | 2 +- modules/proposals/engine/src/tests/mod.rs | 12 +++-- modules/proposals/engine/src/types.rs | 59 ++++++++++++++--------- 3 files changed, 46 insertions(+), 27 deletions(-) diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index 04b641baea..8eee58bfa5 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -55,6 +55,7 @@ pub trait Trait: system::Trait + timestamp::Trait { } decl_event!( + /// Proposals engine events pub enum Event where ::AccountId @@ -266,7 +267,6 @@ impl Module { // Executes approved proposal code fn execute_proposal(proposal_id: u32) { - //let origin = system::RawOrigin::Root.into(); let proposal = Self::proposals(proposal_id); let proposal_code = Self::proposal_codes(proposal_id); diff --git a/modules/proposals/engine/src/tests/mod.rs b/modules/proposals/engine/src/tests/mod.rs index d76585358d..060fe80135 100644 --- a/modules/proposals/engine/src/tests/mod.rs +++ b/modules/proposals/engine/src/tests/mod.rs @@ -30,6 +30,7 @@ impl Default for DummyProposalFixture { parameters: ProposalParameters { voting_period: 3, approval_quorum_percentage: 60, + approval_threshold_percentage: 60, }, origin: RawOrigin::Signed(1), proposal_type: dummy_proposal.proposal_type(), @@ -245,8 +246,8 @@ fn proposal_execution_succeeds() { let parameters = ProposalParameters { voting_period: 3, approval_quorum_percentage: 60, + approval_threshold_percentage: 60, }; - let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters); dummy_proposal.create_proposal_and_assert(Ok(())); @@ -284,8 +285,8 @@ fn proposal_execution_failed() { let parameters = ProposalParameters { voting_period: 3, approval_quorum_percentage: 60, + approval_threshold_percentage: 60, }; - let faulty_proposal = FaultyExecutable; let dummy_proposal = DummyProposalFixture::default() @@ -329,9 +330,9 @@ fn tally_calculation_succeeds() { initial_test_ext().execute_with(|| { let parameters = ProposalParameters { voting_period: 3, - approval_quorum_percentage: 49, + approval_quorum_percentage: 50, + approval_threshold_percentage: 50, }; - let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters); dummy_proposal.create_proposal_and_assert(Ok(())); @@ -503,6 +504,7 @@ fn cancel_proposal_succeeds() { let parameters = ProposalParameters { voting_period: 3, approval_quorum_percentage: 60, + approval_threshold_percentage: 60, }; let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters); dummy_proposal.create_proposal_and_assert(Ok(())); @@ -575,6 +577,7 @@ fn veto_proposal_succeeds() { let parameters = ProposalParameters { voting_period: 3, approval_quorum_percentage: 60, + approval_threshold_percentage: 60, }; let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters); dummy_proposal.create_proposal_and_assert(Ok(())); @@ -715,6 +718,7 @@ fn create_proposal_and_expire_it() { let parameters = ProposalParameters { voting_period: 3, approval_quorum_percentage: 49, + approval_threshold_percentage: 60, }; let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters.clone()); diff --git a/modules/proposals/engine/src/types.rs b/modules/proposals/engine/src/types.rs index 06656def86..3dd5663138 100644 --- a/modules/proposals/engine/src/types.rs +++ b/modules/proposals/engine/src/types.rs @@ -79,10 +79,9 @@ pub struct ProposalParameters { /// Quorum percentage of approving voters required to pass a proposal. pub approval_quorum_percentage: u32, - // /// Temporary field which defines expected threshold to pass the vote. - // /// Will be changed to percentage - // pub temp_threshold_vote_count: u32, + /// Approval votes percentage threshold to pass the vote. + pub approval_threshold_percentage: u32, //pub stake: BalanceOf, // } @@ -152,16 +151,18 @@ impl + PartialOrd + Copy, AccountId> total_voters_count, }; - let new_status: Option = - if proposal_status_decision.is_approval_quorum_reached() { - Some(ProposalStatus::Approved) - } else if proposal_status_decision.is_expired() { - Some(ProposalStatus::Expired) - } else if proposal_status_decision.is_voting_completed() { - Some(ProposalStatus::Rejected) - } else { - None - }; + let new_status: Option = if proposal_status_decision + .is_approval_quorum_reached() + && proposal_status_decision.is_approval_threshold_reached() + { + Some(ProposalStatus::Approved) + } else if proposal_status_decision.is_expired() { + Some(ProposalStatus::Expired) + } else if proposal_status_decision.is_voting_completed() { + Some(ProposalStatus::Rejected) + } else { + None + }; if let Some(status) = new_status { Some(TallyResult { @@ -236,14 +237,26 @@ where self.proposal.is_voting_period_expired(self.now) } - // Approval quorum reached for the proposal + // Approval quorum reached for the proposal. Compares predefined parameter with actual + // votes sum divided by total possible votes count. pub fn is_approval_quorum_reached(&self) -> bool { - let approval_votes_fraction: f32 = self.approvals as f32 / self.total_voters_count as f32; + let actual_votes_fraction: f32 = self.votes_count as f32 / self.total_voters_count as f32; let approval_quorum_fraction = self.proposal.parameters.approval_quorum_percentage as f32 / 100.0; - approval_votes_fraction >= approval_quorum_fraction + actual_votes_fraction >= approval_quorum_fraction + } + + // Approval threshold reached for the proposal. Compares predefined parameter with 'approve' + // votes sum divided by actual votes count. + pub fn is_approval_threshold_reached(&self) -> bool { + let approval_votes_fraction: f32 = self.approvals as f32 / self.votes_count as f32; + + let required_threshold_fraction = + self.proposal.parameters.approval_threshold_percentage as f32 / 100.0; + + approval_votes_fraction >= required_threshold_fraction } // All voters had voted @@ -298,7 +311,8 @@ mod tests { let now = 5; proposal.created = 1; proposal.parameters.voting_period = 3; - proposal.parameters.approval_quorum_percentage = 60; + proposal.parameters.approval_quorum_percentage = 80; + proposal.parameters.approval_threshold_percentage = 40; let votes = vec![ Vote { @@ -372,19 +386,20 @@ mod tests { } #[test] - fn tally_results_proposal_rejected() { + fn tally_results_proposal_rejected_because_of_failed_approval_threshold() { let mut proposal = Proposal::::default(); let proposal_id = 1; let now = 2; proposal.created = 1; proposal.parameters.voting_period = 3; - proposal.parameters.approval_quorum_percentage = 60; + proposal.parameters.approval_quorum_percentage = 50; + proposal.parameters.approval_threshold_percentage = 51; let votes = vec![ Vote { voter_id: 1, - vote_kind: VoteKind::Reject, + vote_kind: VoteKind::Approve, }, Vote { voter_id: 2, @@ -403,8 +418,8 @@ mod tests { let expected_tally_results = TallyResult { proposal_id, abstentions: 1, - approvals: 1, - rejections: 2, + approvals: 2, + rejections: 1, status: ProposalStatus::Rejected, finalized_at: now, }; From e120bde0f8ee4cf6844563b6d04fa66038c93bab Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 11 Feb 2020 19:03:54 +0300 Subject: [PATCH 004/286] Add proposal grace period MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - add proposal parameter - add proposal status ‘PendingExecution’ - change proposal status and execution algorithms - add tests --- modules/proposals/engine/src/lib.rs | 50 ++++++-- modules/proposals/engine/src/tests/mod.rs | 140 +++++++++++++++++++++- modules/proposals/engine/src/types.rs | 75 ++++++++++-- 3 files changed, 245 insertions(+), 20 deletions(-) diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index 8eee58bfa5..a04d6ad617 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -110,6 +110,9 @@ decl_storage! { /// Ids of proposals that are open for voting (have not been finalized yet). pub ActiveProposalIds get(fn active_proposal_ids): BTreeSet; + /// Ids of proposals that were approved and theirs grace period was not expired. + pub PendingExecutionProposalIds get(fn pending_proposal_ids): BTreeSet; + /// Proposal tally results map pub(crate) TallyResults get(fn tally_results): map u32 => TallyResult; @@ -195,17 +198,26 @@ decl_module! { Self::deposit_event(RawEvent::ProposalVetoed(proposal_id)); } - /// Block finalization. Perform voting period check and vote result tally. + /// Block finalization. Perform voting period check, vote result tally, approved proposals + /// grace period checks, and proposal execution. fn on_finalize(_n: T::BlockNumber) { let tally_results = Self::tally(); + let executable_proposal_ids = + Self::get_approved_proposal_with_expired_grace_period_ids(); // mutation + // Check vote results for tally_result in tally_results { >::insert(tally_result.proposal_id, &tally_result); Self::update_proposal_status(tally_result.proposal_id, tally_result.status); } + + // Execute approved proposals with expired grace period + for proposal_id in executable_proposal_ids { + Self::execute_proposal(proposal_id); + } } } } @@ -238,13 +250,14 @@ impl Module { let new_proposal_id = next_proposal_count_value; let new_proposal = Proposal { - created: Self::current_block(), + created_at: Self::current_block(), parameters, title, body, proposer_id: proposer_id.clone(), proposal_type, status: ProposalStatus::Active, + approved_at: None, }; // mutation @@ -331,10 +344,19 @@ impl Module { // restore active proposal id ActiveProposalIds::mutate(|ids| ids.insert(proposal_id)); } - ProposalStatus::Executed - | ProposalStatus::Failed { .. } - | ProposalStatus::Vetoed - | ProposalStatus::Canceled => {} // do nothing + ProposalStatus::PendingExecution => { + let proposal = Self::proposals(proposal_id); + + // immediate execution + // grace period from proposal parameters was set to zero + if proposal.is_grace_period_expired(Self::current_block()) { + Self::execute_proposal(proposal_id); + } + } + ProposalStatus::Executed | ProposalStatus::Failed { .. } => { + PendingExecutionProposalIds::mutate(|ids| ids.remove(&proposal_id)); + } + ProposalStatus::Vetoed | ProposalStatus::Canceled => {} // do nothing } } @@ -343,6 +365,20 @@ impl Module { /// Approve a proposal. The staked deposit will be returned. fn approve_proposal(proposal_id: u32) { - Self::execute_proposal(proposal_id); + >::mutate(proposal_id, |p| p.approved_at = Some(Self::current_block())); + PendingExecutionProposalIds::mutate(|ids| ids.insert(proposal_id)); + Self::update_proposal_status(proposal_id, ProposalStatus::PendingExecution); + } + + fn get_approved_proposal_with_expired_grace_period_ids() -> Vec { + PendingExecutionProposalIds::get() + .iter() + .filter(|proposal_id| { + let proposal = Self::proposals(proposal_id); + + proposal.is_grace_period_expired(Self::current_block()) + }) + .map(|proposal_id| *proposal_id) + .collect() } } diff --git a/modules/proposals/engine/src/tests/mod.rs b/modules/proposals/engine/src/tests/mod.rs index 060fe80135..f992107709 100644 --- a/modules/proposals/engine/src/tests/mod.rs +++ b/modules/proposals/engine/src/tests/mod.rs @@ -31,6 +31,7 @@ impl Default for DummyProposalFixture { voting_period: 3, approval_quorum_percentage: 60, approval_threshold_percentage: 60, + grace_period: 0, }, origin: RawOrigin::Signed(1), proposal_type: dummy_proposal.proposal_type(), @@ -247,6 +248,7 @@ fn proposal_execution_succeeds() { voting_period: 3, approval_quorum_percentage: 60, approval_threshold_percentage: 60, + grace_period: 0, }; let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters); dummy_proposal.create_proposal_and_assert(Ok(())); @@ -270,10 +272,11 @@ fn proposal_execution_succeeds() { proposal_type: 1, parameters, proposer_id: 1, - created: 1, + created_at: 1, status: ProposalStatus::Executed, title: b"title".to_vec(), body: b"body".to_vec(), + approved_at: Some(1), } ) }); @@ -286,6 +289,7 @@ fn proposal_execution_failed() { voting_period: 3, approval_quorum_percentage: 60, approval_threshold_percentage: 60, + grace_period: 0, }; let faulty_proposal = FaultyExecutable; @@ -314,12 +318,13 @@ fn proposal_execution_failed() { proposal_type: faulty_proposal.proposal_type(), parameters, proposer_id: 1, - created: 1, + created_at: 1, status: ProposalStatus::Failed { error: "Failed".as_bytes().to_vec() }, title: b"title".to_vec(), body: b"body".to_vec(), + approved_at: Some(1), } ) }); @@ -332,6 +337,7 @@ fn tally_calculation_succeeds() { voting_period: 3, approval_quorum_percentage: 50, approval_threshold_percentage: 50, + grace_period: 0, }; let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters); dummy_proposal.create_proposal_and_assert(Ok(())); @@ -505,6 +511,7 @@ fn cancel_proposal_succeeds() { voting_period: 3, approval_quorum_percentage: 60, approval_threshold_percentage: 60, + grace_period: 0, }; let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters); dummy_proposal.create_proposal_and_assert(Ok(())); @@ -523,10 +530,11 @@ fn cancel_proposal_succeeds() { proposal_type: 1, parameters, proposer_id: 1, - created: 1, + created_at: 1, status: ProposalStatus::Canceled, title: b"title".to_vec(), body: b"body".to_vec(), + approved_at: None } ) }); @@ -578,6 +586,7 @@ fn veto_proposal_succeeds() { voting_period: 3, approval_quorum_percentage: 60, approval_threshold_percentage: 60, + grace_period: 0, }; let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters); dummy_proposal.create_proposal_and_assert(Ok(())); @@ -596,10 +605,11 @@ fn veto_proposal_succeeds() { proposal_type: 1, parameters, proposer_id: 1, - created: 1, + created_at: 1, status: ProposalStatus::Vetoed, title: b"title".to_vec(), body: b"body".to_vec(), + approved_at: None } ) }); @@ -719,6 +729,7 @@ fn create_proposal_and_expire_it() { voting_period: 3, approval_quorum_percentage: 49, approval_threshold_percentage: 60, + grace_period: 0, }; let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters.clone()); @@ -736,11 +747,130 @@ fn create_proposal_and_expire_it() { proposal_type: 1, parameters, proposer_id: 1, - created: 1, + created_at: 1, status: ProposalStatus::Expired, title: b"title".to_vec(), body: b"body".to_vec(), + approved_at: None, } ) }); } + +#[test] +fn proposal_execution_postponed_because_of_grace_period() { + initial_test_ext().execute_with(|| { + let parameters = ProposalParameters { + voting_period: 3, + approval_quorum_percentage: 60, + approval_threshold_percentage: 60, + grace_period: 2, + }; + let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters); + dummy_proposal.create_proposal_and_assert(Ok(())); + + // last created proposal id equals current proposal count + let proposals_id = ::get(); + + let mut vote_generator = VoteGenerator::new(proposals_id); + vote_generator.vote_and_assert_ok(VoteKind::Approve); + vote_generator.vote_and_assert_ok(VoteKind::Approve); + vote_generator.vote_and_assert_ok(VoteKind::Approve); + vote_generator.vote_and_assert_ok(VoteKind::Approve); + + run_to_block_and_finalize(1); + run_to_block_and_finalize(2); + + let pending_proposals_ids = ::get(); + assert!(pending_proposals_ids + .iter() + .find(|&&x| x == proposals_id) + .is_some()); + + let proposal = >::get(proposals_id); + + assert_eq!( + proposal, + Proposal { + proposal_type: 1, + parameters, + proposer_id: 1, + created_at: 1, + status: ProposalStatus::PendingExecution, + title: b"title".to_vec(), + body: b"body".to_vec(), + approved_at: Some(1), + } + ); + }); +} + +#[test] +fn proposal_execution_succeeds_after_the_grace_period() { + initial_test_ext().execute_with(|| { + let parameters = ProposalParameters { + voting_period: 3, + approval_quorum_percentage: 60, + approval_threshold_percentage: 60, + grace_period: 1, + }; + let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters); + dummy_proposal.create_proposal_and_assert(Ok(())); + + // last created proposal id equals current proposal count + let proposals_id = ::get(); + + let mut vote_generator = VoteGenerator::new(proposals_id); + vote_generator.vote_and_assert_ok(VoteKind::Approve); + vote_generator.vote_and_assert_ok(VoteKind::Approve); + vote_generator.vote_and_assert_ok(VoteKind::Approve); + vote_generator.vote_and_assert_ok(VoteKind::Approve); + + run_to_block_and_finalize(1); + + let mut pending_proposals_ids = ::get(); + assert!(pending_proposals_ids + .iter() + .find(|&&x| x == proposals_id) + .is_some()); + + let mut proposal = >::get(proposals_id); + + assert_eq!( + proposal, + Proposal { + proposal_type: 1, + parameters, + proposer_id: 1, + created_at: 1, + status: ProposalStatus::PendingExecution, + title: b"title".to_vec(), + body: b"body".to_vec(), + approved_at: Some(1), + } + ); + + run_to_block_and_finalize(2); + + proposal = >::get(proposals_id); + + assert_eq!( + proposal, + Proposal { + proposal_type: 1, + parameters, + proposer_id: 1, + created_at: 1, + status: ProposalStatus::Executed, + title: b"title".to_vec(), + body: b"body".to_vec(), + approved_at: Some(1), + } + ); + pending_proposals_ids = ::get(); + assert!(pending_proposals_ids + .iter() + .find(|&&x| x == proposals_id) + .is_none()); + }); +} diff --git a/modules/proposals/engine/src/types.rs b/modules/proposals/engine/src/types.rs index 3dd5663138..5b7e66c910 100644 --- a/modules/proposals/engine/src/types.rs +++ b/modules/proposals/engine/src/types.rs @@ -21,6 +21,9 @@ pub enum ProposalStatus { /// must be no less than the quorum value for the given proposal type. Approved, + /// A proposal was approved and grace period is in effect + PendingExecution, + /// A proposal was rejected Rejected, @@ -77,6 +80,10 @@ pub struct ProposalParameters { /// During this period, votes can be accepted pub voting_period: BlockNumber, + /// A pause before execution of the approved proposal. Zero means approved proposal would be + /// executed immediately. + pub grace_period: BlockNumber, + /// Quorum percentage of approving voters required to pass a proposal. pub approval_quorum_percentage: u32, @@ -105,7 +112,10 @@ pub struct Proposal { pub body: Vec, /// When it was created. - pub created: BlockNumber, + pub created_at: BlockNumber, + + /// When it was approved. + pub approved_at: Option, // Any stake associated with the proposal. //pub stake: Option> @@ -118,7 +128,16 @@ impl + PartialOrd + Copy, AccountId> { /// Returns whether voting period expired by now pub fn is_voting_period_expired(&self, now: BlockNumber) -> bool { - now >= self.created + self.parameters.voting_period + now >= self.created_at + self.parameters.voting_period + } + + /// Returns whether grace period expired by now. Returns false if not approved. + pub fn is_grace_period_expired(&self, now: BlockNumber) -> bool { + if let Some(approved_at) = self.approved_at { + now >= approved_at + self.parameters.grace_period + } else { + false + } } /// Voting results tally for single proposal. @@ -288,7 +307,7 @@ mod tests { fn proposal_voting_period_expired() { let mut proposal = Proposal::::default(); - proposal.created = 1; + proposal.created_at = 1; proposal.parameters.voting_period = 3; assert!(proposal.is_voting_period_expired(4)); @@ -298,18 +317,58 @@ mod tests { fn proposal_voting_period_not_expired() { let mut proposal = Proposal::::default(); - proposal.created = 1; + proposal.created_at = 1; proposal.parameters.voting_period = 3; assert!(!proposal.is_voting_period_expired(3)); } + #[test] + fn proposal_grace_period_expired() { + let mut proposal = Proposal::::default(); + + proposal.approved_at = Some(1); + proposal.parameters.grace_period = 3; + + assert!(proposal.is_grace_period_expired(4)); + } + + #[test] + fn proposal_grace_period_auto_expired() { + let mut proposal = Proposal::::default(); + + proposal.approved_at = Some(1); + proposal.parameters.grace_period = 0; + + assert!(proposal.is_grace_period_expired(1)); + } + + #[test] + fn proposal_grace_period_not_expired() { + let mut proposal = Proposal::::default(); + + proposal.approved_at = Some(1); + proposal.parameters.grace_period = 3; + + assert!(!proposal.is_grace_period_expired(3)); + } + + #[test] + fn proposal_grace_period_not_expired_because_of_not_approved_proposal() { + let mut proposal = Proposal::::default(); + + proposal.approved_at = None; + proposal.parameters.grace_period = 3; + + assert!(!proposal.is_grace_period_expired(3)); + } + #[test] fn tally_results_proposal_expired() { let mut proposal = Proposal::::default(); let proposal_id = 1; let now = 5; - proposal.created = 1; + proposal.created_at = 1; proposal.parameters.voting_period = 3; proposal.parameters.approval_quorum_percentage = 80; proposal.parameters.approval_threshold_percentage = 40; @@ -347,7 +406,7 @@ mod tests { fn tally_results_proposal_approved() { let mut proposal = Proposal::::default(); let proposal_id = 1; - proposal.created = 1; + proposal.created_at = 1; proposal.parameters.voting_period = 3; proposal.parameters.approval_quorum_percentage = 60; @@ -391,7 +450,7 @@ mod tests { let proposal_id = 1; let now = 2; - proposal.created = 1; + proposal.created_at = 1; proposal.parameters.voting_period = 3; proposal.parameters.approval_quorum_percentage = 50; proposal.parameters.approval_threshold_percentage = 51; @@ -436,7 +495,7 @@ mod tests { let proposal_id = 1; let now = 2; - proposal.created = 1; + proposal.created_at = 1; proposal.parameters.voting_period = 3; proposal.parameters.approval_quorum_percentage = 60; From 0ae5765227272eb6a02d560fb049bd549091ac1a Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 11 Feb 2020 19:11:29 +0300 Subject: [PATCH 005/286] Simplify proposal tests - move acquiring proposal_id inside the method --- modules/proposals/engine/src/tests/mod.rs | 140 +++++++--------------- 1 file changed, 45 insertions(+), 95 deletions(-) diff --git a/modules/proposals/engine/src/tests/mod.rs b/modules/proposals/engine/src/tests/mod.rs index f992107709..5e682d87e2 100644 --- a/modules/proposals/engine/src/tests/mod.rs +++ b/modules/proposals/engine/src/tests/mod.rs @@ -67,7 +67,7 @@ impl DummyProposalFixture { } } - fn create_proposal_and_assert(self, result: dispatch::Result) { + fn create_proposal_and_assert(self, result: dispatch::Result) -> Option { assert_eq!( ProposalsEngine::create_proposal( self.origin.into(), @@ -79,6 +79,15 @@ impl DummyProposalFixture { ), result ); + + if result.is_ok() { + // last created proposal id equals current proposal count + let proposal_id = ::get(); + + Some(proposal_id) + } else { + None + } } } @@ -221,10 +230,7 @@ fn create_dummy_proposal_fails_with_insufficient_rights() { fn vote_succeeds() { initial_test_ext().execute_with(|| { let dummy_proposal = DummyProposalFixture::default(); - dummy_proposal.create_proposal_and_assert(Ok(())); - - // last created proposal id equals current proposal count - let proposal_id = ::get(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); let mut vote_generator = VoteGenerator::new(proposal_id); vote_generator.vote_and_assert_ok(VoteKind::Approve); @@ -251,12 +257,9 @@ fn proposal_execution_succeeds() { grace_period: 0, }; let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters); - dummy_proposal.create_proposal_and_assert(Ok(())); - - // last created proposal id equals current proposal count - let proposals_id = ::get(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); - let mut vote_generator = VoteGenerator::new(proposals_id); + let mut vote_generator = VoteGenerator::new(proposal_id); vote_generator.vote_and_assert_ok(VoteKind::Approve); vote_generator.vote_and_assert_ok(VoteKind::Approve); vote_generator.vote_and_assert_ok(VoteKind::Approve); @@ -264,7 +267,7 @@ fn proposal_execution_succeeds() { run_to_block_and_finalize(2); - let proposal = >::get(proposals_id); + let proposal = >::get(proposal_id); assert_eq!( proposal, @@ -297,12 +300,9 @@ fn proposal_execution_failed() { .with_parameters(parameters) .with_proposal_type_and_code(faulty_proposal.proposal_type(), faulty_proposal.encode()); - dummy_proposal.create_proposal_and_assert(Ok(())); - - // last created proposal id equals current proposal count - let proposals_id = ::get(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); - let mut vote_generator = VoteGenerator::new(proposals_id); + let mut vote_generator = VoteGenerator::new(proposal_id); vote_generator.vote_and_assert_ok(VoteKind::Approve); vote_generator.vote_and_assert_ok(VoteKind::Approve); vote_generator.vote_and_assert_ok(VoteKind::Approve); @@ -310,7 +310,7 @@ fn proposal_execution_failed() { run_to_block_and_finalize(2); - let proposal = >::get(proposals_id); + let proposal = >::get(proposal_id); assert_eq!( proposal, @@ -340,12 +340,9 @@ fn tally_calculation_succeeds() { grace_period: 0, }; let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters); - dummy_proposal.create_proposal_and_assert(Ok(())); - - // last created proposal id equals current proposal count - let proposals_id = ::get(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); - let mut vote_generator = VoteGenerator::new(proposals_id); + let mut vote_generator = VoteGenerator::new(proposal_id); vote_generator.vote_and_assert_ok(VoteKind::Approve); vote_generator.vote_and_assert_ok(VoteKind::Approve); vote_generator.vote_and_assert_ok(VoteKind::Reject); @@ -353,12 +350,12 @@ fn tally_calculation_succeeds() { run_to_block_and_finalize(2); - let tally_result = >::get(proposals_id); + let tally_result = >::get(proposal_id); assert_eq!( tally_result, TallyResult { - proposal_id: proposals_id, + proposal_id, abstentions: 1, approvals: 2, rejections: 1, @@ -373,10 +370,7 @@ fn tally_calculation_succeeds() { fn rejected_tally_results_and_remove_proposal_id_from_active_succeeds() { initial_test_ext().execute_with(|| { let dummy_proposal = DummyProposalFixture::default(); - dummy_proposal.create_proposal_and_assert(Ok(())); - - // last created proposal id equals current proposal count - let proposal_id = ::get(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); let mut vote_generator = VoteGenerator::new(proposal_id); vote_generator.vote_and_assert_ok(VoteKind::Reject); @@ -438,10 +432,7 @@ fn create_proposal_fails_with_invalid_body_or_title() { fn vote_fails_with_expired_voting_period() { initial_test_ext().execute_with(|| { let dummy_proposal = DummyProposalFixture::default(); - dummy_proposal.create_proposal_and_assert(Ok(())); - - // last created proposal id equals current proposal count - let proposal_id = ::get(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); run_to_block_and_finalize(6); @@ -457,10 +448,7 @@ fn vote_fails_with_expired_voting_period() { fn vote_fails_with_not_active_proposal() { initial_test_ext().execute_with(|| { let dummy_proposal = DummyProposalFixture::default(); - dummy_proposal.create_proposal_and_assert(Ok(())); - - // last created proposal id equals current proposal count - let proposal_id = ::get(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); let mut vote_generator = VoteGenerator::new(proposal_id); vote_generator.vote_and_assert_ok(VoteKind::Reject); @@ -488,10 +476,7 @@ fn vote_fails_with_absent_proposal() { fn vote_fails_on_double_voting() { initial_test_ext().execute_with(|| { let dummy_proposal = DummyProposalFixture::default(); - dummy_proposal.create_proposal_and_assert(Ok(())); - - // last created proposal id equals current proposal count - let proposal_id = ::get(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); let mut vote_generator = VoteGenerator::new(proposal_id); vote_generator.auto_increment_voter_id = false; @@ -514,10 +499,7 @@ fn cancel_proposal_succeeds() { grace_period: 0, }; let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters); - dummy_proposal.create_proposal_and_assert(Ok(())); - - // last created proposal id equals current proposal count - let proposal_id = ::get(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); let cancel_proposal = CancelProposalFixture::new(proposal_id); cancel_proposal.cancel_and_assert(Ok(())); @@ -544,10 +526,7 @@ fn cancel_proposal_succeeds() { fn cancel_proposal_fails_with_not_active_proposal() { initial_test_ext().execute_with(|| { let dummy_proposal = DummyProposalFixture::default(); - dummy_proposal.create_proposal_and_assert(Ok(())); - - // last created proposal id equals current proposal count - let proposal_id = ::get(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); run_to_block_and_finalize(6); @@ -568,10 +547,7 @@ fn cancel_proposal_fails_with_not_existing_proposal() { fn cancel_proposal_fails_with_insufficient_rights() { initial_test_ext().execute_with(|| { let dummy_proposal = DummyProposalFixture::default(); - dummy_proposal.create_proposal_and_assert(Ok(())); - - // last created proposal id equals current proposal count - let proposal_id = ::get(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); let cancel_proposal = CancelProposalFixture::new(proposal_id).with_origin(RawOrigin::Signed(2)); @@ -589,10 +565,7 @@ fn veto_proposal_succeeds() { grace_period: 0, }; let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters); - dummy_proposal.create_proposal_and_assert(Ok(())); - - // last created proposal id equals current proposal count - let proposal_id = ::get(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); let veto_proposal = VetoProposalFixture::new(proposal_id); veto_proposal.veto_and_assert(Ok(())); @@ -619,10 +592,7 @@ fn veto_proposal_succeeds() { fn veto_proposal_fails_with_not_active_proposal() { initial_test_ext().execute_with(|| { let dummy_proposal = DummyProposalFixture::default(); - dummy_proposal.create_proposal_and_assert(Ok(())); - - // last created proposal id equals current proposal count - let proposal_id = ::get(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); run_to_block_and_finalize(6); @@ -643,10 +613,7 @@ fn veto_proposal_fails_with_not_existing_proposal() { fn veto_proposal_fails_with_insufficient_rights() { initial_test_ext().execute_with(|| { let dummy_proposal = DummyProposalFixture::default(); - dummy_proposal.create_proposal_and_assert(Ok(())); - - // last created proposal id equals current proposal count - let proposal_id = ::get(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); let veto_proposal = VetoProposalFixture::new(proposal_id).with_origin(RawOrigin::Signed(2)); veto_proposal.veto_and_assert(Err("RequireRootOrigin")); @@ -667,10 +634,7 @@ fn create_proposal_event_emitted() { fn veto_proposal_event_emitted() { initial_test_ext().execute_with(|| { let dummy_proposal = DummyProposalFixture::default(); - dummy_proposal.create_proposal_and_assert(Ok(())); - - // last created proposal id equals current proposal count - let proposal_id = ::get(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); let veto_proposal = VetoProposalFixture::new(proposal_id); veto_proposal.veto_and_assert(Ok(())); @@ -687,10 +651,7 @@ fn veto_proposal_event_emitted() { fn cancel_proposal_event_emitted() { initial_test_ext().execute_with(|| { let dummy_proposal = DummyProposalFixture::default(); - dummy_proposal.create_proposal_and_assert(Ok(())); - - // last created proposal id equals current proposal count - let proposal_id = ::get(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); let cancel_proposal = CancelProposalFixture::new(proposal_id); cancel_proposal.cancel_and_assert(Ok(())); @@ -707,10 +668,7 @@ fn cancel_proposal_event_emitted() { fn vote_proposal_event_emitted() { initial_test_ext().execute_with(|| { let dummy_proposal = DummyProposalFixture::default(); - dummy_proposal.create_proposal_and_assert(Ok(())); - - // last created proposal id equals current proposal count - let proposal_id = ::get(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); let mut vote_generator = VoteGenerator::new(proposal_id); vote_generator.vote_and_assert_ok(VoteKind::Approve); @@ -733,12 +691,10 @@ fn create_proposal_and_expire_it() { }; let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters.clone()); - dummy_proposal.create_proposal_and_assert(Ok(())); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); run_to_block_and_finalize(8); - // last created proposal id equals current proposal count - let proposal_id = ::get(); let proposal = >::get(proposal_id); assert_eq!( @@ -767,12 +723,9 @@ fn proposal_execution_postponed_because_of_grace_period() { grace_period: 2, }; let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters); - dummy_proposal.create_proposal_and_assert(Ok(())); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); - // last created proposal id equals current proposal count - let proposals_id = ::get(); - - let mut vote_generator = VoteGenerator::new(proposals_id); + let mut vote_generator = VoteGenerator::new(proposal_id); vote_generator.vote_and_assert_ok(VoteKind::Approve); vote_generator.vote_and_assert_ok(VoteKind::Approve); vote_generator.vote_and_assert_ok(VoteKind::Approve); @@ -784,10 +737,10 @@ fn proposal_execution_postponed_because_of_grace_period() { let pending_proposals_ids = ::get(); assert!(pending_proposals_ids .iter() - .find(|&&x| x == proposals_id) + .find(|&&x| x == proposal_id) .is_some()); - let proposal = >::get(proposals_id); + let proposal = >::get(proposal_id); assert_eq!( proposal, @@ -815,12 +768,9 @@ fn proposal_execution_succeeds_after_the_grace_period() { grace_period: 1, }; let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters); - dummy_proposal.create_proposal_and_assert(Ok(())); - - // last created proposal id equals current proposal count - let proposals_id = ::get(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); - let mut vote_generator = VoteGenerator::new(proposals_id); + let mut vote_generator = VoteGenerator::new(proposal_id); vote_generator.vote_and_assert_ok(VoteKind::Approve); vote_generator.vote_and_assert_ok(VoteKind::Approve); vote_generator.vote_and_assert_ok(VoteKind::Approve); @@ -831,10 +781,10 @@ fn proposal_execution_succeeds_after_the_grace_period() { let mut pending_proposals_ids = ::get(); assert!(pending_proposals_ids .iter() - .find(|&&x| x == proposals_id) + .find(|&&x| x == proposal_id) .is_some()); - let mut proposal = >::get(proposals_id); + let mut proposal = >::get(proposal_id); assert_eq!( proposal, @@ -852,7 +802,7 @@ fn proposal_execution_succeeds_after_the_grace_period() { run_to_block_and_finalize(2); - proposal = >::get(proposals_id); + proposal = >::get(proposal_id); assert_eq!( proposal, @@ -870,7 +820,7 @@ fn proposal_execution_succeeds_after_the_grace_period() { pending_proposals_ids = ::get(); assert!(pending_proposals_ids .iter() - .find(|&&x| x == proposals_id) + .find(|&&x| x == proposal_id) .is_none()); }); } From b7d1db3751e35ba8fb387c6ef1f9507ef53fc011 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 11 Feb 2020 20:25:23 +0300 Subject: [PATCH 006/286] Update proposal codex module --- modules/proposals/codex/src/lib.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/proposals/codex/src/lib.rs b/modules/proposals/codex/src/lib.rs index 269fd218b8..8ec6db0471 100644 --- a/modules/proposals/codex/src/lib.rs +++ b/modules/proposals/codex/src/lib.rs @@ -32,8 +32,10 @@ decl_module! { /// Create text (signal) proposal type. On approval prints its content. pub fn create_text_proposal(origin, title: Vec, body: Vec) { let parameters = crate::ProposalParameters { - voting_period: T::BlockNumber::from(3u32), - approval_quorum_percentage: 49, + voting_period: T::BlockNumber::from(50000u32), + grace_period: T::BlockNumber::from(10000u32), + approval_quorum_percentage: 40, + approval_threshold_percentage: 51, }; let text_proposal = TextProposalExecutable{ From ba2270a9ca94d842f39ae9ba00cd07694d0a97ee Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Wed, 12 Feb 2020 18:18:30 +0300 Subject: [PATCH 007/286] Remove unnecessary crates --- modules/proposals/codex/Cargo.toml | 23 +--------------------- modules/proposals/codex/src/tests/mock.rs | 16 --------------- modules/proposals/engine/Cargo.toml | 21 -------------------- modules/proposals/engine/src/tests/mock.rs | 20 ++----------------- 4 files changed, 3 insertions(+), 77 deletions(-) diff --git a/modules/proposals/codex/Cargo.toml b/modules/proposals/codex/Cargo.toml index 892f79254b..9924c5017d 100644 --- a/modules/proposals/codex/Cargo.toml +++ b/modules/proposals/codex/Cargo.toml @@ -8,12 +8,9 @@ edition = '2018' default = ['std'] no_std = [] std = [ - 'sr-staking-primitives/std', - 'staking/std', 'codec/std', 'rstd/std', 'srml-support/std', - 'balances/std', 'primitives/std', 'runtime-primitives/std', 'system/std', @@ -55,12 +52,6 @@ git = 'https://github.com/paritytech/substrate.git' package = 'sr-primitives' rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' -[dependencies.sr-staking-primitives] -default_features = false -git = 'https://github.com/paritytech/substrate.git' -package = 'sr-staking-primitives' -rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' - [dependencies.srml-support] default_features = false git = 'https://github.com/paritytech/substrate.git' @@ -79,18 +70,6 @@ git = 'https://github.com/paritytech/substrate.git' package = 'srml-timestamp' rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' -[dependencies.staking] -default_features = false -git = 'https://github.com/paritytech/substrate.git' -package = 'srml-staking' -rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' - -[dependencies.balances] -default_features = false -git = 'https://github.com/paritytech/substrate.git' -package = 'srml-balances' -rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' - [dependencies.proposal_engine] default_features = false package = 'substrate-proposals-engine-module' @@ -100,4 +79,4 @@ path = '../engine' default_features = false git = 'https://github.com/paritytech/substrate.git' package = 'sr-io' -rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' +rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' \ No newline at end of file diff --git a/modules/proposals/codex/src/tests/mock.rs b/modules/proposals/codex/src/tests/mock.rs index 7f3fd33f74..2b0eff4796 100644 --- a/modules/proposals/codex/src/tests/mock.rs +++ b/modules/proposals/codex/src/tests/mock.rs @@ -89,22 +89,6 @@ parameter_types! { pub const InitialMembersBalance: u32 = 0; } -impl balances::Trait for Test { - /// The type for recording an account's balance. - type Balance = u64; - /// What to do if an account's free balance gets zeroed. - type OnFreeBalanceZero = (); - /// What to do if a new account is created. - type OnNewAccount = (); - /// The ubiquitous event type. - type Event = (); - - type DustRemoval = (); - type TransferPayment = (); - type ExistentialDeposit = ExistentialDeposit; - type TransferFee = TransferFee; - type CreationFee = CreationFee; -} // TODO add a Hook type to capture TriggerElection and CouncilElected hooks diff --git a/modules/proposals/engine/Cargo.toml b/modules/proposals/engine/Cargo.toml index 6656e695ac..ba4be6a7dd 100644 --- a/modules/proposals/engine/Cargo.toml +++ b/modules/proposals/engine/Cargo.toml @@ -8,12 +8,9 @@ edition = '2018' default = ['std'] no_std = [] std = [ - 'sr-staking-primitives/std', - 'staking/std', 'codec/std', 'rstd/std', 'srml-support/std', - 'balances/std', 'primitives/std', 'runtime-primitives/std', 'system/std', @@ -55,12 +52,6 @@ git = 'https://github.com/paritytech/substrate.git' package = 'sr-primitives' rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' -[dependencies.sr-staking-primitives] -default_features = false -git = 'https://github.com/paritytech/substrate.git' -package = 'sr-staking-primitives' -rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' - [dependencies.srml-support] default_features = false git = 'https://github.com/paritytech/substrate.git' @@ -79,18 +70,6 @@ git = 'https://github.com/paritytech/substrate.git' package = 'srml-timestamp' rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' -[dependencies.staking] -default_features = false -git = 'https://github.com/paritytech/substrate.git' -package = 'srml-staking' -rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' - -[dependencies.balances] -default_features = false -git = 'https://github.com/paritytech/substrate.git' -package = 'srml-balances' -rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' - [dev-dependencies.runtime-io] default_features = false git = 'https://github.com/paritytech/substrate.git' diff --git a/modules/proposals/engine/src/tests/mock.rs b/modules/proposals/engine/src/tests/mock.rs index 462fa912af..6be8db23d3 100644 --- a/modules/proposals/engine/src/tests/mock.rs +++ b/modules/proposals/engine/src/tests/mock.rs @@ -40,7 +40,8 @@ mod engine { impl_outer_event! { pub enum TestEvent for Test { - balances, engine, +// balances, + engine, } } @@ -95,23 +96,6 @@ parameter_types! { pub const InitialMembersBalance: u32 = 0; } -impl balances::Trait for Test { - /// The type for recording an account's balance. - type Balance = u64; - /// What to do if an account's free balance gets zeroed. - type OnFreeBalanceZero = (); - /// What to do if a new account is created. - type OnNewAccount = (); - - type Event = TestEvent; - - type DustRemoval = (); - type TransferPayment = (); - type ExistentialDeposit = ExistentialDeposit; - type TransferFee = TransferFee; - type CreationFee = CreationFee; -} - // TODO add a Hook type to capture TriggerElection and CouncilElected hooks // This function basically just builds a genesis storage key/value store according to From a56b4c5a0b7b3827c3ce65a1209affebb676b367 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Thu, 13 Feb 2020 16:40:55 +0300 Subject: [PATCH 008/286] Fix review comments 1 - introduce ProposalId type - change BTreeSet to the linked_map --- modules/proposals/engine/src/lib.rs | 66 +++++++++++++++------------ modules/proposals/engine/src/types.rs | 10 ++-- 2 files changed, 42 insertions(+), 34 deletions(-) diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index 04b641baea..022032f2bd 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -27,12 +27,13 @@ mod types; #[cfg(test)] mod tests; -use rstd::collections::btree_set::BTreeSet; use rstd::prelude::*; use runtime_primitives::traits::EnsureOrigin; -use srml_support::{decl_event, decl_module, decl_storage, dispatch, ensure, StorageDoubleMap}; +use srml_support::{decl_event, decl_module, decl_storage, dispatch, ensure, StorageDoubleMap, Parameter}; use system::ensure_root; + + const DEFAULT_TITLE_MAX_LEN: u32 = 100; const DEFAULT_BODY_MAX_LEN: u32 = 10_000; @@ -52,42 +53,46 @@ pub trait Trait: system::Trait + timestamp::Trait { /// Converts proposal code binary to executable representation type ProposalCodeDecoder: ProposalCodeDecoder; + + /// Proposal Id type + type ProposalId : From + Parameter + Default + Copy; } decl_event!( pub enum Event where - ::AccountId + ::AccountId, + ::ProposalId { /// Emits on proposal creation. /// Params: /// * Account id of a proposer. /// * Id of a newly created proposal after it was saved in storage. - ProposalCreated(AccountId, u32), + ProposalCreated(AccountId, ProposalId), /// Emits on proposal cancellation. /// Params: /// * Account id of a proposer. /// * Id of a cancelled proposal. - ProposalCanceled(AccountId, u32), + ProposalCanceled(AccountId, ProposalId), /// Emits on proposal veto. /// Params: /// * Id of a vetoed proposal. - ProposalVetoed(u32), + ProposalVetoed(ProposalId), /// Emits on proposal status change. /// Params: /// * Id of a updated proposal. /// * New proposal status - ProposalStatusUpdated(u32, ProposalStatus), + ProposalStatusUpdated(ProposalId, ProposalStatus), /// Emits on voting for the proposal /// Params: /// * Voter - an account id of a voter. /// * Id of a proposal. /// * Kind of vote. - Voted(AccountId, u32, VoteKind), + Voted(AccountId, ProposalId, VoteKind), } ); @@ -95,26 +100,27 @@ decl_event!( decl_storage! { trait Store for Module as ProposalsEngine{ /// Map proposal by its id. - pub Proposals get(fn proposals): map u32 => Proposal; + pub Proposals get(fn proposals): map T::ProposalId => Proposal; /// Count of all proposals that have been created. pub ProposalCount get(fn proposal_count): u32; /// Map proposal executable code by proposal id. - ProposalCode get(fn proposal_codes): map u32 => Vec; + ProposalCode get(fn proposal_codes): map T::ProposalId => Vec; /// Map votes by proposal id. - VotesByProposalId get(fn votes_by_proposal): map u32 => Vec>; + VotesByProposalId get(fn votes_by_proposal): map T::ProposalId => Vec>; /// Ids of proposals that are open for voting (have not been finalized yet). - pub ActiveProposalIds get(fn active_proposal_ids): BTreeSet; + pub ActiveProposalIds get(fn active_proposal_ids): linked_map T::ProposalId => (); /// Proposal tally results map - pub(crate) TallyResults get(fn tally_results): map u32 => TallyResult; + pub(crate) TallyResults get(fn tally_results): map T::ProposalId => + TallyResult; /// Double map for preventing duplicate votes VoteExistsByAccountByProposal get(fn vote_by_proposal_by_account): - double_map T::AccountId, twox_256(u32) => (); + double_map T::AccountId, twox_256(T::ProposalId) => (); /// Defines max allowed proposal title length. Can be configured. @@ -133,7 +139,7 @@ decl_module! { fn deposit_event() = default; /// Vote extrinsic. Conditions: origin must allow votes. - pub fn vote(origin, proposal_id: u32, vote: VoteKind) { + pub fn vote(origin, proposal_id: T::ProposalId, vote: VoteKind) { let voter_id = T::VoteOrigin::ensure_origin(origin)?; ensure!(>::exists(proposal_id), errors::MSG_PROPOSAL_NOT_FOUND); @@ -164,7 +170,7 @@ decl_module! { } /// Cancel a proposal by its original proposer. - pub fn cancel_proposal(origin, proposal_id: u32) { + pub fn cancel_proposal(origin, proposal_id: T::ProposalId) { let proposer_id = T::ProposalOrigin::ensure_origin(origin)?; ensure!(>::exists(proposal_id), errors::MSG_PROPOSAL_NOT_FOUND); @@ -180,7 +186,7 @@ decl_module! { } /// Veto a proposal. Must be root. - pub fn veto_proposal(origin, proposal_id: u32) { + pub fn veto_proposal(origin, proposal_id: T::ProposalId) { ensure_root(origin)?; ensure!(>::exists(proposal_id), errors::MSG_PROPOSAL_NOT_FOUND); @@ -247,12 +253,13 @@ impl Module { }; // mutation - >::insert(new_proposal_id, new_proposal); - ::insert(new_proposal_id, proposal_code); - ActiveProposalIds::mutate(|ids| ids.insert(new_proposal_id)); + let proposal_id = T::ProposalId::from(new_proposal_id); + >::insert(proposal_id, new_proposal); + >::insert(proposal_id, proposal_code); + >::insert(proposal_id, ()); ProposalCount::put(next_proposal_count_value); - Self::deposit_event(RawEvent::ProposalCreated(proposer_id, new_proposal_id)); + Self::deposit_event(RawEvent::ProposalCreated(proposer_id, proposal_id)); Ok(()) } @@ -265,7 +272,7 @@ impl Module { } // Executes approved proposal code - fn execute_proposal(proposal_id: u32) { + fn execute_proposal(proposal_id: T::ProposalId) { //let origin = system::RawOrigin::Root.into(); let proposal = Self::proposals(proposal_id); let proposal_code = Self::proposal_codes(proposal_id); @@ -291,11 +298,12 @@ impl Module { Self::update_proposal_status(proposal_id, new_proposal_status) } + // TODO convert to map-filter style /// Voting results tally. /// Returns proposals with changed status and tally results - fn tally() -> Vec> { + fn tally() -> Vec> { let mut results = Vec::new(); - for &proposal_id in Self::active_proposal_ids().iter() { + for (proposal_id, _) in >::enumerate() { let votes = Self::votes_by_proposal(proposal_id); let proposal = Self::proposals(proposal_id); @@ -313,9 +321,9 @@ impl Module { } /// Updates proposal status and removes proposal id from active id set. - fn update_proposal_status(proposal_id: u32, new_status: ProposalStatus) { + fn update_proposal_status(proposal_id: T::ProposalId, new_status: ProposalStatus) { >::mutate(proposal_id, |p| p.status = new_status.clone()); - ActiveProposalIds::mutate(|ids| ids.remove(&proposal_id)); + >::remove(&proposal_id); Self::deposit_event(RawEvent::ProposalStatusUpdated( proposal_id, @@ -329,7 +337,7 @@ impl Module { ProposalStatus::Approved => Self::approve_proposal(proposal_id), ProposalStatus::Active => { // restore active proposal id - ActiveProposalIds::mutate(|ids| ids.insert(proposal_id)); + >::insert(proposal_id, ()); } ProposalStatus::Executed | ProposalStatus::Failed { .. } @@ -339,10 +347,10 @@ impl Module { } /// Reject a proposal. The staked deposit will be returned to a proposer. - fn reject_proposal(_proposal_id: u32) {} + fn reject_proposal(_proposal_id: T::ProposalId) {} /// Approve a proposal. The staked deposit will be returned. - fn approve_proposal(proposal_id: u32) { + fn approve_proposal(proposal_id: T::ProposalId) { Self::execute_proposal(proposal_id); } } diff --git a/modules/proposals/engine/src/types.rs b/modules/proposals/engine/src/types.rs index 06656def86..5c03816bd7 100644 --- a/modules/proposals/engine/src/types.rs +++ b/modules/proposals/engine/src/types.rs @@ -125,13 +125,13 @@ impl + PartialOrd + Copy, AccountId> /// Voting results tally for single proposal. /// Parameters: own proposal id, current time, votes. /// Returns tally results if proposal status will should change - pub fn tally_results( + pub fn tally_results( self, - proposal_id: u32, + proposal_id: ProposalId, votes: Vec>, total_voters_count: u32, now: BlockNumber, - ) -> Option> { + ) -> Option> { let mut abstentions: u32 = 0; let mut approvals: u32 = 0; let mut rejections: u32 = 0; @@ -192,9 +192,9 @@ pub struct Vote { /// Tally result for the proposal #[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))] #[derive(Encode, Decode, Default, Clone, PartialEq, Eq)] -pub struct TallyResult { +pub struct TallyResult { /// Proposal Id - pub proposal_id: u32, + pub proposal_id: ProposalId, /// 'Abstention' votes count pub abstentions: u32, From 2495f3c27ebcc800a5dff498a21b722287d75d58 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Thu, 13 Feb 2020 16:46:27 +0300 Subject: [PATCH 009/286] Fix tests and update codex module --- modules/proposals/codex/src/tests/mock.rs | 2 ++ modules/proposals/engine/src/lib.rs | 8 ++++---- modules/proposals/engine/src/tests/mock.rs | 2 ++ modules/proposals/engine/src/tests/mod.rs | 11 +++-------- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/modules/proposals/codex/src/tests/mock.rs b/modules/proposals/codex/src/tests/mock.rs index 7f3fd33f74..dc72ab1d9e 100644 --- a/modules/proposals/codex/src/tests/mock.rs +++ b/modules/proposals/codex/src/tests/mock.rs @@ -45,6 +45,8 @@ impl proposal_engine::Trait for Test { type TotalVotersCounter = MockVotersParameters; type ProposalCodeDecoder = crate::ProposalType; + + type ProposalId = u32; } pub struct MockVotersParameters; diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index 022032f2bd..578bf058b2 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -29,11 +29,11 @@ mod tests; use rstd::prelude::*; use runtime_primitives::traits::EnsureOrigin; -use srml_support::{decl_event, decl_module, decl_storage, dispatch, ensure, StorageDoubleMap, Parameter}; +use srml_support::{ + decl_event, decl_module, decl_storage, dispatch, ensure, Parameter, StorageDoubleMap, +}; use system::ensure_root; - - const DEFAULT_TITLE_MAX_LEN: u32 = 100; const DEFAULT_BODY_MAX_LEN: u32 = 10_000; @@ -55,7 +55,7 @@ pub trait Trait: system::Trait + timestamp::Trait { type ProposalCodeDecoder: ProposalCodeDecoder; /// Proposal Id type - type ProposalId : From + Parameter + Default + Copy; + type ProposalId: From + Parameter + Default + Copy; } decl_event!( diff --git a/modules/proposals/engine/src/tests/mock.rs b/modules/proposals/engine/src/tests/mock.rs index 462fa912af..a39ad3ff8f 100644 --- a/modules/proposals/engine/src/tests/mock.rs +++ b/modules/proposals/engine/src/tests/mock.rs @@ -54,6 +54,8 @@ impl crate::Trait for Test { type TotalVotersCounter = (); type ProposalCodeDecoder = ProposalType; + + type ProposalId = u32; } impl VotersParameters for () { diff --git a/modules/proposals/engine/src/tests/mod.rs b/modules/proposals/engine/src/tests/mod.rs index d76585358d..9ec0b5d45e 100644 --- a/modules/proposals/engine/src/tests/mod.rs +++ b/modules/proposals/engine/src/tests/mod.rs @@ -166,7 +166,7 @@ impl VoteGenerator { struct EventFixture; impl EventFixture { - fn assert_events(expected_raw_events: Vec>) { + fn assert_events(expected_raw_events: Vec>) { let expected_events = expected_raw_events .iter() .map(|ev| EventRecord { @@ -377,11 +377,7 @@ fn rejected_tally_results_and_remove_proposal_id_from_active_succeeds() { vote_generator.vote_and_assert_ok(VoteKind::Abstain); vote_generator.vote_and_assert_ok(VoteKind::Abstain); - let mut active_proposals_id = ::get(); - - let mut active_proposals_set = BTreeSet::new(); - active_proposals_set.insert(proposal_id); - assert_eq!(active_proposals_id, active_proposals_set); + assert!(>::exists(proposal_id)); run_to_block_and_finalize(2); @@ -399,8 +395,7 @@ fn rejected_tally_results_and_remove_proposal_id_from_active_succeeds() { } ); - active_proposals_id = ::get(); - assert_eq!(active_proposals_id, BTreeSet::new()); + assert!(!>::exists(proposal_id)); }); } From a77f8e254597192a54ae57d302bf814566ed3a4f Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 14 Feb 2020 12:03:34 +0300 Subject: [PATCH 010/286] Embed tally results into the proposal object --- modules/proposals/engine/src/lib.rs | 32 ++++++------- modules/proposals/engine/src/tests/mod.rs | 42 ++++++++++++----- modules/proposals/engine/src/types.rs | 56 +++++++++-------------- 3 files changed, 68 insertions(+), 62 deletions(-) diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index 578bf058b2..1e37e70d5e 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -114,10 +114,6 @@ decl_storage! { /// Ids of proposals that are open for voting (have not been finalized yet). pub ActiveProposalIds get(fn active_proposal_ids): linked_map T::ProposalId => (); - /// Proposal tally results map - pub(crate) TallyResults get(fn tally_results): map T::ProposalId => - TallyResult; - /// Double map for preventing duplicate votes VoteExistsByAccountByProposal get(fn vote_by_proposal_by_account): double_map T::AccountId, twox_256(T::ProposalId) => (); @@ -202,14 +198,12 @@ decl_module! { /// Block finalization. Perform voting period check and vote result tally. fn on_finalize(_n: T::BlockNumber) { - let tally_results = Self::tally(); + let proposals_with_ready_result = Self::tally(); // mutation - - for tally_result in tally_results { - >::insert(tally_result.proposal_id, &tally_result); - - Self::update_proposal_status(tally_result.proposal_id, tally_result.status); + for (proposal_id, proposal, new_status) in proposals_with_ready_result { + >::insert(proposal_id, proposal); + Self::update_proposal_status(proposal_id, new_status); } } } @@ -250,6 +244,7 @@ impl Module { proposer_id: proposer_id.clone(), proposal_type, status: ProposalStatus::Active, + tally_results: None, }; // mutation @@ -301,19 +296,24 @@ impl Module { // TODO convert to map-filter style /// Voting results tally. /// Returns proposals with changed status and tally results - fn tally() -> Vec> { + fn tally() -> Vec<( + T::ProposalId, + Proposal, + ProposalStatus, + )> { let mut results = Vec::new(); for (proposal_id, _) in >::enumerate() { let votes = Self::votes_by_proposal(proposal_id); - let proposal = Self::proposals(proposal_id); + let mut proposal = Self::proposals(proposal_id); - if let Some(tally_result) = proposal.tally_results( - proposal_id, + proposal.update_tally_results( votes, T::TotalVotersCounter::total_voters_count(), Self::current_block(), - ) { - results.push(tally_result); + ); + + if let Some(tally_results) = proposal.tally_results.clone() { + results.push((proposal_id, proposal, tally_results.status)); } } diff --git a/modules/proposals/engine/src/tests/mod.rs b/modules/proposals/engine/src/tests/mod.rs index 9ec0b5d45e..68528b3e20 100644 --- a/modules/proposals/engine/src/tests/mod.rs +++ b/modules/proposals/engine/src/tests/mod.rs @@ -4,7 +4,6 @@ use crate::*; use mock::*; use codec::Encode; -use rstd::collections::btree_set::BTreeSet; use runtime_primitives::traits::{OnFinalize, OnInitialize}; use srml_support::{dispatch, StorageMap, StorageValue}; use system::RawOrigin; @@ -273,6 +272,13 @@ fn proposal_execution_succeeds() { status: ProposalStatus::Executed, title: b"title".to_vec(), body: b"body".to_vec(), + tally_results: Some(TallyResult { + abstentions: 0, + approvals: 4, + rejections: 0, + status: ProposalStatus::Approved, + finalized_at: 1 + }), } ) }); @@ -319,6 +325,13 @@ fn proposal_execution_failed() { }, title: b"title".to_vec(), body: b"body".to_vec(), + tally_results: Some(TallyResult { + abstentions: 0, + approvals: 4, + rejections: 0, + status: ProposalStatus::Approved, + finalized_at: 1 + }), } ) }); @@ -346,18 +359,17 @@ fn tally_calculation_succeeds() { run_to_block_and_finalize(2); - let tally_result = >::get(proposals_id); + let proposal = >::get(proposals_id); assert_eq!( - tally_result, - TallyResult { - proposal_id: proposals_id, + proposal.tally_results, + Some(TallyResult { abstentions: 1, approvals: 2, rejections: 1, status: ProposalStatus::Approved, finalized_at: 1 - } + }) ) }); } @@ -381,18 +393,17 @@ fn rejected_tally_results_and_remove_proposal_id_from_active_succeeds() { run_to_block_and_finalize(2); - let tally_result = >::get(proposal_id); + let proposal = >::get(proposal_id); assert_eq!( - tally_result, - TallyResult { - proposal_id, + proposal.tally_results, + Some(TallyResult { abstentions: 2, approvals: 0, rejections: 2, status: ProposalStatus::Rejected, finalized_at: 1 - } + }) ); assert!(!>::exists(proposal_id)); @@ -520,6 +531,7 @@ fn cancel_proposal_succeeds() { status: ProposalStatus::Canceled, title: b"title".to_vec(), body: b"body".to_vec(), + tally_results: None, } ) }); @@ -592,6 +604,7 @@ fn veto_proposal_succeeds() { status: ProposalStatus::Vetoed, title: b"title".to_vec(), body: b"body".to_vec(), + tally_results: None, } ) }); @@ -731,6 +744,13 @@ fn create_proposal_and_expire_it() { status: ProposalStatus::Expired, title: b"title".to_vec(), body: b"body".to_vec(), + tally_results: Some(TallyResult { + abstentions: 0, + approvals: 0, + rejections: 0, + status: ProposalStatus::Expired, + finalized_at: 4 + }), } ) }); diff --git a/modules/proposals/engine/src/types.rs b/modules/proposals/engine/src/types.rs index 5c03816bd7..0c4dae8495 100644 --- a/modules/proposals/engine/src/types.rs +++ b/modules/proposals/engine/src/types.rs @@ -112,6 +112,9 @@ pub struct Proposal { //pub stake: Option> /// Current proposal status pub status: ProposalStatus, + + /// Tally result for the proposal + pub tally_results: Option>, } impl + PartialOrd + Copy, AccountId> @@ -122,16 +125,15 @@ impl + PartialOrd + Copy, AccountId> now >= self.created + self.parameters.voting_period } - /// Voting results tally for single proposal. - /// Parameters: own proposal id, current time, votes. - /// Returns tally results if proposal status will should change - pub fn tally_results( - self, - proposal_id: ProposalId, + /// Calculates and updates voting results tally for current proposal. + /// Parameters: current time, votes, total voters number involved (council size) + /// Returns whether tally results are ready. + pub fn update_tally_results( + &mut self, votes: Vec>, total_voters_count: u32, now: BlockNumber, - ) -> Option> { + ) { let mut abstentions: u32 = 0; let mut approvals: u32 = 0; let mut rejections: u32 = 0; @@ -145,7 +147,7 @@ impl + PartialOrd + Copy, AccountId> } let proposal_status_decision = ProposalStatusDecision { - proposal: &self, + proposal: self, approvals, now, votes_count: votes.len() as u32, @@ -163,9 +165,8 @@ impl + PartialOrd + Copy, AccountId> None }; - if let Some(status) = new_status { + self.tally_results = if let Some(status) = new_status { Some(TallyResult { - proposal_id, abstentions, approvals, rejections, @@ -174,7 +175,7 @@ impl + PartialOrd + Copy, AccountId> }) } else { None - } + }; } } @@ -192,10 +193,7 @@ pub struct Vote { /// Tally result for the proposal #[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))] #[derive(Encode, Decode, Default, Clone, PartialEq, Eq)] -pub struct TallyResult { - /// Proposal Id - pub proposal_id: ProposalId, - +pub struct TallyResult { /// 'Abstention' votes count pub abstentions: u32, @@ -294,7 +292,6 @@ mod tests { #[test] fn tally_results_proposal_expired() { let mut proposal = Proposal::::default(); - let proposal_id = 1; let now = 5; proposal.created = 1; proposal.parameters.voting_period = 3; @@ -316,7 +313,6 @@ mod tests { ]; let expected_tally_results = TallyResult { - proposal_id, abstentions: 0, approvals: 2, rejections: 1, @@ -324,15 +320,12 @@ mod tests { finalized_at: now, }; - assert_eq!( - proposal.tally_results(proposal_id, votes, 5, now), - Some(expected_tally_results) - ); + proposal.update_tally_results(votes, 5, now); + assert_eq!(proposal.tally_results, Some(expected_tally_results)); } #[test] fn tally_results_proposal_approved() { let mut proposal = Proposal::::default(); - let proposal_id = 1; proposal.created = 1; proposal.parameters.voting_period = 3; proposal.parameters.approval_quorum_percentage = 60; @@ -357,7 +350,6 @@ mod tests { ]; let expected_tally_results = TallyResult { - proposal_id, abstentions: 0, approvals: 3, rejections: 1, @@ -365,16 +357,13 @@ mod tests { finalized_at: 2, }; - assert_eq!( - proposal.tally_results(proposal_id, votes, 5, 2), - Some(expected_tally_results) - ); + proposal.update_tally_results(votes, 5, 2); + assert_eq!(proposal.tally_results, Some(expected_tally_results)); } #[test] fn tally_results_proposal_rejected() { let mut proposal = Proposal::::default(); - let proposal_id = 1; let now = 2; proposal.created = 1; @@ -401,7 +390,6 @@ mod tests { ]; let expected_tally_results = TallyResult { - proposal_id, abstentions: 1, approvals: 1, rejections: 2, @@ -409,16 +397,13 @@ mod tests { finalized_at: now, }; - assert_eq!( - proposal.tally_results(proposal_id, votes, 4, now), - Some(expected_tally_results) - ); + proposal.update_tally_results(votes, 4, now); + assert_eq!(proposal.tally_results, Some(expected_tally_results)); } #[test] fn tally_results_are_empty_with_not_expired_voting_period() { let mut proposal = Proposal::::default(); - let proposal_id = 1; let now = 2; proposal.created = 1; @@ -430,6 +415,7 @@ mod tests { vote_kind: VoteKind::Abstain, }]; - assert_eq!(proposal.tally_results(proposal_id, votes, 5, now), None); + proposal.update_tally_results(votes, 5, now); + assert_eq!(proposal.tally_results, None); } } From 29c63ff57e78a6af0f9637bc3f7f29877c9856f8 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 14 Feb 2020 12:27:43 +0300 Subject: [PATCH 011/286] Embed votes into the proposal struct --- modules/proposals/engine/src/lib.rs | 12 +++++------- modules/proposals/engine/src/tests/mod.rs | 13 ++++++++++-- modules/proposals/engine/src/types.rs | 24 ++++++++++++----------- 3 files changed, 29 insertions(+), 20 deletions(-) diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index 1e37e70d5e..b6b969b90a 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -108,9 +108,6 @@ decl_storage! { /// Map proposal executable code by proposal id. ProposalCode get(fn proposal_codes): map T::ProposalId => Vec; - /// Map votes by proposal id. - VotesByProposalId get(fn votes_by_proposal): map T::ProposalId => Vec>; - /// Ids of proposals that are open for voting (have not been finalized yet). pub ActiveProposalIds get(fn active_proposal_ids): linked_map T::ProposalId => (); @@ -139,7 +136,7 @@ decl_module! { let voter_id = T::VoteOrigin::ensure_origin(origin)?; ensure!(>::exists(proposal_id), errors::MSG_PROPOSAL_NOT_FOUND); - let proposal = Self::proposals(proposal_id); + let mut proposal = Self::proposals(proposal_id); let not_expired = !proposal.is_voting_period_expired(Self::current_block()); ensure!(not_expired, errors::MSG_PROPOSAL_EXPIRED); @@ -158,9 +155,11 @@ decl_module! { vote_kind: vote.clone(), }; + proposal.votes.push(new_vote); + // mutation - >::mutate(proposal_id, |votes| votes.push(new_vote)); + >::insert(proposal_id, proposal); >::insert(voter_id.clone(), proposal_id, ()); Self::deposit_event(RawEvent::Voted(voter_id, proposal_id, vote)); } @@ -245,6 +244,7 @@ impl Module { proposal_type, status: ProposalStatus::Active, tally_results: None, + votes: Vec::new(), }; // mutation @@ -303,11 +303,9 @@ impl Module { )> { let mut results = Vec::new(); for (proposal_id, _) in >::enumerate() { - let votes = Self::votes_by_proposal(proposal_id); let mut proposal = Self::proposals(proposal_id); proposal.update_tally_results( - votes, T::TotalVotersCounter::total_voters_count(), Self::current_block(), ); diff --git a/modules/proposals/engine/src/tests/mod.rs b/modules/proposals/engine/src/tests/mod.rs index 68528b3e20..70c39434c2 100644 --- a/modules/proposals/engine/src/tests/mod.rs +++ b/modules/proposals/engine/src/tests/mod.rs @@ -132,6 +132,7 @@ struct VoteGenerator { proposal_id: u32, current_account_id: u64, pub auto_increment_voter_id: bool, + pub saved_votes: Vec> } impl VoteGenerator { @@ -140,14 +141,17 @@ impl VoteGenerator { proposal_id, current_account_id: 0, auto_increment_voter_id: true, + saved_votes: Vec::new(), } } fn vote_and_assert_ok(&mut self, vote_kind: VoteKind) { - assert_eq!(self.vote(vote_kind), Ok(())); + self.vote_and_assert(vote_kind, Ok(())); } fn vote_and_assert(&mut self, vote_kind: VoteKind, expected_result: dispatch::Result) { - assert_eq!(self.vote(vote_kind), expected_result); + assert_eq!(self.vote(vote_kind.clone()), expected_result); + + self.saved_votes.push( Vote{voter_id: self.current_account_id, vote_kind}); } fn vote(&mut self, vote_kind: VoteKind) -> dispatch::Result { @@ -279,6 +283,7 @@ fn proposal_execution_succeeds() { status: ProposalStatus::Approved, finalized_at: 1 }), + votes: vote_generator.saved_votes, } ) }); @@ -332,6 +337,7 @@ fn proposal_execution_failed() { status: ProposalStatus::Approved, finalized_at: 1 }), + votes: vote_generator.saved_votes, } ) }); @@ -532,6 +538,7 @@ fn cancel_proposal_succeeds() { title: b"title".to_vec(), body: b"body".to_vec(), tally_results: None, + votes: Vec::new(), } ) }); @@ -605,6 +612,7 @@ fn veto_proposal_succeeds() { title: b"title".to_vec(), body: b"body".to_vec(), tally_results: None, + votes: Vec::new(), } ) }); @@ -751,6 +759,7 @@ fn create_proposal_and_expire_it() { status: ProposalStatus::Expired, finalized_at: 4 }), + votes: Vec::new(), } ) }); diff --git a/modules/proposals/engine/src/types.rs b/modules/proposals/engine/src/types.rs index 0c4dae8495..f426617a1e 100644 --- a/modules/proposals/engine/src/types.rs +++ b/modules/proposals/engine/src/types.rs @@ -115,6 +115,9 @@ pub struct Proposal { /// Tally result for the proposal pub tally_results: Option>, + + /// Votes for the proposal + pub votes: Vec>, } impl + PartialOrd + Copy, AccountId> @@ -130,7 +133,6 @@ impl + PartialOrd + Copy, AccountId> /// Returns whether tally results are ready. pub fn update_tally_results( &mut self, - votes: Vec>, total_voters_count: u32, now: BlockNumber, ) { @@ -138,7 +140,7 @@ impl + PartialOrd + Copy, AccountId> let mut approvals: u32 = 0; let mut rejections: u32 = 0; - for vote in votes.iter() { + for vote in self.votes.iter() { match vote.vote_kind { VoteKind::Abstain => abstentions += 1, VoteKind::Approve => approvals += 1, @@ -150,7 +152,7 @@ impl + PartialOrd + Copy, AccountId> proposal: self, approvals, now, - votes_count: votes.len() as u32, + votes_count: self.votes.len() as u32, total_voters_count, }; @@ -297,7 +299,7 @@ mod tests { proposal.parameters.voting_period = 3; proposal.parameters.approval_quorum_percentage = 60; - let votes = vec![ + proposal.votes = vec![ Vote { voter_id: 1, vote_kind: VoteKind::Approve, @@ -320,7 +322,7 @@ mod tests { finalized_at: now, }; - proposal.update_tally_results(votes, 5, now); + proposal.update_tally_results(5, now); assert_eq!(proposal.tally_results, Some(expected_tally_results)); } #[test] @@ -330,7 +332,7 @@ mod tests { proposal.parameters.voting_period = 3; proposal.parameters.approval_quorum_percentage = 60; - let votes = vec![ + proposal.votes = vec![ Vote { voter_id: 1, vote_kind: VoteKind::Approve, @@ -357,7 +359,7 @@ mod tests { finalized_at: 2, }; - proposal.update_tally_results(votes, 5, 2); + proposal.update_tally_results(5, 2); assert_eq!(proposal.tally_results, Some(expected_tally_results)); } @@ -370,7 +372,7 @@ mod tests { proposal.parameters.voting_period = 3; proposal.parameters.approval_quorum_percentage = 60; - let votes = vec![ + proposal.votes = vec![ Vote { voter_id: 1, vote_kind: VoteKind::Reject, @@ -397,7 +399,7 @@ mod tests { finalized_at: now, }; - proposal.update_tally_results(votes, 4, now); + proposal.update_tally_results(4, now); assert_eq!(proposal.tally_results, Some(expected_tally_results)); } @@ -410,12 +412,12 @@ mod tests { proposal.parameters.voting_period = 3; proposal.parameters.approval_quorum_percentage = 60; - let votes = vec![Vote { + proposal.votes = vec![Vote { voter_id: 1, vote_kind: VoteKind::Abstain, }]; - proposal.update_tally_results(votes, 5, now); + proposal.update_tally_results(5, now); assert_eq!(proposal.tally_results, None); } } From a856fd206cbbaeb49df11c79f24afbf67c1ffd18 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 14 Feb 2020 15:18:50 +0300 Subject: [PATCH 012/286] Change VoteExistsByProposalByAccount cache - change VoteExistsByProposalByAccount to proposal_id first key - clear cache on proposal finalization --- modules/proposals/engine/src/lib.rs | 26 ++++++++---------- modules/proposals/engine/src/tests/mod.rs | 32 +++++++++++++++++++++-- modules/proposals/engine/src/types.rs | 6 +---- 3 files changed, 42 insertions(+), 22 deletions(-) diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index b6b969b90a..de8b43928e 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -111,9 +111,9 @@ decl_storage! { /// Ids of proposals that are open for voting (have not been finalized yet). pub ActiveProposalIds get(fn active_proposal_ids): linked_map T::ProposalId => (); - /// Double map for preventing duplicate votes - VoteExistsByAccountByProposal get(fn vote_by_proposal_by_account): - double_map T::AccountId, twox_256(T::ProposalId) => (); + /// Double map for preventing duplicate votes. Should be cleaned after usage. + pub(crate) VoteExistsByProposalByAccount get(fn vote_by_proposal_by_account): + double_map T::ProposalId, twox_256(T::AccountId) => (); /// Defines max allowed proposal title length. Can be configured. @@ -143,9 +143,9 @@ decl_module! { ensure!(proposal.status == ProposalStatus::Active, errors::MSG_PROPOSAL_FINALIZED); - let did_not_vote_before = !>::exists( + let did_not_vote_before = !>::exists( + proposal_id, voter_id.clone(), - proposal_id ); ensure!(did_not_vote_before, errors::MSG_YOU_ALREADY_VOTED); @@ -160,7 +160,7 @@ decl_module! { // mutation >::insert(proposal_id, proposal); - >::insert(voter_id.clone(), proposal_id, ()); + >::insert( proposal_id, voter_id.clone(), ()); Self::deposit_event(RawEvent::Voted(voter_id, proposal_id, vote)); } @@ -320,8 +320,11 @@ impl Module { /// Updates proposal status and removes proposal id from active id set. fn update_proposal_status(proposal_id: T::ProposalId, new_status: ProposalStatus) { + if new_status != ProposalStatus::Active { + >::remove(&proposal_id); + >::remove_prefix(&proposal_id); + } >::mutate(proposal_id, |p| p.status = new_status.clone()); - >::remove(&proposal_id); Self::deposit_event(RawEvent::ProposalStatusUpdated( proposal_id, @@ -333,14 +336,7 @@ impl Module { Self::reject_proposal(proposal_id) } ProposalStatus::Approved => Self::approve_proposal(proposal_id), - ProposalStatus::Active => { - // restore active proposal id - >::insert(proposal_id, ()); - } - ProposalStatus::Executed - | ProposalStatus::Failed { .. } - | ProposalStatus::Vetoed - | ProposalStatus::Canceled => {} // do nothing + _ => {} // do nothing } } diff --git a/modules/proposals/engine/src/tests/mod.rs b/modules/proposals/engine/src/tests/mod.rs index 70c39434c2..a39301da22 100644 --- a/modules/proposals/engine/src/tests/mod.rs +++ b/modules/proposals/engine/src/tests/mod.rs @@ -132,7 +132,7 @@ struct VoteGenerator { proposal_id: u32, current_account_id: u64, pub auto_increment_voter_id: bool, - pub saved_votes: Vec> + pub saved_votes: Vec>, } impl VoteGenerator { @@ -151,7 +151,10 @@ impl VoteGenerator { fn vote_and_assert(&mut self, vote_kind: VoteKind, expected_result: dispatch::Result) { assert_eq!(self.vote(vote_kind.clone()), expected_result); - self.saved_votes.push( Vote{voter_id: self.current_account_id, vote_kind}); + self.saved_votes.push(Vote { + voter_id: self.current_account_id, + vote_kind, + }); } fn vote(&mut self, vote_kind: VoteKind) -> dispatch::Result { @@ -764,3 +767,28 @@ fn create_proposal_and_expire_it() { ) }); } + +#[test] +fn voting_internal_cache_works_and_got_cleaned_successfully() { + initial_test_ext().execute_with(|| { + let dummy_proposal = DummyProposalFixture::default(); + dummy_proposal.create_proposal_and_assert(Ok(())); + + // last created proposal id equals current proposal count + let proposal_id = ::get(); + + let mut vote_generator = VoteGenerator::new(proposal_id); + vote_generator.vote_and_assert_ok(VoteKind::Reject); + vote_generator.vote_and_assert_ok(VoteKind::Reject); + vote_generator.vote_and_assert_ok(VoteKind::Abstain); + vote_generator.vote_and_assert_ok(VoteKind::Abstain); + + // cache exists + assert!(>::exists(proposal_id, 1)); + + run_to_block_and_finalize(2); + + // cache cleared + assert!(!>::exists(proposal_id, 1)); + }); +} \ No newline at end of file diff --git a/modules/proposals/engine/src/types.rs b/modules/proposals/engine/src/types.rs index f426617a1e..65127aab24 100644 --- a/modules/proposals/engine/src/types.rs +++ b/modules/proposals/engine/src/types.rs @@ -131,11 +131,7 @@ impl + PartialOrd + Copy, AccountId> /// Calculates and updates voting results tally for current proposal. /// Parameters: current time, votes, total voters number involved (council size) /// Returns whether tally results are ready. - pub fn update_tally_results( - &mut self, - total_voters_count: u32, - now: BlockNumber, - ) { + pub fn update_tally_results(&mut self, total_voters_count: u32, now: BlockNumber) { let mut abstentions: u32 = 0; let mut approvals: u32 = 0; let mut rejections: u32 = 0; From 484ae584cfc7fe521ed71e59b11d8497b1c70569 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 14 Feb 2020 16:15:31 +0300 Subject: [PATCH 013/286] Refactor tally() method - rename and refactor tally() method in functional style - introduce internal type FinalizedProposalData --- modules/proposals/engine/src/lib.rs | 74 ++++++++++++++--------- modules/proposals/engine/src/tests/mod.rs | 12 +++- modules/proposals/engine/src/types.rs | 12 ++++ 3 files changed, 67 insertions(+), 31 deletions(-) diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index de8b43928e..dff8cba91c 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -16,6 +16,7 @@ // Do not delete! Cannot be uncommented by default, because of Parity decl_module! issue. //#![warn(missing_docs)] +use types::FinalizedProposalData; pub use types::TallyResult; pub use types::{Proposal, ProposalParameters, ProposalStatus}; pub use types::{ProposalCodeDecoder, ProposalExecutable}; @@ -34,7 +35,9 @@ use srml_support::{ }; use system::ensure_root; +// Max allowed proposal title length. Can be used if config value is not filled. const DEFAULT_TITLE_MAX_LEN: u32 = 100; +// Max allowed proposal body length. Can be used if config value is not filled. const DEFAULT_BODY_MAX_LEN: u32 = 10_000; /// Proposals engine trait. @@ -197,12 +200,12 @@ decl_module! { /// Block finalization. Perform voting period check and vote result tally. fn on_finalize(_n: T::BlockNumber) { - let proposals_with_ready_result = Self::tally(); + let finalized_proposals_data = Self::get_finalized_proposals_data(); // mutation - for (proposal_id, proposal, new_status) in proposals_with_ready_result { - >::insert(proposal_id, proposal); - Self::update_proposal_status(proposal_id, new_status); + for proposal_data in finalized_proposals_data { + >::insert(proposal_data.proposal_id, proposal_data.proposal); + Self::update_proposal_status(proposal_data.proposal_id, proposal_data.status); } } } @@ -293,31 +296,46 @@ impl Module { Self::update_proposal_status(proposal_id, new_proposal_status) } - // TODO convert to map-filter style - /// Voting results tally. - /// Returns proposals with changed status and tally results - fn tally() -> Vec<( - T::ProposalId, - Proposal, - ProposalStatus, - )> { - let mut results = Vec::new(); - for (proposal_id, _) in >::enumerate() { - let mut proposal = Self::proposals(proposal_id); - - proposal.update_tally_results( - T::TotalVotersCounter::total_voters_count(), - Self::current_block(), - ); - - if let Some(tally_results) = proposal.tally_results.clone() { - results.push((proposal_id, proposal, tally_results.status)); - } - } - - results + /// Enumerates through active proposals. Tally Voting results. + /// Returns proposals with changed status, id and calculated tally results + fn get_finalized_proposals_data( + ) -> Vec> { + // enumerate active proposals id and gather finalization data + >::enumerate() + .map(|(proposal_id, _)| { + // load current proposal + let mut proposal = Self::proposals(proposal_id); + + // calculates voting results + proposal.update_tally_results( + T::TotalVotersCounter::total_voters_count(), + Self::current_block(), + ); + + // get new status from tally results + let mut new_status = ProposalStatus::Active; + if let Some(tally_results) = proposal.tally_results.clone() { + new_status = tally_results.status; + } + // proposal is finalized if not active + let finalized = new_status != ProposalStatus::Active; + + ( + FinalizedProposalData { + proposal_id, + proposal, + status: new_status, + }, + finalized, + ) + }) + .filter(|(_, finalized)| *finalized) // filter only finalized proposals + .map(|(data, _)| data) // get rid of used 'finalized' flag + .collect() // compose output vector } + // TODO: to be refactored or removed after introducing stakes. Events should be fired on actions + // such as 'rejected' or 'approved'. /// Updates proposal status and removes proposal id from active id set. fn update_proposal_status(proposal_id: T::ProposalId, new_status: ProposalStatus) { if new_status != ProposalStatus::Active { @@ -336,7 +354,7 @@ impl Module { Self::reject_proposal(proposal_id) } ProposalStatus::Approved => Self::approve_proposal(proposal_id), - _ => {} // do nothing + _ => {} // do nothing } } diff --git a/modules/proposals/engine/src/tests/mod.rs b/modules/proposals/engine/src/tests/mod.rs index a39301da22..8c2a99017e 100644 --- a/modules/proposals/engine/src/tests/mod.rs +++ b/modules/proposals/engine/src/tests/mod.rs @@ -784,11 +784,17 @@ fn voting_internal_cache_works_and_got_cleaned_successfully() { vote_generator.vote_and_assert_ok(VoteKind::Abstain); // cache exists - assert!(>::exists(proposal_id, 1)); + assert!(>::exists( + proposal_id, + 1 + )); run_to_block_and_finalize(2); // cache cleared - assert!(!>::exists(proposal_id, 1)); + assert!(!>::exists( + proposal_id, + 1 + )); }); -} \ No newline at end of file +} diff --git a/modules/proposals/engine/src/types.rs b/modules/proposals/engine/src/types.rs index 65127aab24..b9a473f568 100644 --- a/modules/proposals/engine/src/types.rs +++ b/modules/proposals/engine/src/types.rs @@ -263,6 +263,18 @@ pub trait ProposalCodeDecoder { ) -> Result, &'static str>; } +/// Data container for the finalized proposal results +pub(crate) struct FinalizedProposalData { + /// Proposal id + pub proposal_id: ProposalId, + + /// Proposal to be finalized + pub proposal: Proposal, + + /// Proposal finalization status + pub status: ProposalStatus, +} + #[cfg(test)] mod tests { use crate::*; From 1cea688324d7e7e4126fe15fa3931763b462bce2 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 14 Feb 2020 16:36:08 +0300 Subject: [PATCH 014/286] Codex module build fix --- modules/proposals/engine/src/types.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/proposals/engine/src/types.rs b/modules/proposals/engine/src/types.rs index b9a473f568..c860e19305 100644 --- a/modules/proposals/engine/src/types.rs +++ b/modules/proposals/engine/src/types.rs @@ -189,8 +189,8 @@ pub struct Vote { } /// Tally result for the proposal -#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))] -#[derive(Encode, Decode, Default, Clone, PartialEq, Eq)] +#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive(Encode, Decode, Default, Clone, PartialEq, Eq, Debug)] pub struct TallyResult { /// 'Abstention' votes count pub abstentions: u32, From f5857b3d9350af6b8d36e8d873c2f7a5dbea71d8 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 14 Feb 2020 16:57:57 +0300 Subject: [PATCH 015/286] Introduce proposer_id instead of account_id --- modules/proposals/codex/src/tests/mock.rs | 2 ++ modules/proposals/engine/src/lib.rs | 22 ++++++++----- modules/proposals/engine/src/tests/mock.rs | 2 ++ modules/proposals/engine/src/tests/mod.rs | 2 +- modules/proposals/engine/src/types.rs | 36 +++++++++++++--------- 5 files changed, 41 insertions(+), 23 deletions(-) diff --git a/modules/proposals/codex/src/tests/mock.rs b/modules/proposals/codex/src/tests/mock.rs index dc72ab1d9e..5f1f9eb113 100644 --- a/modules/proposals/codex/src/tests/mock.rs +++ b/modules/proposals/codex/src/tests/mock.rs @@ -47,6 +47,8 @@ impl proposal_engine::Trait for Test { type ProposalCodeDecoder = crate::ProposalType; type ProposalId = u32; + + type ProposerId = u64; } pub struct MockVotersParameters; diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index dff8cba91c..305468e681 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -59,25 +59,29 @@ pub trait Trait: system::Trait + timestamp::Trait { /// Proposal Id type type ProposalId: From + Parameter + Default + Copy; + + /// Type for the proposer id. Should be authenticated by account id. + type ProposerId: From + Parameter + Default; } decl_event!( pub enum Event where ::AccountId, - ::ProposalId + ::ProposalId, + ::ProposerId, { /// Emits on proposal creation. /// Params: /// * Account id of a proposer. /// * Id of a newly created proposal after it was saved in storage. - ProposalCreated(AccountId, ProposalId), + ProposalCreated(ProposerId, ProposalId), /// Emits on proposal cancellation. /// Params: /// * Account id of a proposer. /// * Id of a cancelled proposal. - ProposalCanceled(AccountId, ProposalId), + ProposalCanceled(ProposerId, ProposalId), /// Emits on proposal veto. /// Params: @@ -103,7 +107,8 @@ decl_event!( decl_storage! { trait Store for Module as ProposalsEngine{ /// Map proposal by its id. - pub Proposals get(fn proposals): map T::ProposalId => Proposal; + pub Proposals get(fn proposals): map T::ProposalId => + Proposal; /// Count of all proposals that have been created. pub ProposalCount get(fn proposal_count): u32; @@ -169,7 +174,8 @@ decl_module! { /// Cancel a proposal by its original proposer. pub fn cancel_proposal(origin, proposal_id: T::ProposalId) { - let proposer_id = T::ProposalOrigin::ensure_origin(origin)?; + let account_id = T::ProposalOrigin::ensure_origin(origin)?; + let proposer_id = T::ProposerId::from(account_id); ensure!(>::exists(proposal_id), errors::MSG_PROPOSAL_NOT_FOUND); let proposal = Self::proposals(proposal_id); @@ -221,7 +227,8 @@ impl Module { proposal_type: u32, proposal_code: Vec, ) -> dispatch::Result { - let proposer_id = T::ProposalOrigin::ensure_origin(origin)?; + let account_id = T::ProposalOrigin::ensure_origin(origin)?; + let proposer_id = T::ProposerId::from(account_id); ensure!(!title.is_empty(), errors::MSG_EMPTY_TITLE_PROVIDED); ensure!( @@ -299,7 +306,8 @@ impl Module { /// Enumerates through active proposals. Tally Voting results. /// Returns proposals with changed status, id and calculated tally results fn get_finalized_proposals_data( - ) -> Vec> { + ) -> Vec> + { // enumerate active proposals id and gather finalization data >::enumerate() .map(|(proposal_id, _)| { diff --git a/modules/proposals/engine/src/tests/mock.rs b/modules/proposals/engine/src/tests/mock.rs index a39ad3ff8f..2fbf601e63 100644 --- a/modules/proposals/engine/src/tests/mock.rs +++ b/modules/proposals/engine/src/tests/mock.rs @@ -56,6 +56,8 @@ impl crate::Trait for Test { type ProposalCodeDecoder = ProposalType; type ProposalId = u32; + + type ProposerId = u64; } impl VotersParameters for () { diff --git a/modules/proposals/engine/src/tests/mod.rs b/modules/proposals/engine/src/tests/mod.rs index 8c2a99017e..ff3582b30e 100644 --- a/modules/proposals/engine/src/tests/mod.rs +++ b/modules/proposals/engine/src/tests/mod.rs @@ -172,7 +172,7 @@ impl VoteGenerator { struct EventFixture; impl EventFixture { - fn assert_events(expected_raw_events: Vec>) { + fn assert_events(expected_raw_events: Vec>) { let expected_events = expected_raw_events .iter() .map(|ev| EventRecord { diff --git a/modules/proposals/engine/src/types.rs b/modules/proposals/engine/src/types.rs index c860e19305..cfca9b4631 100644 --- a/modules/proposals/engine/src/types.rs +++ b/modules/proposals/engine/src/types.rs @@ -89,7 +89,7 @@ pub struct ProposalParameters { /// 'Proposal' contains information necessary for the proposal system functioning. #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] #[derive(Encode, Decode, Default, Clone, PartialEq, Eq, Debug)] -pub struct Proposal { +pub struct Proposal { /// Proposal type id pub proposal_type: u32, @@ -97,7 +97,7 @@ pub struct Proposal { pub parameters: ProposalParameters, /// Identifier of member proposing. - pub proposer_id: AccountId, + pub proposer_id: ProposerId, /// Proposal title pub title: Vec, @@ -120,8 +120,9 @@ pub struct Proposal { pub votes: Vec>, } -impl + PartialOrd + Copy, AccountId> - Proposal +impl Proposal +where + BlockNumber: Add + PartialOrd + Copy, { /// Returns whether voting period expired by now pub fn is_voting_period_expired(&self, now: BlockNumber) -> bool { @@ -215,15 +216,16 @@ pub trait VotersParameters { } // Calculates quorum, votes threshold, expiration status -struct ProposalStatusDecision<'a, BlockNumber, AccountId> { - proposal: &'a Proposal, +struct ProposalStatusDecision<'a, BlockNumber, AccountId, ProposerId> { + proposal: &'a Proposal, now: BlockNumber, votes_count: u32, total_voters_count: u32, approvals: u32, } -impl<'a, BlockNumber, AccountId> ProposalStatusDecision<'a, BlockNumber, AccountId> +impl<'a, BlockNumber, AccountId, ProposerId> + ProposalStatusDecision<'a, BlockNumber, AccountId, ProposerId> where BlockNumber: Add + PartialOrd + Copy, { @@ -264,24 +266,28 @@ pub trait ProposalCodeDecoder { } /// Data container for the finalized proposal results -pub(crate) struct FinalizedProposalData { +pub(crate) struct FinalizedProposalData { /// Proposal id pub proposal_id: ProposalId, /// Proposal to be finalized - pub proposal: Proposal, + pub proposal: Proposal, /// Proposal finalization status pub status: ProposalStatus, } +//pub trait Proposer { +// ensure_origin(T::) +//} + #[cfg(test)] mod tests { use crate::*; #[test] fn proposal_voting_period_expired() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); proposal.created = 1; proposal.parameters.voting_period = 3; @@ -291,7 +297,7 @@ mod tests { #[test] fn proposal_voting_period_not_expired() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); proposal.created = 1; proposal.parameters.voting_period = 3; @@ -301,7 +307,7 @@ mod tests { #[test] fn tally_results_proposal_expired() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); let now = 5; proposal.created = 1; proposal.parameters.voting_period = 3; @@ -335,7 +341,7 @@ mod tests { } #[test] fn tally_results_proposal_approved() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); proposal.created = 1; proposal.parameters.voting_period = 3; proposal.parameters.approval_quorum_percentage = 60; @@ -373,7 +379,7 @@ mod tests { #[test] fn tally_results_proposal_rejected() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); let now = 2; proposal.created = 1; @@ -413,7 +419,7 @@ mod tests { #[test] fn tally_results_are_empty_with_not_expired_voting_period() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); let now = 2; proposal.created = 1; From 3b79fae2e2c7184c23b894cb06c8c208fcd63b7d Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 14 Feb 2020 17:09:32 +0300 Subject: [PATCH 016/286] Introduce VoterId type instead of AccountId for voting --- modules/proposals/codex/src/tests/mock.rs | 2 ++ modules/proposals/engine/src/lib.rs | 25 ++++++++++++---------- modules/proposals/engine/src/tests/mock.rs | 2 ++ modules/proposals/engine/src/tests/mod.rs | 6 +++--- modules/proposals/engine/src/types.rs | 25 ++++++++++------------ 5 files changed, 32 insertions(+), 28 deletions(-) diff --git a/modules/proposals/codex/src/tests/mock.rs b/modules/proposals/codex/src/tests/mock.rs index 5f1f9eb113..9b8142a463 100644 --- a/modules/proposals/codex/src/tests/mock.rs +++ b/modules/proposals/codex/src/tests/mock.rs @@ -49,6 +49,8 @@ impl proposal_engine::Trait for Test { type ProposalId = u32; type ProposerId = u64; + + type VoterId = u64; } pub struct MockVotersParameters; diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index 305468e681..aa58375cf1 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -62,14 +62,17 @@ pub trait Trait: system::Trait + timestamp::Trait { /// Type for the proposer id. Should be authenticated by account id. type ProposerId: From + Parameter + Default; + + /// Type for the voter id. Should be authenticated by account id. + type VoterId: From + Parameter + Default + Clone; } decl_event!( pub enum Event where - ::AccountId, ::ProposalId, ::ProposerId, + ::VoterId, { /// Emits on proposal creation. /// Params: @@ -99,7 +102,7 @@ decl_event!( /// * Voter - an account id of a voter. /// * Id of a proposal. /// * Kind of vote. - Voted(AccountId, ProposalId, VoteKind), + Voted(VoterId, ProposalId, VoteKind), } ); @@ -108,7 +111,7 @@ decl_storage! { trait Store for Module as ProposalsEngine{ /// Map proposal by its id. pub Proposals get(fn proposals): map T::ProposalId => - Proposal; + Proposal; /// Count of all proposals that have been created. pub ProposalCount get(fn proposal_count): u32; @@ -120,9 +123,8 @@ decl_storage! { pub ActiveProposalIds get(fn active_proposal_ids): linked_map T::ProposalId => (); /// Double map for preventing duplicate votes. Should be cleaned after usage. - pub(crate) VoteExistsByProposalByAccount get(fn vote_by_proposal_by_account): - double_map T::ProposalId, twox_256(T::AccountId) => (); - + pub(crate) VoteExistsByProposalByVoter get(fn vote_by_proposal_by_voter): + double_map T::ProposalId, twox_256(T::VoterId) => (); /// Defines max allowed proposal title length. Can be configured. TitleMaxLen get(title_max_len) config(): u32 = DEFAULT_TITLE_MAX_LEN; @@ -141,7 +143,8 @@ decl_module! { /// Vote extrinsic. Conditions: origin must allow votes. pub fn vote(origin, proposal_id: T::ProposalId, vote: VoteKind) { - let voter_id = T::VoteOrigin::ensure_origin(origin)?; + let account_id = T::VoteOrigin::ensure_origin(origin)?; + let voter_id = T::VoterId::from(account_id); ensure!(>::exists(proposal_id), errors::MSG_PROPOSAL_NOT_FOUND); let mut proposal = Self::proposals(proposal_id); @@ -151,7 +154,7 @@ decl_module! { ensure!(proposal.status == ProposalStatus::Active, errors::MSG_PROPOSAL_FINALIZED); - let did_not_vote_before = !>::exists( + let did_not_vote_before = !>::exists( proposal_id, voter_id.clone(), ); @@ -168,7 +171,7 @@ decl_module! { // mutation >::insert(proposal_id, proposal); - >::insert( proposal_id, voter_id.clone(), ()); + >::insert( proposal_id, voter_id.clone(), ()); Self::deposit_event(RawEvent::Voted(voter_id, proposal_id, vote)); } @@ -306,7 +309,7 @@ impl Module { /// Enumerates through active proposals. Tally Voting results. /// Returns proposals with changed status, id and calculated tally results fn get_finalized_proposals_data( - ) -> Vec> + ) -> Vec> { // enumerate active proposals id and gather finalization data >::enumerate() @@ -348,7 +351,7 @@ impl Module { fn update_proposal_status(proposal_id: T::ProposalId, new_status: ProposalStatus) { if new_status != ProposalStatus::Active { >::remove(&proposal_id); - >::remove_prefix(&proposal_id); + >::remove_prefix(&proposal_id); } >::mutate(proposal_id, |p| p.status = new_status.clone()); diff --git a/modules/proposals/engine/src/tests/mock.rs b/modules/proposals/engine/src/tests/mock.rs index 2fbf601e63..b27310c727 100644 --- a/modules/proposals/engine/src/tests/mock.rs +++ b/modules/proposals/engine/src/tests/mock.rs @@ -58,6 +58,8 @@ impl crate::Trait for Test { type ProposalId = u32; type ProposerId = u64; + + type VoterId = u64; } impl VotersParameters for () { diff --git a/modules/proposals/engine/src/tests/mod.rs b/modules/proposals/engine/src/tests/mod.rs index ff3582b30e..38831a1b94 100644 --- a/modules/proposals/engine/src/tests/mod.rs +++ b/modules/proposals/engine/src/tests/mod.rs @@ -172,7 +172,7 @@ impl VoteGenerator { struct EventFixture; impl EventFixture { - fn assert_events(expected_raw_events: Vec>) { + fn assert_events(expected_raw_events: Vec>) { let expected_events = expected_raw_events .iter() .map(|ev| EventRecord { @@ -784,7 +784,7 @@ fn voting_internal_cache_works_and_got_cleaned_successfully() { vote_generator.vote_and_assert_ok(VoteKind::Abstain); // cache exists - assert!(>::exists( + assert!(>::exists( proposal_id, 1 )); @@ -792,7 +792,7 @@ fn voting_internal_cache_works_and_got_cleaned_successfully() { run_to_block_and_finalize(2); // cache cleared - assert!(!>::exists( + assert!(!>::exists( proposal_id, 1 )); diff --git a/modules/proposals/engine/src/types.rs b/modules/proposals/engine/src/types.rs index cfca9b4631..9db9c8210a 100644 --- a/modules/proposals/engine/src/types.rs +++ b/modules/proposals/engine/src/types.rs @@ -89,7 +89,7 @@ pub struct ProposalParameters { /// 'Proposal' contains information necessary for the proposal system functioning. #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] #[derive(Encode, Decode, Default, Clone, PartialEq, Eq, Debug)] -pub struct Proposal { +pub struct Proposal { /// Proposal type id pub proposal_type: u32, @@ -117,10 +117,10 @@ pub struct Proposal { pub tally_results: Option>, /// Votes for the proposal - pub votes: Vec>, + pub votes: Vec>, } -impl Proposal +impl Proposal where BlockNumber: Add + PartialOrd + Copy, { @@ -181,9 +181,9 @@ where /// Vote. Characterized by voter and vote kind. #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] #[derive(Encode, Decode, Default, Clone, PartialEq, Eq, Debug)] -pub struct Vote { +pub struct Vote { /// Origin of the vote - pub voter_id: AccountId, + pub voter_id: VoterId, /// Vote kind pub vote_kind: VoteKind, @@ -216,16 +216,16 @@ pub trait VotersParameters { } // Calculates quorum, votes threshold, expiration status -struct ProposalStatusDecision<'a, BlockNumber, AccountId, ProposerId> { - proposal: &'a Proposal, +struct ProposalStatusDecision<'a, BlockNumber, VoterId, ProposerId> { + proposal: &'a Proposal, now: BlockNumber, votes_count: u32, total_voters_count: u32, approvals: u32, } -impl<'a, BlockNumber, AccountId, ProposerId> - ProposalStatusDecision<'a, BlockNumber, AccountId, ProposerId> +impl<'a, BlockNumber, VoterId, ProposerId> + ProposalStatusDecision<'a, BlockNumber, VoterId, ProposerId> where BlockNumber: Add + PartialOrd + Copy, { @@ -266,20 +266,17 @@ pub trait ProposalCodeDecoder { } /// Data container for the finalized proposal results -pub(crate) struct FinalizedProposalData { +pub(crate) struct FinalizedProposalData { /// Proposal id pub proposal_id: ProposalId, /// Proposal to be finalized - pub proposal: Proposal, + pub proposal: Proposal, /// Proposal finalization status pub status: ProposalStatus, } -//pub trait Proposer { -// ensure_origin(T::) -//} #[cfg(test)] mod tests { From cc81780fcbbb97ab19919dd90d1dfebbe833cbff Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 14 Feb 2020 17:49:44 +0300 Subject: [PATCH 017/286] Add TODO: add maximum allowed active proposals --- modules/proposals/engine/src/lib.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index aa58375cf1..578c041567 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -35,6 +35,8 @@ use srml_support::{ }; use system::ensure_root; +// TODO: add maximum allowed active proposals + // Max allowed proposal title length. Can be used if config value is not filled. const DEFAULT_TITLE_MAX_LEN: u32 = 100; // Max allowed proposal body length. Can be used if config value is not filled. From 123ea3040e11fef0ae041c5e0b471996afdce3da Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 14 Feb 2020 18:40:09 +0300 Subject: [PATCH 018/286] Add stake dependency - add joystream stake & substrate balances dependency - modify mocks - add stake to the ProposalParameters --- modules/proposals/codex/Cargo.toml | 16 +++++ modules/proposals/codex/src/lib.rs | 6 ++ modules/proposals/codex/src/tests/mock.rs | 46 ++++++++++---- modules/proposals/engine/Cargo.toml | 15 +++++ modules/proposals/engine/src/errors.rs | 5 +- modules/proposals/engine/src/lib.rs | 27 +++++--- modules/proposals/engine/src/tests/mock.rs | 73 ++++++++++++++-------- modules/proposals/engine/src/tests/mod.rs | 13 +++- modules/proposals/engine/src/types.rs | 49 +++++++++------ 9 files changed, 178 insertions(+), 72 deletions(-) diff --git a/modules/proposals/codex/Cargo.toml b/modules/proposals/codex/Cargo.toml index 9924c5017d..6331dbb982 100644 --- a/modules/proposals/codex/Cargo.toml +++ b/modules/proposals/codex/Cargo.toml @@ -16,6 +16,9 @@ std = [ 'system/std', 'timestamp/std', 'serde', + 'proposal_engine/std', + 'stake/std', + 'balances/std', ] @@ -70,6 +73,19 @@ git = 'https://github.com/paritytech/substrate.git' package = 'srml-timestamp' rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' +[dependencies.balances] +package = 'srml-balances' +default-features = false +git = 'https://github.com/paritytech/substrate.git' +rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' + +[dependencies.stake] +default_features = false +git = 'https://github.com/joystream/substrate-stake-module' +package = 'substrate-stake-module' +rev = '0516efe9230da112bc095e28f34a3715c2e03ca8' + + [dependencies.proposal_engine] default_features = false package = 'substrate-proposals-engine-module' diff --git a/modules/proposals/codex/src/lib.rs b/modules/proposals/codex/src/lib.rs index 8ec6db0471..86776bbd4a 100644 --- a/modules/proposals/codex/src/lib.rs +++ b/modules/proposals/codex/src/lib.rs @@ -22,10 +22,15 @@ use proposal_engine::*; use rstd::clone::Clone; use rstd::vec::Vec; use srml_support::decl_module; +use rstd::prelude::*; /// 'Proposals codex' substrate module Trait pub trait Trait: system::Trait + proposal_engine::Trait {} +use srml_support::traits::{Currency}; +pub type BalanceOf = +<::Currency as Currency<::AccountId>>::Balance; + decl_module! { /// 'Proposal codex' substrate module pub struct Module for enum Call where origin: T::Origin { @@ -36,6 +41,7 @@ decl_module! { grace_period: T::BlockNumber::from(10000u32), approval_quorum_percentage: 40, approval_threshold_percentage: 51, + stake: Some(>::from(500u32)) }; let text_proposal = TextProposalExecutable{ diff --git a/modules/proposals/codex/src/tests/mock.rs b/modules/proposals/codex/src/tests/mock.rs index 2b0eff4796..700c24d82c 100644 --- a/modules/proposals/codex/src/tests/mock.rs +++ b/modules/proposals/codex/src/tests/mock.rs @@ -26,6 +26,7 @@ parameter_types! { pub const MaximumBlockLength: u32 = 2 * 1024; pub const AvailableBlockRatio: Perbill = Perbill::one(); pub const MinimumPeriod: u64 = 5; + pub const StakePoolId: [u8; 8] = *b"joystake"; } impl_outer_dispatch! { @@ -35,6 +36,38 @@ impl_outer_dispatch! { } } +parameter_types! { + pub const ExistentialDeposit: u32 = 0; + pub const TransferFee: u32 = 0; + pub const CreationFee: u32 = 0; +} + +impl balances::Trait for Test { + /// The type for recording an account's balance. + type Balance = u64; + /// What to do if an account's free balance gets zeroed. + type OnFreeBalanceZero = (); + /// What to do if a new account is created. + type OnNewAccount = (); + + type Event = (); + + type DustRemoval = (); + type TransferPayment = (); + type ExistentialDeposit = ExistentialDeposit; + type TransferFee = TransferFee; + type CreationFee = CreationFee; +} + + +impl stake::Trait for Test { + type Currency = Balances; + type StakePoolId = StakePoolId; + type StakingEventsHandler = (); + type StakeId = u64; + type SlashId = u64; +} + impl proposal_engine::Trait for Test { type Event = (); @@ -80,20 +113,8 @@ impl timestamp::Trait for Test { type MinimumPeriod = MinimumPeriod; } -parameter_types! { - pub const ExistentialDeposit: u32 = 0; - pub const TransferFee: u32 = 0; - pub const CreationFee: u32 = 0; - pub const TransactionBaseFee: u32 = 1; - pub const TransactionByteFee: u32 = 0; - pub const InitialMembersBalance: u32 = 0; -} - - // TODO add a Hook type to capture TriggerElection and CouncilElected hooks -// This function basically just builds a genesis storage key/value store according to -// our desired mockup. pub fn initial_test_ext() -> runtime_io::TestExternalities { let t = system::GenesisConfig::default() .build_storage::() @@ -104,3 +125,4 @@ pub fn initial_test_ext() -> runtime_io::TestExternalities { pub type ProposalCodex = crate::Module; pub type ProposalsEngine = proposal_engine::Module; +pub type Balances = balances::Module; diff --git a/modules/proposals/engine/Cargo.toml b/modules/proposals/engine/Cargo.toml index ba4be6a7dd..ff0f9a6881 100644 --- a/modules/proposals/engine/Cargo.toml +++ b/modules/proposals/engine/Cargo.toml @@ -16,6 +16,8 @@ std = [ 'system/std', 'timestamp/std', 'serde', + 'stake/std', + 'balances/std', ] @@ -70,8 +72,21 @@ git = 'https://github.com/paritytech/substrate.git' package = 'srml-timestamp' rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' +[dependencies.balances] +package = 'srml-balances' +default-features = false +git = 'https://github.com/paritytech/substrate.git' +rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' + +[dependencies.stake] +default_features = false +git = 'https://github.com/joystream/substrate-stake-module' +package = 'substrate-stake-module' +rev = '0516efe9230da112bc095e28f34a3715c2e03ca8' + [dev-dependencies.runtime-io] default_features = false git = 'https://github.com/paritytech/substrate.git' package = 'sr-io' rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' + diff --git a/modules/proposals/engine/src/errors.rs b/modules/proposals/engine/src/errors.rs index 602e6ddf98..3d5bb4f629 100644 --- a/modules/proposals/engine/src/errors.rs +++ b/modules/proposals/engine/src/errors.rs @@ -7,11 +7,8 @@ pub const MSG_PROPOSAL_EXPIRED: &str = "Voting period is expired for this propos pub const MSG_PROPOSAL_FINALIZED: &str = "Proposal is finalized already"; pub const MSG_YOU_ALREADY_VOTED: &str = "You have already voted on this proposal"; pub const MSG_YOU_DONT_OWN_THIS_PROPOSAL: &str = "You do not own this proposal"; - -//pub const MSG_STAKE_IS_TOO_LOW: &str = "Stake is too low"; //pub const MSG_STAKE_IS_GREATER_THAN_BALANCE: &str = "Balance is too low to be staked"; + //pub const MSG_ONLY_MEMBERS_CAN_PROPOSE: &str = "Only members can make a proposal"; //pub const MSG_ONLY_COUNCILORS_CAN_VOTE: &str = "Only councilors can vote on proposals"; //pub const MSG_PROPOSAL_STATUS_ALREADY_UPDATED: &str = "Proposal status has been updated already"; -//pub const MSG_EMPTY_WASM_CODE_PROVIDED: &str = "Proposal cannot have an empty WASM code"; -//pub const MSG_TOO_LONG_WASM_CODE: &str = "WASM code is too big"; diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index a04d6ad617..d86c684dd5 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -37,7 +37,7 @@ const DEFAULT_TITLE_MAX_LEN: u32 = 100; const DEFAULT_BODY_MAX_LEN: u32 = 10_000; /// Proposals engine trait. -pub trait Trait: system::Trait + timestamp::Trait { +pub trait Trait: system::Trait + timestamp::Trait + stake::Trait{ /// Engine event type. type Event: From> + Into<::Event>; @@ -94,18 +94,18 @@ decl_event!( // Storage for the proposals module decl_storage! { - trait Store for Module as ProposalsEngine{ + pub trait Store for Module as ProposalsEngine{ /// Map proposal by its id. - pub Proposals get(fn proposals): map u32 => Proposal; + pub Proposals get(fn proposals): map u32 => Proposal>; /// Count of all proposals that have been created. pub ProposalCount get(fn proposal_count): u32; /// Map proposal executable code by proposal id. - ProposalCode get(fn proposal_codes): map u32 => Vec; + pub ProposalCode get(fn proposal_codes): map u32 => Vec; /// Map votes by proposal id. - VotesByProposalId get(fn votes_by_proposal): map u32 => Vec>; + pub VotesByProposalId get(fn votes_by_proposal): map u32 => Vec>; /// Ids of proposals that are open for voting (have not been finalized yet). pub ActiveProposalIds get(fn active_proposal_ids): BTreeSet; @@ -114,18 +114,18 @@ decl_storage! { pub PendingExecutionProposalIds get(fn pending_proposal_ids): BTreeSet; /// Proposal tally results map - pub(crate) TallyResults get(fn tally_results): map u32 => TallyResult; + pub TallyResults get(fn tally_results): map u32 => TallyResult; /// Double map for preventing duplicate votes - VoteExistsByAccountByProposal get(fn vote_by_proposal_by_account): + pub VoteExistsByAccountByProposal get(fn vote_by_proposal_by_account): double_map T::AccountId, twox_256(u32) => (); /// Defines max allowed proposal title length. Can be configured. - TitleMaxLen get(title_max_len) config(): u32 = DEFAULT_TITLE_MAX_LEN; + pub TitleMaxLen get(title_max_len) config(): u32 = DEFAULT_TITLE_MAX_LEN; /// Defines max allowed proposal body length. Can be configured. - BodyMaxLen get(body_max_len) config(): u32 = DEFAULT_BODY_MAX_LEN; + pub BodyMaxLen get(body_max_len) config(): u32 = DEFAULT_BODY_MAX_LEN; } } @@ -226,7 +226,7 @@ impl Module { /// Create proposal. Requires 'proposal origin' membership. pub fn create_proposal( origin: T::Origin, - parameters: ProposalParameters, + parameters: ProposalParameters>, title: Vec, body: Vec, proposal_type: u32, @@ -261,6 +261,11 @@ impl Module { }; // mutation + + // Lock proposer's stake: + // T::Currency::reserve(&proposer_id, stake) + // .map_err(|_| errors::MSG_STAKE_IS_GREATER_THAN_BALANCE)?; + >::insert(new_proposal_id, new_proposal); ::insert(new_proposal_id, proposal_code); ActiveProposalIds::mutate(|ids| ids.insert(new_proposal_id)); @@ -272,6 +277,8 @@ impl Module { } } +impl Module {} + impl Module { // Wrapper-function over system::block_number() fn current_block() -> T::BlockNumber { diff --git a/modules/proposals/engine/src/tests/mock.rs b/modules/proposals/engine/src/tests/mock.rs index 6be8db23d3..3f22402f14 100644 --- a/modules/proposals/engine/src/tests/mock.rs +++ b/modules/proposals/engine/src/tests/mock.rs @@ -1,7 +1,6 @@ #![cfg(test)] pub use system; - pub use primitives::{Blake2Hasher, H256}; pub use runtime_primitives::{ testing::{Digest, DigestItem, Header, UintAuthorityId}, @@ -9,25 +8,18 @@ pub use runtime_primitives::{ weights::Weight, BuildStorage, Perbill, }; - -use crate::VotersParameters; use srml_support::{impl_outer_dispatch, impl_outer_event, impl_outer_origin, parameter_types}; -impl_outer_origin! { - pub enum Origin for Test {} -} // Workaround for https://github.com/rust-lang/rust/issues/26925 . Remove when sorted. #[derive(Clone, PartialEq, Eq, Debug)] pub struct Test; -parameter_types! { - pub const BlockHashCount: u64 = 250; - pub const MaximumBlockWeight: u32 = 1024; - pub const MaximumBlockLength: u32 = 2 * 1024; - pub const AvailableBlockRatio: Perbill = Perbill::one(); - pub const MinimumPeriod: u64 = 5; + +impl_outer_origin! { + pub enum Origin for Test {} } + impl_outer_dispatch! { pub enum Call for Test where origin: Origin { proposals::ProposalsEngine, @@ -40,11 +32,43 @@ mod engine { impl_outer_event! { pub enum TestEvent for Test { -// balances, + balances, engine, } } +parameter_types! { + pub const ExistentialDeposit: u32 = 0; + pub const TransferFee: u32 = 0; + pub const CreationFee: u32 = 0; +} + +impl balances::Trait for Test { + /// The type for recording an account's balance. + type Balance = u64; + /// What to do if an account's free balance gets zeroed. + type OnFreeBalanceZero = (); + /// What to do if a new account is created. + type OnNewAccount = (); + + type Event = TestEvent; + + type DustRemoval = (); + type TransferPayment = (); + type ExistentialDeposit = ExistentialDeposit; + type TransferFee = TransferFee; + type CreationFee = CreationFee; +} + + +impl stake::Trait for Test { + type Currency = Balances; + type StakePoolId = StakePoolId; + type StakingEventsHandler = (); + type StakeId = u64; + type SlashId = u64; +} + impl crate::Trait for Test { type Event = TestEvent; @@ -57,12 +81,21 @@ impl crate::Trait for Test { type ProposalCodeDecoder = ProposalType; } -impl VotersParameters for () { +impl crate::VotersParameters for () { fn total_voters_count() -> u32 { 4 } } +parameter_types! { + pub const BlockHashCount: u64 = 250; + pub const MaximumBlockWeight: u32 = 1024; + pub const MaximumBlockLength: u32 = 2 * 1024; + pub const AvailableBlockRatio: Perbill = Perbill::one(); + pub const MinimumPeriod: u64 = 5; + pub const StakePoolId: [u8; 8] = *b"joystake"; +} + impl system::Trait for Test { type Origin = Origin; type Index = u64; @@ -87,19 +120,8 @@ impl timestamp::Trait for Test { type MinimumPeriod = MinimumPeriod; } -parameter_types! { - pub const ExistentialDeposit: u32 = 0; - pub const TransferFee: u32 = 0; - pub const CreationFee: u32 = 0; - pub const TransactionBaseFee: u32 = 1; - pub const TransactionByteFee: u32 = 0; - pub const InitialMembersBalance: u32 = 0; -} - // TODO add a Hook type to capture TriggerElection and CouncilElected hooks -// This function basically just builds a genesis storage key/value store according to -// our desired mockup. pub fn initial_test_ext() -> runtime_io::TestExternalities { let t = system::GenesisConfig::default() .build_storage::() @@ -110,6 +132,7 @@ pub fn initial_test_ext() -> runtime_io::TestExternalities { pub type ProposalsEngine = crate::Module; pub type System = system::Module; +pub type Balances = balances::Module; use codec::{Decode, Encode}; use num_enum::{IntoPrimitive, TryFromPrimitive}; diff --git a/modules/proposals/engine/src/tests/mod.rs b/modules/proposals/engine/src/tests/mod.rs index 5e682d87e2..e1f2e71342 100644 --- a/modules/proposals/engine/src/tests/mod.rs +++ b/modules/proposals/engine/src/tests/mod.rs @@ -11,7 +11,7 @@ use system::RawOrigin; use system::{EventRecord, Phase}; struct DummyProposalFixture { - parameters: ProposalParameters, + parameters: ProposalParameters, origin: RawOrigin, proposal_type: u32, proposal_code: Vec, @@ -32,6 +32,7 @@ impl Default for DummyProposalFixture { approval_quorum_percentage: 60, approval_threshold_percentage: 60, grace_period: 0, + stake: None, }, origin: RawOrigin::Signed(1), proposal_type: dummy_proposal.proposal_type(), @@ -51,7 +52,7 @@ impl DummyProposalFixture { } } - fn with_parameters(self, parameters: ProposalParameters) -> Self { + fn with_parameters(self, parameters: ProposalParameters) -> Self { DummyProposalFixture { parameters, ..self } } @@ -255,6 +256,7 @@ fn proposal_execution_succeeds() { approval_quorum_percentage: 60, approval_threshold_percentage: 60, grace_period: 0, + stake: None, }; let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters); let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); @@ -293,6 +295,7 @@ fn proposal_execution_failed() { approval_quorum_percentage: 60, approval_threshold_percentage: 60, grace_period: 0, + stake: None, }; let faulty_proposal = FaultyExecutable; @@ -338,6 +341,7 @@ fn tally_calculation_succeeds() { approval_quorum_percentage: 50, approval_threshold_percentage: 50, grace_period: 0, + stake: None, }; let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters); let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); @@ -497,6 +501,7 @@ fn cancel_proposal_succeeds() { approval_quorum_percentage: 60, approval_threshold_percentage: 60, grace_period: 0, + stake: None, }; let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters); let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); @@ -563,6 +568,7 @@ fn veto_proposal_succeeds() { approval_quorum_percentage: 60, approval_threshold_percentage: 60, grace_period: 0, + stake: None, }; let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters); let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); @@ -688,6 +694,7 @@ fn create_proposal_and_expire_it() { approval_quorum_percentage: 49, approval_threshold_percentage: 60, grace_period: 0, + stake: None, }; let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters.clone()); @@ -721,6 +728,7 @@ fn proposal_execution_postponed_because_of_grace_period() { approval_quorum_percentage: 60, approval_threshold_percentage: 60, grace_period: 2, + stake: None, }; let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters); let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); @@ -766,6 +774,7 @@ fn proposal_execution_succeeds_after_the_grace_period() { approval_quorum_percentage: 60, approval_threshold_percentage: 60, grace_period: 1, + stake: None, }; let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters); let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); diff --git a/modules/proposals/engine/src/types.rs b/modules/proposals/engine/src/types.rs index 5b7e66c910..f7a9cecc8c 100644 --- a/modules/proposals/engine/src/types.rs +++ b/modules/proposals/engine/src/types.rs @@ -9,6 +9,7 @@ use rstd::prelude::*; #[cfg(feature = "std")] use serde::{Deserialize, Serialize}; use srml_support::dispatch; +use srml_support::traits::Currency; /// Current status of the proposal #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] @@ -76,7 +77,7 @@ impl Default for VoteKind { /// Proposal parameters required to manage proposal risk. #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] #[derive(Encode, Decode, Default, Clone, Copy, PartialEq, Eq, Debug)] -pub struct ProposalParameters { +pub struct ProposalParameters { /// During this period, votes can be accepted pub voting_period: BlockNumber, @@ -89,18 +90,19 @@ pub struct ProposalParameters { /// Approval votes percentage threshold to pass the vote. pub approval_threshold_percentage: u32, - //pub stake: BalanceOf, // + + pub stake: Option, } /// 'Proposal' contains information necessary for the proposal system functioning. #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] #[derive(Encode, Decode, Default, Clone, PartialEq, Eq, Debug)] -pub struct Proposal { +pub struct Proposal { /// Proposal type id pub proposal_type: u32, /// Proposals parameter, characterize different proposal types. - pub parameters: ProposalParameters, + pub parameters: ProposalParameters, /// Identifier of member proposing. pub proposer_id: AccountId, @@ -123,8 +125,8 @@ pub struct Proposal { pub status: ProposalStatus, } -impl + PartialOrd + Copy, AccountId> - Proposal +impl + PartialOrd + Copy, AccountId, Balance> + Proposal { /// Returns whether voting period expired by now pub fn is_voting_period_expired(&self, now: BlockNumber) -> bool { @@ -239,15 +241,16 @@ pub trait VotersParameters { } // Calculates quorum, votes threshold, expiration status -struct ProposalStatusDecision<'a, BlockNumber, AccountId> { - proposal: &'a Proposal, +struct ProposalStatusDecision<'a, BlockNumber, AccountId, Balance> { + proposal: &'a Proposal, now: BlockNumber, votes_count: u32, total_voters_count: u32, approvals: u32, } -impl<'a, BlockNumber, AccountId> ProposalStatusDecision<'a, BlockNumber, AccountId> +impl<'a, BlockNumber, AccountId, Balance> + ProposalStatusDecision<'a, BlockNumber, AccountId, Balance> where BlockNumber: Add + PartialOrd + Copy, { @@ -299,13 +302,21 @@ pub trait ProposalCodeDecoder { ) -> Result, &'static str>; } +/// Balance alias +pub type BalanceOf = + <::Currency as Currency<::AccountId>>::Balance; + +///// Balance alias for staking +//pub type NegativeImbalance = +// <::Currency as Currency<::AccountId>>::NegativeImbalance; + #[cfg(test)] mod tests { use crate::*; #[test] fn proposal_voting_period_expired() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); proposal.created_at = 1; proposal.parameters.voting_period = 3; @@ -315,7 +326,7 @@ mod tests { #[test] fn proposal_voting_period_not_expired() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); proposal.created_at = 1; proposal.parameters.voting_period = 3; @@ -325,7 +336,7 @@ mod tests { #[test] fn proposal_grace_period_expired() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); proposal.approved_at = Some(1); proposal.parameters.grace_period = 3; @@ -335,7 +346,7 @@ mod tests { #[test] fn proposal_grace_period_auto_expired() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); proposal.approved_at = Some(1); proposal.parameters.grace_period = 0; @@ -345,7 +356,7 @@ mod tests { #[test] fn proposal_grace_period_not_expired() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); proposal.approved_at = Some(1); proposal.parameters.grace_period = 3; @@ -355,7 +366,7 @@ mod tests { #[test] fn proposal_grace_period_not_expired_because_of_not_approved_proposal() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); proposal.approved_at = None; proposal.parameters.grace_period = 3; @@ -365,7 +376,7 @@ mod tests { #[test] fn tally_results_proposal_expired() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); let proposal_id = 1; let now = 5; proposal.created_at = 1; @@ -404,7 +415,7 @@ mod tests { } #[test] fn tally_results_proposal_approved() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); let proposal_id = 1; proposal.created_at = 1; proposal.parameters.voting_period = 3; @@ -446,7 +457,7 @@ mod tests { #[test] fn tally_results_proposal_rejected_because_of_failed_approval_threshold() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); let proposal_id = 1; let now = 2; @@ -491,7 +502,7 @@ mod tests { #[test] fn tally_results_are_empty_with_not_expired_voting_period() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); let proposal_id = 1; let now = 2; From def6faf1f4dc973226eb7c6016a796361b0fe206 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Mon, 17 Feb 2020 12:13:35 +0300 Subject: [PATCH 019/286] Remove redundant check on voting --- modules/proposals/engine/src/errors.rs | 1 - modules/proposals/engine/src/lib.rs | 3 --- modules/proposals/engine/src/tests/mod.rs | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/modules/proposals/engine/src/errors.rs b/modules/proposals/engine/src/errors.rs index 602e6ddf98..d4ebd3e44f 100644 --- a/modules/proposals/engine/src/errors.rs +++ b/modules/proposals/engine/src/errors.rs @@ -3,7 +3,6 @@ pub const MSG_EMPTY_BODY_PROVIDED: &str = "Proposal cannot have an empty body"; pub const MSG_TOO_LONG_TITLE: &str = "Title is too long"; pub const MSG_TOO_LONG_BODY: &str = "Body is too long"; pub const MSG_PROPOSAL_NOT_FOUND: &str = "This proposal does not exist"; -pub const MSG_PROPOSAL_EXPIRED: &str = "Voting period is expired for this proposal"; pub const MSG_PROPOSAL_FINALIZED: &str = "Proposal is finalized already"; pub const MSG_YOU_ALREADY_VOTED: &str = "You have already voted on this proposal"; pub const MSG_YOU_DONT_OWN_THIS_PROPOSAL: &str = "You do not own this proposal"; diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index 578c041567..afd6df76f8 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -151,9 +151,6 @@ decl_module! { ensure!(>::exists(proposal_id), errors::MSG_PROPOSAL_NOT_FOUND); let mut proposal = Self::proposals(proposal_id); - let not_expired = !proposal.is_voting_period_expired(Self::current_block()); - ensure!(not_expired, errors::MSG_PROPOSAL_EXPIRED); - ensure!(proposal.status == ProposalStatus::Active, errors::MSG_PROPOSAL_FINALIZED); let did_not_vote_before = !>::exists( diff --git a/modules/proposals/engine/src/tests/mod.rs b/modules/proposals/engine/src/tests/mod.rs index 38831a1b94..0e017503c0 100644 --- a/modules/proposals/engine/src/tests/mod.rs +++ b/modules/proposals/engine/src/tests/mod.rs @@ -456,7 +456,7 @@ fn vote_fails_with_expired_voting_period() { let mut vote_generator = VoteGenerator::new(proposal_id); vote_generator.vote_and_assert( VoteKind::Approve, - Err("Voting period is expired for this proposal"), + Err("Proposal is finalized already"), ); }); } From 753fff5bcb4619115fd0f591a570647c16a6383a Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Mon, 17 Feb 2020 14:08:46 +0300 Subject: [PATCH 020/286] Add VotingResults type Migrating from TallyResults and vote calculation in the end of block to vote calculation on the vote() extrinsic call. --- modules/proposals/engine/src/lib.rs | 11 +++-- modules/proposals/engine/src/tests/mod.rs | 22 +++++++-- modules/proposals/engine/src/types.rs | 59 ++++++++++++++++------- 3 files changed, 66 insertions(+), 26 deletions(-) diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index afd6df76f8..a9bbac137e 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -17,9 +17,9 @@ //#![warn(missing_docs)] use types::FinalizedProposalData; -pub use types::TallyResult; pub use types::{Proposal, ProposalParameters, ProposalStatus}; pub use types::{ProposalCodeDecoder, ProposalExecutable}; +pub use types::{TallyResult, VotingResults}; pub use types::{Vote, VoteKind, VotersParameters}; mod errors; @@ -126,7 +126,7 @@ decl_storage! { /// Double map for preventing duplicate votes. Should be cleaned after usage. pub(crate) VoteExistsByProposalByVoter get(fn vote_by_proposal_by_voter): - double_map T::ProposalId, twox_256(T::VoterId) => (); + double_map T::ProposalId, twox_256(T::VoterId) => VoteKind; /// Defines max allowed proposal title length. Can be configured. TitleMaxLen get(title_max_len) config(): u32 = DEFAULT_TITLE_MAX_LEN; @@ -166,11 +166,12 @@ decl_module! { }; proposal.votes.push(new_vote); + proposal.voting_results.add_vote(vote.clone()); // mutation >::insert(proposal_id, proposal); - >::insert( proposal_id, voter_id.clone(), ()); + >::insert( proposal_id, voter_id.clone(), vote.clone()); Self::deposit_event(RawEvent::Voted(voter_id, proposal_id, vote)); } @@ -257,6 +258,7 @@ impl Module { status: ProposalStatus::Active, tally_results: None, votes: Vec::new(), + voting_results: VotingResults::default(), }; // mutation @@ -308,8 +310,7 @@ impl Module { /// Enumerates through active proposals. Tally Voting results. /// Returns proposals with changed status, id and calculated tally results fn get_finalized_proposals_data( - ) -> Vec> - { + ) -> Vec> { // enumerate active proposals id and gather finalization data >::enumerate() .map(|(proposal_id, _)| { diff --git a/modules/proposals/engine/src/tests/mod.rs b/modules/proposals/engine/src/tests/mod.rs index 0e017503c0..192ae7ba69 100644 --- a/modules/proposals/engine/src/tests/mod.rs +++ b/modules/proposals/engine/src/tests/mod.rs @@ -286,6 +286,11 @@ fn proposal_execution_succeeds() { status: ProposalStatus::Approved, finalized_at: 1 }), + voting_results : VotingResults { + abstentions: 0, + approvals: 4, + rejections: 0, + }, votes: vote_generator.saved_votes, } ) @@ -341,6 +346,11 @@ fn proposal_execution_failed() { finalized_at: 1 }), votes: vote_generator.saved_votes, + voting_results : VotingResults { + abstentions: 0, + approvals: 4, + rejections: 0, + }, } ) }); @@ -454,10 +464,7 @@ fn vote_fails_with_expired_voting_period() { run_to_block_and_finalize(6); let mut vote_generator = VoteGenerator::new(proposal_id); - vote_generator.vote_and_assert( - VoteKind::Approve, - Err("Proposal is finalized already"), - ); + vote_generator.vote_and_assert(VoteKind::Approve, Err("Proposal is finalized already")); }); } @@ -542,6 +549,7 @@ fn cancel_proposal_succeeds() { body: b"body".to_vec(), tally_results: None, votes: Vec::new(), + voting_results : VotingResults::default(), } ) }); @@ -616,6 +624,7 @@ fn veto_proposal_succeeds() { body: b"body".to_vec(), tally_results: None, votes: Vec::new(), + voting_results : VotingResults::default(), } ) }); @@ -762,6 +771,11 @@ fn create_proposal_and_expire_it() { status: ProposalStatus::Expired, finalized_at: 4 }), + voting_results : VotingResults { + abstentions: 0, + approvals: 0, + rejections: 0, + }, votes: Vec::new(), } ) diff --git a/modules/proposals/engine/src/types.rs b/modules/proposals/engine/src/types.rs index 9db9c8210a..90c26813e4 100644 --- a/modules/proposals/engine/src/types.rs +++ b/modules/proposals/engine/src/types.rs @@ -86,6 +86,24 @@ pub struct ProposalParameters { //pub stake: BalanceOf, // } +#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive(Encode, Decode, Default, Clone, PartialEq, Eq, Debug)] +pub struct VotingResults { + pub abstentions: u32, + pub approvals: u32, + pub rejections: u32, +} + +impl VotingResults { + pub fn add_vote(&mut self, vote: VoteKind) { + match vote { + VoteKind::Abstain => self.abstentions += 1, + VoteKind::Approve => self.approvals += 1, + VoteKind::Reject => self.rejections += 1, + } + } +} + /// 'Proposal' contains information necessary for the proposal system functioning. #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] #[derive(Encode, Decode, Default, Clone, PartialEq, Eq, Debug)] @@ -118,6 +136,8 @@ pub struct Proposal { /// Votes for the proposal pub votes: Vec>, + + pub voting_results: VotingResults, } impl Proposal @@ -133,21 +153,9 @@ where /// Parameters: current time, votes, total voters number involved (council size) /// Returns whether tally results are ready. pub fn update_tally_results(&mut self, total_voters_count: u32, now: BlockNumber) { - let mut abstentions: u32 = 0; - let mut approvals: u32 = 0; - let mut rejections: u32 = 0; - - for vote in self.votes.iter() { - match vote.vote_kind { - VoteKind::Abstain => abstentions += 1, - VoteKind::Approve => approvals += 1, - VoteKind::Reject => rejections += 1, - } - } - let proposal_status_decision = ProposalStatusDecision { proposal: self, - approvals, + approvals: self.voting_results.approvals, now, votes_count: self.votes.len() as u32, total_voters_count, @@ -166,9 +174,9 @@ where self.tally_results = if let Some(status) = new_status { Some(TallyResult { - abstentions, - approvals, - rejections, + abstentions: self.voting_results.abstentions, + approvals: self.voting_results.approvals, + rejections: self.voting_results.rejections, status, finalized_at: now, }) @@ -277,7 +285,6 @@ pub(crate) struct FinalizedProposalData Date: Mon, 17 Feb 2020 14:24:34 +0300 Subject: [PATCH 021/286] Remove votes from the Proposal --- modules/proposals/engine/src/lib.rs | 11 +-- modules/proposals/engine/src/tests/mod.rs | 15 ++-- modules/proposals/engine/src/types.rs | 102 +++++++--------------- 3 files changed, 37 insertions(+), 91 deletions(-) diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index a9bbac137e..3d82d8149a 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -113,7 +113,7 @@ decl_storage! { trait Store for Module as ProposalsEngine{ /// Map proposal by its id. pub Proposals get(fn proposals): map T::ProposalId => - Proposal; + Proposal; /// Count of all proposals that have been created. pub ProposalCount get(fn proposal_count): u32; @@ -160,12 +160,6 @@ decl_module! { ensure!(did_not_vote_before, errors::MSG_YOU_ALREADY_VOTED); - let new_vote = Vote { - voter_id: voter_id.clone(), - vote_kind: vote.clone(), - }; - - proposal.votes.push(new_vote); proposal.voting_results.add_vote(vote.clone()); // mutation @@ -257,7 +251,6 @@ impl Module { proposal_type, status: ProposalStatus::Active, tally_results: None, - votes: Vec::new(), voting_results: VotingResults::default(), }; @@ -310,7 +303,7 @@ impl Module { /// Enumerates through active proposals. Tally Voting results. /// Returns proposals with changed status, id and calculated tally results fn get_finalized_proposals_data( - ) -> Vec> { + ) -> Vec> { // enumerate active proposals id and gather finalization data >::enumerate() .map(|(proposal_id, _)| { diff --git a/modules/proposals/engine/src/tests/mod.rs b/modules/proposals/engine/src/tests/mod.rs index 192ae7ba69..3688b4dbd9 100644 --- a/modules/proposals/engine/src/tests/mod.rs +++ b/modules/proposals/engine/src/tests/mod.rs @@ -286,12 +286,11 @@ fn proposal_execution_succeeds() { status: ProposalStatus::Approved, finalized_at: 1 }), - voting_results : VotingResults { + voting_results: VotingResults { abstentions: 0, approvals: 4, rejections: 0, }, - votes: vote_generator.saved_votes, } ) }); @@ -345,8 +344,7 @@ fn proposal_execution_failed() { status: ProposalStatus::Approved, finalized_at: 1 }), - votes: vote_generator.saved_votes, - voting_results : VotingResults { + voting_results: VotingResults { abstentions: 0, approvals: 4, rejections: 0, @@ -548,8 +546,7 @@ fn cancel_proposal_succeeds() { title: b"title".to_vec(), body: b"body".to_vec(), tally_results: None, - votes: Vec::new(), - voting_results : VotingResults::default(), + voting_results: VotingResults::default(), } ) }); @@ -623,8 +620,7 @@ fn veto_proposal_succeeds() { title: b"title".to_vec(), body: b"body".to_vec(), tally_results: None, - votes: Vec::new(), - voting_results : VotingResults::default(), + voting_results: VotingResults::default(), } ) }); @@ -771,12 +767,11 @@ fn create_proposal_and_expire_it() { status: ProposalStatus::Expired, finalized_at: 4 }), - voting_results : VotingResults { + voting_results: VotingResults { abstentions: 0, approvals: 0, rejections: 0, }, - votes: Vec::new(), } ) }); diff --git a/modules/proposals/engine/src/types.rs b/modules/proposals/engine/src/types.rs index 90c26813e4..8fc48d45da 100644 --- a/modules/proposals/engine/src/types.rs +++ b/modules/proposals/engine/src/types.rs @@ -102,12 +102,16 @@ impl VotingResults { VoteKind::Reject => self.rejections += 1, } } + + pub fn votes_number(&self) -> u32 { + self.abstentions + self.approvals + self.rejections + } } /// 'Proposal' contains information necessary for the proposal system functioning. #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] #[derive(Encode, Decode, Default, Clone, PartialEq, Eq, Debug)] -pub struct Proposal { +pub struct Proposal { /// Proposal type id pub proposal_type: u32, @@ -134,13 +138,10 @@ pub struct Proposal { /// Tally result for the proposal pub tally_results: Option>, - /// Votes for the proposal - pub votes: Vec>, - pub voting_results: VotingResults, } -impl Proposal +impl Proposal where BlockNumber: Add + PartialOrd + Copy, { @@ -157,7 +158,7 @@ where proposal: self, approvals: self.voting_results.approvals, now, - votes_count: self.votes.len() as u32, + votes_count: self.voting_results.votes_number(), total_voters_count, }; @@ -224,16 +225,15 @@ pub trait VotersParameters { } // Calculates quorum, votes threshold, expiration status -struct ProposalStatusDecision<'a, BlockNumber, VoterId, ProposerId> { - proposal: &'a Proposal, +struct ProposalStatusDecision<'a, BlockNumber, ProposerId> { + proposal: &'a Proposal, now: BlockNumber, votes_count: u32, total_voters_count: u32, approvals: u32, } -impl<'a, BlockNumber, VoterId, ProposerId> - ProposalStatusDecision<'a, BlockNumber, VoterId, ProposerId> +impl<'a, BlockNumber, ProposerId> ProposalStatusDecision<'a, BlockNumber, ProposerId> where BlockNumber: Add + PartialOrd + Copy, { @@ -274,12 +274,12 @@ pub trait ProposalCodeDecoder { } /// Data container for the finalized proposal results -pub(crate) struct FinalizedProposalData { +pub(crate) struct FinalizedProposalData { /// Proposal id pub proposal_id: ProposalId, /// Proposal to be finalized - pub proposal: Proposal, + pub proposal: Proposal, /// Proposal finalization status pub status: ProposalStatus, @@ -291,7 +291,7 @@ mod tests { #[test] fn proposal_voting_period_expired() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); proposal.created = 1; proposal.parameters.voting_period = 3; @@ -301,7 +301,7 @@ mod tests { #[test] fn proposal_voting_period_not_expired() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); proposal.created = 1; proposal.parameters.voting_period = 3; @@ -311,26 +311,15 @@ mod tests { #[test] fn tally_results_proposal_expired() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); let now = 5; proposal.created = 1; proposal.parameters.voting_period = 3; proposal.parameters.approval_quorum_percentage = 60; - proposal.votes = vec![ - Vote { - voter_id: 1, - vote_kind: VoteKind::Approve, - }, - Vote { - voter_id: 2, - vote_kind: VoteKind::Approve, - }, - Vote { - voter_id: 4, - vote_kind: VoteKind::Reject, - }, - ]; + proposal.voting_results.add_vote(VoteKind::Reject); + proposal.voting_results.add_vote(VoteKind::Approve); + proposal.voting_results.add_vote(VoteKind::Approve); proposal.voting_results = VotingResults { abstentions: 0, @@ -351,29 +340,15 @@ mod tests { } #[test] fn tally_results_proposal_approved() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); proposal.created = 1; proposal.parameters.voting_period = 3; proposal.parameters.approval_quorum_percentage = 60; - proposal.votes = vec![ - Vote { - voter_id: 1, - vote_kind: VoteKind::Approve, - }, - Vote { - voter_id: 2, - vote_kind: VoteKind::Approve, - }, - Vote { - voter_id: 3, - vote_kind: VoteKind::Approve, - }, - Vote { - voter_id: 4, - vote_kind: VoteKind::Reject, - }, - ]; + proposal.voting_results.add_vote(VoteKind::Reject); + proposal.voting_results.add_vote(VoteKind::Approve); + proposal.voting_results.add_vote(VoteKind::Approve); + proposal.voting_results.add_vote(VoteKind::Approve); proposal.voting_results = VotingResults { abstentions: 0, @@ -395,31 +370,17 @@ mod tests { #[test] fn tally_results_proposal_rejected() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); let now = 2; proposal.created = 1; proposal.parameters.voting_period = 3; proposal.parameters.approval_quorum_percentage = 60; - proposal.votes = vec![ - Vote { - voter_id: 1, - vote_kind: VoteKind::Reject, - }, - Vote { - voter_id: 2, - vote_kind: VoteKind::Reject, - }, - Vote { - voter_id: 3, - vote_kind: VoteKind::Abstain, - }, - Vote { - voter_id: 4, - vote_kind: VoteKind::Approve, - }, - ]; + proposal.voting_results.add_vote(VoteKind::Reject); + proposal.voting_results.add_vote(VoteKind::Reject); + proposal.voting_results.add_vote(VoteKind::Abstain); + proposal.voting_results.add_vote(VoteKind::Approve); proposal.voting_results = VotingResults { abstentions: 1, @@ -441,17 +402,14 @@ mod tests { #[test] fn tally_results_are_empty_with_not_expired_voting_period() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); let now = 2; proposal.created = 1; proposal.parameters.voting_period = 3; proposal.parameters.approval_quorum_percentage = 60; - proposal.votes = vec![Vote { - voter_id: 1, - vote_kind: VoteKind::Abstain, - }]; + proposal.voting_results.add_vote(VoteKind::Abstain); proposal.update_tally_results(5, now); assert_eq!(proposal.tally_results, None); From bbabc6726ee05fb3aa4b13f0f2997021b0a8f89b Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Mon, 17 Feb 2020 14:39:22 +0300 Subject: [PATCH 022/286] Introduce define_proposal_decision_status() Migrating out from TallyResults --- modules/proposals/engine/src/lib.rs | 10 +++++++--- modules/proposals/engine/src/types.rs | 24 ++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index 3d82d8149a..83e5da9aa1 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -316,10 +316,14 @@ impl Module { Self::current_block(), ); - // get new status from tally results + let decision_status = proposal.define_proposal_decision_status( + T::TotalVotersCounter::total_voters_count(), + Self::current_block(), + ); + let mut new_status = ProposalStatus::Active; - if let Some(tally_results) = proposal.tally_results.clone() { - new_status = tally_results.status; + if let Some(status) = decision_status { + new_status = status; } // proposal is finalized if not active let finalized = new_status != ProposalStatus::Active; diff --git a/modules/proposals/engine/src/types.rs b/modules/proposals/engine/src/types.rs index 8fc48d45da..def521ca82 100644 --- a/modules/proposals/engine/src/types.rs +++ b/modules/proposals/engine/src/types.rs @@ -185,6 +185,30 @@ where None }; } + + pub fn define_proposal_decision_status( + &self, + total_voters_count: u32, + now: BlockNumber, + ) -> Option { + let proposal_status_decision = ProposalStatusDecision { + proposal: self, + approvals: self.voting_results.approvals, + now, + votes_count: self.voting_results.votes_number(), + total_voters_count, + }; + + if proposal_status_decision.is_approval_quorum_reached() { + Some(ProposalStatus::Approved) + } else if proposal_status_decision.is_expired() { + Some(ProposalStatus::Expired) + } else if proposal_status_decision.is_voting_completed() { + Some(ProposalStatus::Rejected) + } else { + None + } + } } /// Vote. Characterized by voter and vote kind. From b2278bfd35b0f5410c150d4de63d94155b857db8 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Mon, 17 Feb 2020 15:24:16 +0300 Subject: [PATCH 023/286] Remove TallyResults and Vote types --- modules/proposals/engine/src/lib.rs | 17 +- modules/proposals/engine/src/tests/mod.rs | 63 +++----- modules/proposals/engine/src/types.rs | 184 +++++++--------------- 3 files changed, 84 insertions(+), 180 deletions(-) diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index 83e5da9aa1..966db34877 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -17,10 +17,10 @@ //#![warn(missing_docs)] use types::FinalizedProposalData; +pub use types::VotingResults; pub use types::{Proposal, ProposalParameters, ProposalStatus}; pub use types::{ProposalCodeDecoder, ProposalExecutable}; -pub use types::{TallyResult, VotingResults}; -pub use types::{Vote, VoteKind, VotersParameters}; +pub use types::{VoteKind, VotersParameters}; mod errors; mod types; @@ -250,8 +250,8 @@ impl Module { proposer_id: proposer_id.clone(), proposal_type, status: ProposalStatus::Active, - tally_results: None, voting_results: VotingResults::default(), + finalized_at: None, }; // mutation @@ -308,13 +308,7 @@ impl Module { >::enumerate() .map(|(proposal_id, _)| { // load current proposal - let mut proposal = Self::proposals(proposal_id); - - // calculates voting results - proposal.update_tally_results( - T::TotalVotersCounter::total_voters_count(), - Self::current_block(), - ); + let proposal = Self::proposals(proposal_id); let decision_status = proposal.define_proposal_decision_status( T::TotalVotersCounter::total_voters_count(), @@ -333,6 +327,7 @@ impl Module { proposal_id, proposal, status: new_status, + finalized_at: Self::current_block(), }, finalized, ) @@ -342,13 +337,13 @@ impl Module { .collect() // compose output vector } + // TODO: update proposal.finalized_at // TODO: to be refactored or removed after introducing stakes. Events should be fired on actions // such as 'rejected' or 'approved'. /// Updates proposal status and removes proposal id from active id set. fn update_proposal_status(proposal_id: T::ProposalId, new_status: ProposalStatus) { if new_status != ProposalStatus::Active { >::remove(&proposal_id); - >::remove_prefix(&proposal_id); } >::mutate(proposal_id, |p| p.status = new_status.clone()); diff --git a/modules/proposals/engine/src/tests/mod.rs b/modules/proposals/engine/src/tests/mod.rs index 3688b4dbd9..0eabc6fac5 100644 --- a/modules/proposals/engine/src/tests/mod.rs +++ b/modules/proposals/engine/src/tests/mod.rs @@ -132,7 +132,6 @@ struct VoteGenerator { proposal_id: u32, current_account_id: u64, pub auto_increment_voter_id: bool, - pub saved_votes: Vec>, } impl VoteGenerator { @@ -141,7 +140,6 @@ impl VoteGenerator { proposal_id, current_account_id: 0, auto_increment_voter_id: true, - saved_votes: Vec::new(), } } fn vote_and_assert_ok(&mut self, vote_kind: VoteKind) { @@ -150,11 +148,6 @@ impl VoteGenerator { fn vote_and_assert(&mut self, vote_kind: VoteKind, expected_result: dispatch::Result) { assert_eq!(self.vote(vote_kind.clone()), expected_result); - - self.saved_votes.push(Vote { - voter_id: self.current_account_id, - vote_kind, - }); } fn vote(&mut self, vote_kind: VoteKind) -> dispatch::Result { @@ -279,18 +272,12 @@ fn proposal_execution_succeeds() { status: ProposalStatus::Executed, title: b"title".to_vec(), body: b"body".to_vec(), - tally_results: Some(TallyResult { - abstentions: 0, - approvals: 4, - rejections: 0, - status: ProposalStatus::Approved, - finalized_at: 1 - }), voting_results: VotingResults { abstentions: 0, approvals: 4, rejections: 0, }, + finalized_at: None, } ) }); @@ -337,25 +324,19 @@ fn proposal_execution_failed() { }, title: b"title".to_vec(), body: b"body".to_vec(), - tally_results: Some(TallyResult { - abstentions: 0, - approvals: 4, - rejections: 0, - status: ProposalStatus::Approved, - finalized_at: 1 - }), voting_results: VotingResults { abstentions: 0, approvals: 4, rejections: 0, }, + finalized_at: None, } ) }); } #[test] -fn tally_calculation_succeeds() { +fn voting_results_calculation_succeeds() { initial_test_ext().execute_with(|| { let parameters = ProposalParameters { voting_period: 3, @@ -379,20 +360,18 @@ fn tally_calculation_succeeds() { let proposal = >::get(proposals_id); assert_eq!( - proposal.tally_results, - Some(TallyResult { + proposal.voting_results, + VotingResults { abstentions: 1, approvals: 2, rejections: 1, - status: ProposalStatus::Approved, - finalized_at: 1 - }) + } ) }); } #[test] -fn rejected_tally_results_and_remove_proposal_id_from_active_succeeds() { +fn rejected_voting_results_and_remove_proposal_id_from_active_succeeds() { initial_test_ext().execute_with(|| { let dummy_proposal = DummyProposalFixture::default(); dummy_proposal.create_proposal_and_assert(Ok(())); @@ -413,16 +392,16 @@ fn rejected_tally_results_and_remove_proposal_id_from_active_succeeds() { let proposal = >::get(proposal_id); assert_eq!( - proposal.tally_results, - Some(TallyResult { + proposal.voting_results, + VotingResults { abstentions: 2, approvals: 0, rejections: 2, - status: ProposalStatus::Rejected, - finalized_at: 1 - }) + } ); + assert_eq!(proposal.status, ProposalStatus::Rejected,); + assert!(!>::exists(proposal_id)); }); } @@ -545,8 +524,8 @@ fn cancel_proposal_succeeds() { status: ProposalStatus::Canceled, title: b"title".to_vec(), body: b"body".to_vec(), - tally_results: None, voting_results: VotingResults::default(), + finalized_at: None, } ) }); @@ -619,8 +598,8 @@ fn veto_proposal_succeeds() { status: ProposalStatus::Vetoed, title: b"title".to_vec(), body: b"body".to_vec(), - tally_results: None, voting_results: VotingResults::default(), + finalized_at: None, } ) }); @@ -760,25 +739,19 @@ fn create_proposal_and_expire_it() { status: ProposalStatus::Expired, title: b"title".to_vec(), body: b"body".to_vec(), - tally_results: Some(TallyResult { - abstentions: 0, - approvals: 0, - rejections: 0, - status: ProposalStatus::Expired, - finalized_at: 4 - }), voting_results: VotingResults { abstentions: 0, approvals: 0, rejections: 0, }, + finalized_at: None, } ) }); } #[test] -fn voting_internal_cache_works_and_got_cleaned_successfully() { +fn voting_internal_cache_exists_after_proposal_finalization() { initial_test_ext().execute_with(|| { let dummy_proposal = DummyProposalFixture::default(); dummy_proposal.create_proposal_and_assert(Ok(())); @@ -800,8 +773,8 @@ fn voting_internal_cache_works_and_got_cleaned_successfully() { run_to_block_and_finalize(2); - // cache cleared - assert!(!>::exists( + // cache still exists and is not cleared + assert!(>::exists( proposal_id, 1 )); diff --git a/modules/proposals/engine/src/types.rs b/modules/proposals/engine/src/types.rs index def521ca82..005841f2a7 100644 --- a/modules/proposals/engine/src/types.rs +++ b/modules/proposals/engine/src/types.rs @@ -135,10 +135,12 @@ pub struct Proposal { /// Current proposal status pub status: ProposalStatus, - /// Tally result for the proposal - pub tally_results: Option>, - + /// Curring voting result for the proposal pub voting_results: VotingResults, + + // TODO: update proposal.finalized_at + /// Proposal finalization block number + pub finalized_at: Option, } impl Proposal @@ -150,42 +152,9 @@ where now >= self.created + self.parameters.voting_period } - /// Calculates and updates voting results tally for current proposal. - /// Parameters: current time, votes, total voters number involved (council size) - /// Returns whether tally results are ready. - pub fn update_tally_results(&mut self, total_voters_count: u32, now: BlockNumber) { - let proposal_status_decision = ProposalStatusDecision { - proposal: self, - approvals: self.voting_results.approvals, - now, - votes_count: self.voting_results.votes_number(), - total_voters_count, - }; - - let new_status: Option = - if proposal_status_decision.is_approval_quorum_reached() { - Some(ProposalStatus::Approved) - } else if proposal_status_decision.is_expired() { - Some(ProposalStatus::Expired) - } else if proposal_status_decision.is_voting_completed() { - Some(ProposalStatus::Rejected) - } else { - None - }; - - self.tally_results = if let Some(status) = new_status { - Some(TallyResult { - abstentions: self.voting_results.abstentions, - approvals: self.voting_results.approvals, - rejections: self.voting_results.rejections, - status, - finalized_at: now, - }) - } else { - None - }; - } - + /// Determines the finalized proposal status using voting results tally for current proposal. + /// Parameters: current time, total voters number involved (council size) + /// Returns whether the proposal has finalized status pub fn define_proposal_decision_status( &self, total_voters_count: u32, @@ -211,36 +180,6 @@ where } } -/// Vote. Characterized by voter and vote kind. -#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] -#[derive(Encode, Decode, Default, Clone, PartialEq, Eq, Debug)] -pub struct Vote { - /// Origin of the vote - pub voter_id: VoterId, - - /// Vote kind - pub vote_kind: VoteKind, -} - -/// Tally result for the proposal -#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] -#[derive(Encode, Decode, Default, Clone, PartialEq, Eq, Debug)] -pub struct TallyResult { - /// 'Abstention' votes count - pub abstentions: u32, - - /// 'Approve' votes count - pub approvals: u32, - - /// 'Reject' votes count - pub rejections: u32, - - /// Proposal status after tally - pub status: ProposalStatus, - - /// Proposal finalization block number - pub finalized_at: BlockNumber, -} /// Provides data for voting. pub trait VotersParameters { @@ -307,6 +246,9 @@ pub(crate) struct FinalizedProposalData { /// Proposal finalization status pub status: ProposalStatus, + + /// Proposal finalization block number + pub finalized_at: BlockNumber, } #[cfg(test)] @@ -334,7 +276,7 @@ mod tests { } #[test] - fn tally_results_proposal_expired() { + fn define_proposal_decision_status_returns_expired() { let mut proposal = Proposal::::default(); let now = 5; proposal.created = 1; @@ -345,25 +287,21 @@ mod tests { proposal.voting_results.add_vote(VoteKind::Approve); proposal.voting_results.add_vote(VoteKind::Approve); - proposal.voting_results = VotingResults { - abstentions: 0, - approvals: 2, - rejections: 1, - }; - - let expected_tally_results = TallyResult { - abstentions: 0, - approvals: 2, - rejections: 1, - status: ProposalStatus::Expired, - finalized_at: now, - }; - - proposal.update_tally_results(5, now); - assert_eq!(proposal.tally_results, Some(expected_tally_results)); + assert_eq!( + proposal.voting_results, + VotingResults { + abstentions: 0, + approvals: 2, + rejections: 1, + } + ); + + let expected_proposal_status = proposal.define_proposal_decision_status(5, now); + assert_eq!(expected_proposal_status, Some(ProposalStatus::Expired)); } #[test] - fn tally_results_proposal_approved() { + fn define_proposal_decision_status_returns_approved() { + let now = 2; let mut proposal = Proposal::::default(); proposal.created = 1; proposal.parameters.voting_period = 3; @@ -374,26 +312,21 @@ mod tests { proposal.voting_results.add_vote(VoteKind::Approve); proposal.voting_results.add_vote(VoteKind::Approve); - proposal.voting_results = VotingResults { - abstentions: 0, - approvals: 3, - rejections: 1, - }; - - let expected_tally_results = TallyResult { - abstentions: 0, - approvals: 3, - rejections: 1, - status: ProposalStatus::Approved, - finalized_at: 2, - }; - - proposal.update_tally_results(5, 2); - assert_eq!(proposal.tally_results, Some(expected_tally_results)); + assert_eq!( + proposal.voting_results, + VotingResults { + abstentions: 0, + approvals: 3, + rejections: 1, + } + ); + + let expected_proposal_status = proposal.define_proposal_decision_status(5, now); + assert_eq!(expected_proposal_status, Some(ProposalStatus::Approved)); } #[test] - fn tally_results_proposal_rejected() { + fn define_proposal_decision_status_returns_rejected() { let mut proposal = Proposal::::default(); let now = 2; @@ -406,26 +339,21 @@ mod tests { proposal.voting_results.add_vote(VoteKind::Abstain); proposal.voting_results.add_vote(VoteKind::Approve); - proposal.voting_results = VotingResults { - abstentions: 1, - approvals: 1, - rejections: 2, - }; - - let expected_tally_results = TallyResult { - abstentions: 1, - approvals: 1, - rejections: 2, - status: ProposalStatus::Rejected, - finalized_at: now, - }; - - proposal.update_tally_results(4, now); - assert_eq!(proposal.tally_results, Some(expected_tally_results)); + assert_eq!( + proposal.voting_results, + VotingResults { + abstentions: 1, + approvals: 1, + rejections: 2, + } + ); + + let expected_proposal_status = proposal.define_proposal_decision_status(4, now); + assert_eq!(expected_proposal_status, Some(ProposalStatus::Rejected)); } #[test] - fn tally_results_are_empty_with_not_expired_voting_period() { + fn define_proposal_decision_status_returns_none() { let mut proposal = Proposal::::default(); let now = 2; @@ -434,8 +362,16 @@ mod tests { proposal.parameters.approval_quorum_percentage = 60; proposal.voting_results.add_vote(VoteKind::Abstain); - - proposal.update_tally_results(5, now); - assert_eq!(proposal.tally_results, None); + assert_eq!( + proposal.voting_results, + VotingResults { + abstentions: 1, + approvals: 0, + rejections: 0, + } + ); + + let expected_proposal_status = proposal.define_proposal_decision_status(5, now); + assert_eq!(expected_proposal_status, None); } } From f350622fb5f81e97da2e3e4985b3a348825d7562 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Mon, 17 Feb 2020 15:42:23 +0300 Subject: [PATCH 024/286] Add comments and refactor - refactor map-filter-map pattern to the filter_map - add comments --- modules/proposals/engine/src/lib.rs | 25 +++++++++---------------- modules/proposals/engine/src/types.rs | 8 ++++++++ 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index 966db34877..1324c105d1 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -36,6 +36,7 @@ use srml_support::{ use system::ensure_root; // TODO: add maximum allowed active proposals +// TODO: update proposal.finalized_at - update on all proposal finalization points. // Max allowed proposal title length. Can be used if config value is not filled. const DEFAULT_TITLE_MAX_LEN: u32 = 100; @@ -301,12 +302,12 @@ impl Module { } /// Enumerates through active proposals. Tally Voting results. - /// Returns proposals with changed status, id and calculated tally results + /// Returns proposals with finalized status and id fn get_finalized_proposals_data( ) -> Vec> { // enumerate active proposals id and gather finalization data >::enumerate() - .map(|(proposal_id, _)| { + .filter_map(|(proposal_id, _)| { // load current proposal let proposal = Self::proposals(proposal_id); @@ -315,25 +316,17 @@ impl Module { Self::current_block(), ); - let mut new_status = ProposalStatus::Active; if let Some(status) = decision_status { - new_status = status; - } - // proposal is finalized if not active - let finalized = new_status != ProposalStatus::Active; - - ( - FinalizedProposalData { + Some(FinalizedProposalData { proposal_id, proposal, - status: new_status, + status, finalized_at: Self::current_block(), - }, - finalized, - ) + }) + } else { + None + } }) - .filter(|(_, finalized)| *finalized) // filter only finalized proposals - .map(|(data, _)| data) // get rid of used 'finalized' flag .collect() // compose output vector } diff --git a/modules/proposals/engine/src/types.rs b/modules/proposals/engine/src/types.rs index 005841f2a7..4e18153c23 100644 --- a/modules/proposals/engine/src/types.rs +++ b/modules/proposals/engine/src/types.rs @@ -86,15 +86,22 @@ pub struct ProposalParameters { //pub stake: BalanceOf, // } +/// Contains current voting results #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] #[derive(Encode, Decode, Default, Clone, PartialEq, Eq, Debug)] pub struct VotingResults { + /// 'Abstain' votes counter pub abstentions: u32, + + /// 'Approve' votes counter pub approvals: u32, + + /// 'Reject' votes counter pub rejections: u32, } impl VotingResults { + /// Add vote to the related counter pub fn add_vote(&mut self, vote: VoteKind) { match vote { VoteKind::Abstain => self.abstentions += 1, @@ -103,6 +110,7 @@ impl VotingResults { } } + /// Calculates number of votes so far pub fn votes_number(&self) -> u32 { self.abstentions + self.approvals + self.rejections } From f2e78a362fa3f4bedc88234eb0d56f5d81112cb1 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Mon, 17 Feb 2020 15:43:32 +0300 Subject: [PATCH 025/286] Apply cargo fmt --- modules/proposals/engine/src/types.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/proposals/engine/src/types.rs b/modules/proposals/engine/src/types.rs index 4e18153c23..943b47ec97 100644 --- a/modules/proposals/engine/src/types.rs +++ b/modules/proposals/engine/src/types.rs @@ -188,7 +188,6 @@ where } } - /// Provides data for voting. pub trait VotersParameters { /// Defines maximum voters count for the proposal From 9bb85237bf844d62dd47c70c0b7a9163504e33b2 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Mon, 17 Feb 2020 18:24:43 +0300 Subject: [PATCH 026/286] Add max_active_proposals_number const --- modules/proposals/engine/src/errors.rs | 1 + modules/proposals/engine/src/lib.rs | 11 ++++++++++- modules/proposals/engine/src/tests/mock.rs | 5 +---- modules/proposals/engine/src/tests/mod.rs | 13 +++++++++++++ 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/modules/proposals/engine/src/errors.rs b/modules/proposals/engine/src/errors.rs index 3d5bb4f629..1c2dcc7ded 100644 --- a/modules/proposals/engine/src/errors.rs +++ b/modules/proposals/engine/src/errors.rs @@ -7,6 +7,7 @@ pub const MSG_PROPOSAL_EXPIRED: &str = "Voting period is expired for this propos pub const MSG_PROPOSAL_FINALIZED: &str = "Proposal is finalized already"; pub const MSG_YOU_ALREADY_VOTED: &str = "You have already voted on this proposal"; pub const MSG_YOU_DONT_OWN_THIS_PROPOSAL: &str = "You do not own this proposal"; +pub const MSG_MAX_ACTIVE_PROPOSAL_NUMBER_EXCEEDED: &str = "Max active proposals number exceeded"; //pub const MSG_STAKE_IS_GREATER_THAN_BALANCE: &str = "Balance is too low to be staked"; //pub const MSG_ONLY_MEMBERS_CAN_PROPOSE: &str = "Only members can make a proposal"; diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index d86c684dd5..5bfd1fb099 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -29,6 +29,7 @@ mod tests; use rstd::collections::btree_set::BTreeSet; use rstd::prelude::*; + use runtime_primitives::traits::EnsureOrigin; use srml_support::{decl_event, decl_module, decl_storage, dispatch, ensure, StorageDoubleMap}; use system::ensure_root; @@ -36,8 +37,11 @@ use system::ensure_root; const DEFAULT_TITLE_MAX_LEN: u32 = 100; const DEFAULT_BODY_MAX_LEN: u32 = 10_000; +// Max simultaneous active proposals number. +const MAX_ACTIVE_PROPOSALS_NUMBER: u32 = 100; + /// Proposals engine trait. -pub trait Trait: system::Trait + timestamp::Trait + stake::Trait{ +pub trait Trait: system::Trait + timestamp::Trait + stake::Trait { /// Engine event type. type Event: From> + Into<::Event>; @@ -246,6 +250,11 @@ impl Module { errors::MSG_TOO_LONG_BODY ); + ensure!( + (Self::active_proposal_ids().len() as u32) < MAX_ACTIVE_PROPOSALS_NUMBER, + errors::MSG_MAX_ACTIVE_PROPOSAL_NUMBER_EXCEEDED + ); + let next_proposal_count_value = Self::proposal_count() + 1; let new_proposal_id = next_proposal_count_value; diff --git a/modules/proposals/engine/src/tests/mock.rs b/modules/proposals/engine/src/tests/mock.rs index 3f22402f14..3e1111a978 100644 --- a/modules/proposals/engine/src/tests/mock.rs +++ b/modules/proposals/engine/src/tests/mock.rs @@ -1,6 +1,5 @@ #![cfg(test)] -pub use system; pub use primitives::{Blake2Hasher, H256}; pub use runtime_primitives::{ testing::{Digest, DigestItem, Header, UintAuthorityId}, @@ -9,7 +8,7 @@ pub use runtime_primitives::{ BuildStorage, Perbill, }; use srml_support::{impl_outer_dispatch, impl_outer_event, impl_outer_origin, parameter_types}; - +pub use system; // Workaround for https://github.com/rust-lang/rust/issues/26925 . Remove when sorted. #[derive(Clone, PartialEq, Eq, Debug)] @@ -19,7 +18,6 @@ impl_outer_origin! { pub enum Origin for Test {} } - impl_outer_dispatch! { pub enum Call for Test where origin: Origin { proposals::ProposalsEngine, @@ -60,7 +58,6 @@ impl balances::Trait for Test { type CreationFee = CreationFee; } - impl stake::Trait for Test { type Currency = Balances; type StakePoolId = StakePoolId; diff --git a/modules/proposals/engine/src/tests/mod.rs b/modules/proposals/engine/src/tests/mod.rs index e1f2e71342..af79f4b977 100644 --- a/modules/proposals/engine/src/tests/mod.rs +++ b/modules/proposals/engine/src/tests/mod.rs @@ -833,3 +833,16 @@ fn proposal_execution_succeeds_after_the_grace_period() { .is_none()); }); } + +#[test] +fn create_proposal_fails_on_exceeding_max_active_proposals_count() { + initial_test_ext().execute_with(|| { + for _ in 0..100 { + let dummy_proposal = DummyProposalFixture::default(); + dummy_proposal.create_proposal_and_assert(Ok(())); + } + + let dummy_proposal = DummyProposalFixture::default(); + dummy_proposal.create_proposal_and_assert(Err("Max active proposals number exceeded")); + }); +} From d2175a34d8517a41b4516d256e1c5459336d44cc Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Mon, 17 Feb 2020 19:08:33 +0300 Subject: [PATCH 027/286] Upgrade TextProposal - add next text field and tests - introduce Error enum --- modules/proposals/codex/src/lib.rs | 31 ++++++++++---- modules/proposals/codex/src/proposal_types.rs | 5 ++- modules/proposals/codex/src/tests/mock.rs | 1 - modules/proposals/codex/src/tests/mod.rs | 40 +++++++++++++++---- 4 files changed, 61 insertions(+), 16 deletions(-) diff --git a/modules/proposals/codex/src/lib.rs b/modules/proposals/codex/src/lib.rs index 86776bbd4a..2918faca33 100644 --- a/modules/proposals/codex/src/lib.rs +++ b/modules/proposals/codex/src/lib.rs @@ -20,22 +20,35 @@ mod tests; use codec::Encode; use proposal_engine::*; use rstd::clone::Clone; -use rstd::vec::Vec; -use srml_support::decl_module; use rstd::prelude::*; +use rstd::vec::Vec; +use srml_support::{decl_error, decl_module, ensure}; /// 'Proposals codex' substrate module Trait pub trait Trait: system::Trait + proposal_engine::Trait {} -use srml_support::traits::{Currency}; +use srml_support::traits::Currency; pub type BalanceOf = -<::Currency as Currency<::AccountId>>::Balance; + <::Currency as Currency<::AccountId>>::Balance; + +//TODO: make configurable +const DEFAULT_TEXT_PROPOSAL_MAX_LEN: u32 = 20_000; + +decl_error! { + pub enum Error { + /// The size of the provided text for text proposal exceeded the limit + TextProposalSizeExceeded, + } +} decl_module! { /// 'Proposal codex' substrate module pub struct Module for enum Call where origin: T::Origin { + /// Predefined errors + type Error = Error; + /// Create text (signal) proposal type. On approval prints its content. - pub fn create_text_proposal(origin, title: Vec, body: Vec) { + pub fn create_text_proposal(origin, title: Vec, body: Vec, text: Vec) { let parameters = crate::ProposalParameters { voting_period: T::BlockNumber::from(50000u32), grace_period: T::BlockNumber::from(10000u32), @@ -44,16 +57,20 @@ decl_module! { stake: Some(>::from(500u32)) }; + ensure!(text.len() as u32 <= DEFAULT_TEXT_PROPOSAL_MAX_LEN, + Error::TextProposalSizeExceeded); + let text_proposal = TextProposalExecutable{ title: title.clone(), - body: body.clone() + body: body.clone(), + text: text.clone(), }; let proposal_code = text_proposal.encode(); >::create_proposal( origin, parameters, - title, + title, body, text_proposal.proposal_type(), proposal_code diff --git a/modules/proposals/codex/src/proposal_types.rs b/modules/proposals/codex/src/proposal_types.rs index 8596bc5b43..abf160ace6 100644 --- a/modules/proposals/codex/src/proposal_types.rs +++ b/modules/proposals/codex/src/proposal_types.rs @@ -46,8 +46,11 @@ pub struct TextProposalExecutable { /// Text proposal title pub title: Vec, - /// Text proposal body + /// Text proposal body (description) pub body: Vec, + + /// Text proposal main text + pub text: Vec, } impl TextProposalExecutable { diff --git a/modules/proposals/codex/src/tests/mock.rs b/modules/proposals/codex/src/tests/mock.rs index 700c24d82c..6d8b21d206 100644 --- a/modules/proposals/codex/src/tests/mock.rs +++ b/modules/proposals/codex/src/tests/mock.rs @@ -59,7 +59,6 @@ impl balances::Trait for Test { type CreationFee = CreationFee; } - impl stake::Trait for Test { type Currency = Balances; type StakePoolId = StakePoolId; diff --git a/modules/proposals/codex/src/tests/mod.rs b/modules/proposals/codex/src/tests/mod.rs index 2a443f088a..4b0bb3031a 100644 --- a/modules/proposals/codex/src/tests/mod.rs +++ b/modules/proposals/codex/src/tests/mod.rs @@ -8,9 +8,32 @@ fn create_text_proposal_codex_call_succeeds() { initial_test_ext().execute_with(|| { let origin = RawOrigin::Signed(1).into(); - assert!( - ProposalCodex::create_text_proposal(origin, b"title".to_vec(), b"body".to_vec(),) - .is_ok() + assert_eq!( + ProposalCodex::create_text_proposal( + origin, + b"title".to_vec(), + b"body".to_vec(), + b"text".to_vec(), + ), + Ok(()) + ); + }); +} + +#[test] +fn create_text_proposal_codex_call_fails_with_incorrect_text_size() { + initial_test_ext().execute_with(|| { + let origin = RawOrigin::Signed(1).into(); + + let long_text = [0u8; 30000].to_vec(); + assert_eq!( + ProposalCodex::create_text_proposal( + origin, + b"title".to_vec(), + b"body".to_vec(), + long_text, + ), + Err(crate::Error::TextProposalSizeExceeded) ); }); } @@ -20,9 +43,12 @@ fn create_text_proposal_codex_call_fails_with_insufficient_rights() { initial_test_ext().execute_with(|| { let origin = RawOrigin::None.into(); - assert!( - ProposalCodex::create_text_proposal(origin, b"title".to_vec(), b"body".to_vec(),) - .is_err() - ); + assert!(ProposalCodex::create_text_proposal( + origin, + b"title".to_vec(), + b"body".to_vec(), + b"text".to_vec(), + ) + .is_err()); }); } From ee5155a1b87ab547e16a8e8b8775c60fb1c6761c Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Mon, 17 Feb 2020 20:29:50 +0300 Subject: [PATCH 028/286] Introduce RuntimeUpgrade proposal type --- modules/proposals/codex/src/lib.rs | 53 +++++++++++++- modules/proposals/codex/src/proposal_types.rs | 72 ------------------ .../proposals/codex/src/proposal_types/mod.rs | 51 +++++++++++++ .../src/proposal_types/runtime_upgrade.rs | 40 ++++++++++ .../codex/src/proposal_types/text_proposal.rs | 38 ++++++++++ modules/proposals/codex/src/tests/mod.rs | 73 +++++++++++++++++++ modules/proposals/engine/src/lib.rs | 2 +- modules/proposals/engine/src/tests/mock.rs | 2 +- modules/proposals/engine/src/types.rs | 2 +- 9 files changed, 256 insertions(+), 77 deletions(-) delete mode 100644 modules/proposals/codex/src/proposal_types.rs create mode 100644 modules/proposals/codex/src/proposal_types/mod.rs create mode 100644 modules/proposals/codex/src/proposal_types/runtime_upgrade.rs create mode 100644 modules/proposals/codex/src/proposal_types/text_proposal.rs diff --git a/modules/proposals/codex/src/lib.rs b/modules/proposals/codex/src/lib.rs index 2918faca33..4e678d53bd 100644 --- a/modules/proposals/codex/src/lib.rs +++ b/modules/proposals/codex/src/lib.rs @@ -11,7 +11,7 @@ // Do not delete! Cannot be uncommented by default, because of Parity decl_module! issue. //#![warn(missing_docs)] -pub use proposal_types::{ProposalType, TextProposalExecutable}; +pub use proposal_types::{ProposalType, TextProposalExecutable, RuntimeUpgradeProposalExecutable}; mod proposal_types; #[cfg(test)] @@ -20,6 +20,7 @@ mod tests; use codec::Encode; use proposal_engine::*; use rstd::clone::Clone; +use rstd::marker::PhantomData; use rstd::prelude::*; use rstd::vec::Vec; use srml_support::{decl_error, decl_module, ensure}; @@ -33,11 +34,21 @@ pub type BalanceOf = //TODO: make configurable const DEFAULT_TEXT_PROPOSAL_MAX_LEN: u32 = 20_000; +const DEFAULT_RUNTIME_PROPOSAL_WASM_MAX_LEN: u32 = 20_000; decl_error! { pub enum Error { /// The size of the provided text for text proposal exceeded the limit TextProposalSizeExceeded, + + /// Provided text for text proposal is empty + TextProposalIsEmpty, + + /// The size of the provided WASM code for the runtime upgrade proposal exceeded the limit + RuntimeProposalSizeExceeded, + + /// Provided WASM code for the runtime upgrade proposal is empty + RuntimeProposalIsEmpty, } } @@ -57,13 +68,14 @@ decl_module! { stake: Some(>::from(500u32)) }; + ensure!(!text.is_empty(), Error::TextProposalIsEmpty); ensure!(text.len() as u32 <= DEFAULT_TEXT_PROPOSAL_MAX_LEN, Error::TextProposalSizeExceeded); let text_proposal = TextProposalExecutable{ title: title.clone(), body: body.clone(), - text: text.clone(), + text, }; let proposal_code = text_proposal.encode(); @@ -76,5 +88,42 @@ decl_module! { proposal_code )?; } + + /// Create runtime upgrade proposal type. On approval prints its content. + pub fn create_runtime_upgrade_proposal( + origin, + title: Vec, + body: Vec, + wasm: Vec + ) { + let parameters = crate::ProposalParameters { + voting_period: T::BlockNumber::from(50000u32), + grace_period: T::BlockNumber::from(10000u32), + approval_quorum_percentage: 80, + approval_threshold_percentage: 80, + stake: Some(>::from(50000u32)) + }; + + ensure!(!wasm.is_empty(), Error::RuntimeProposalIsEmpty); + ensure!(wasm.len() as u32 <= DEFAULT_RUNTIME_PROPOSAL_WASM_MAX_LEN, + Error::RuntimeProposalSizeExceeded); + + let proposal = RuntimeUpgradeProposalExecutable{ + title: title.clone(), + body: body.clone(), + wasm, + marker : PhantomData:: + }; + let proposal_code = proposal.encode(); + + >::create_proposal( + origin, + parameters, + title, + body, + proposal.proposal_type(), + proposal_code + )?; + } } } diff --git a/modules/proposals/codex/src/proposal_types.rs b/modules/proposals/codex/src/proposal_types.rs deleted file mode 100644 index abf160ace6..0000000000 --- a/modules/proposals/codex/src/proposal_types.rs +++ /dev/null @@ -1,72 +0,0 @@ -use codec::{Decode, Encode}; -use num_enum::{IntoPrimitive, TryFromPrimitive}; -use rstd::convert::TryFrom; -use rstd::prelude::*; - -use rstd::str::from_utf8; -use srml_support::{dispatch, print}; - -use crate::{ProposalCodeDecoder, ProposalExecutable}; - -/// Defines allowed proposals types. Integer value serves as proposal_type_id. -#[derive(Debug, Eq, PartialEq, TryFromPrimitive, IntoPrimitive)] -#[repr(u32)] -pub enum ProposalType { - /// Text(signal) proposal type - Text = 1, -} - -impl ProposalType { - fn compose_executable( - &self, - proposal_data: Vec, - ) -> Result, &'static str> { - match self { - ProposalType::Text => TextProposalExecutable::decode(&mut &proposal_data[..]) - .map_err(|err| err.what()) - .map(|obj| Box::new(obj) as Box), - } - } -} - -impl ProposalCodeDecoder for ProposalType { - fn decode_proposal( - proposal_type: u32, - proposal_code: Vec, - ) -> Result, &'static str> { - Self::try_from(proposal_type) - .map_err(|_| "Unsupported proposal type")? - .compose_executable(proposal_code) - } -} - -/// Text (signal) proposal executable code wrapper. Prints its content on execution. -#[derive(Encode, Decode, Clone, PartialEq, Eq, Debug, Default)] -pub struct TextProposalExecutable { - /// Text proposal title - pub title: Vec, - - /// Text proposal body (description) - pub body: Vec, - - /// Text proposal main text - pub text: Vec, -} - -impl TextProposalExecutable { - /// Converts text proposal type to proposal_type_id - pub fn proposal_type(&self) -> u32 { - ProposalType::Text.into() - } -} - -impl ProposalExecutable for TextProposalExecutable { - fn execute(&self) -> dispatch::Result { - print("Proposal: "); - print(from_utf8(self.title.as_slice()).unwrap()); - print("Description:"); - print(from_utf8(self.body.as_slice()).unwrap()); - - Ok(()) - } -} diff --git a/modules/proposals/codex/src/proposal_types/mod.rs b/modules/proposals/codex/src/proposal_types/mod.rs new file mode 100644 index 0000000000..73947aab90 --- /dev/null +++ b/modules/proposals/codex/src/proposal_types/mod.rs @@ -0,0 +1,51 @@ +use codec::{Decode}; +use num_enum::{IntoPrimitive, TryFromPrimitive}; +use rstd::convert::TryFrom; +use rstd::prelude::*; + +use crate::{ProposalCodeDecoder, ProposalExecutable}; + +mod text_proposal; +mod runtime_upgrade; + +pub use text_proposal::TextProposalExecutable; +pub use runtime_upgrade::RuntimeUpgradeProposalExecutable; + +/// Defines allowed proposals types. Integer value serves as proposal_type_id. +#[derive(Debug, Eq, PartialEq, TryFromPrimitive, IntoPrimitive)] +#[repr(u32)] +pub enum ProposalType { + /// Text(signal) proposal type + Text = 1, + + /// Runtime upgrade proposal type + RuntimeUpgrade = 2, +} + +impl ProposalType { + fn compose_executable( + &self, + proposal_data: Vec, + ) -> Result, &'static str> { + match self { + ProposalType::Text => TextProposalExecutable::decode(&mut &proposal_data[..]) + .map_err(|err| err.what()) + .map(|obj| Box::new(obj) as Box), + ProposalType::RuntimeUpgrade => >::decode(&mut &proposal_data[..]) + .map_err(|err| err.what()) + .map(|obj| Box::new(obj) as Box), + } + } +} + +impl ProposalCodeDecoder for ProposalType { + fn decode_proposal( + proposal_type: u32, + proposal_code: Vec, + ) -> Result, &'static str> { + Self::try_from(proposal_type) + .map_err(|_| "Unsupported proposal type")? + .compose_executable::(proposal_code) + } +} + diff --git a/modules/proposals/codex/src/proposal_types/runtime_upgrade.rs b/modules/proposals/codex/src/proposal_types/runtime_upgrade.rs new file mode 100644 index 0000000000..d1bd91d75f --- /dev/null +++ b/modules/proposals/codex/src/proposal_types/runtime_upgrade.rs @@ -0,0 +1,40 @@ +use codec::{Decode, Encode}; +use rstd::prelude::*; +use rstd::marker::PhantomData; + +use srml_support::{dispatch}; +use runtime_primitives::traits::ModuleDispatchError; + +use crate::{ProposalExecutable, ProposalType}; + + +/// Text (signal) proposal executable code wrapper. Prints its content on execution. +#[derive(Encode, Decode, Clone, PartialEq, Eq, Debug, Default)] +pub struct RuntimeUpgradeProposalExecutable { + /// Proposal title + pub title: Vec, + + /// Proposal body (description) + pub body: Vec, + + /// Text proposal main text + pub wasm: Vec, + + /// Marker for the system::Trait. Required to execute runtime upgrade proposal on exact runtime. + pub marker : PhantomData, +} + +impl RuntimeUpgradeProposalExecutable { + /// Converts runtime proposal type to proposal_type_id + pub fn proposal_type(&self) -> u32 { + ProposalType::RuntimeUpgrade.into() + } +} + +impl ProposalExecutable for RuntimeUpgradeProposalExecutable { + fn execute(&self) -> dispatch::Result { + // Update wasm code of node's runtime: + >::set_code(system::RawOrigin::Root.into(), self.wasm.clone()) + .map_err(|err| err.as_str()) + } +} diff --git a/modules/proposals/codex/src/proposal_types/text_proposal.rs b/modules/proposals/codex/src/proposal_types/text_proposal.rs new file mode 100644 index 0000000000..fd33cb7a3f --- /dev/null +++ b/modules/proposals/codex/src/proposal_types/text_proposal.rs @@ -0,0 +1,38 @@ +use codec::{Decode, Encode}; +use rstd::prelude::*; + +use rstd::str::from_utf8; +use srml_support::{dispatch, print}; + +use crate::{ProposalExecutable, ProposalType}; + +/// Text (signal) proposal executable code wrapper. Prints its content on execution. +#[derive(Encode, Decode, Clone, PartialEq, Eq, Debug, Default)] +pub struct TextProposalExecutable { + /// Text proposal title + pub title: Vec, + + /// Text proposal body (description) + pub body: Vec, + + /// Text proposal main text + pub text: Vec, +} + +impl TextProposalExecutable { + /// Converts text proposal type to proposal_type_id + pub fn proposal_type(&self) -> u32 { + ProposalType::Text.into() + } +} + +impl ProposalExecutable for TextProposalExecutable { + fn execute(&self) -> dispatch::Result { + print("Proposal: "); + print(from_utf8(self.title.as_slice()).unwrap()); + print("Description:"); + print(from_utf8(self.body.as_slice()).unwrap()); + + Ok(()) + } +} diff --git a/modules/proposals/codex/src/tests/mod.rs b/modules/proposals/codex/src/tests/mod.rs index 4b0bb3031a..f9b5d571aa 100644 --- a/modules/proposals/codex/src/tests/mod.rs +++ b/modules/proposals/codex/src/tests/mod.rs @@ -35,6 +35,16 @@ fn create_text_proposal_codex_call_fails_with_incorrect_text_size() { ), Err(crate::Error::TextProposalSizeExceeded) ); + + assert_eq!( + ProposalCodex::create_text_proposal( + RawOrigin::Signed(1).into(), + b"title".to_vec(), + b"body".to_vec(), + Vec::new(), + ), + Err(crate::Error::TextProposalIsEmpty) + ); }); } @@ -52,3 +62,66 @@ fn create_text_proposal_codex_call_fails_with_insufficient_rights() { .is_err()); }); } + + + +#[test] +fn create_upgrade_runtime_proposal_codex_call_fails_with_incorrect_wasm_size() { + initial_test_ext().execute_with(|| { + let origin = RawOrigin::Signed(1).into(); + + let long_wasm = [0u8; 30000].to_vec(); + assert_eq!( + ProposalCodex::create_runtime_upgrade_proposal( + origin, + b"title".to_vec(), + b"body".to_vec(), + long_wasm, + ), + Err(crate::Error::RuntimeProposalSizeExceeded) + ); + + assert_eq!( + ProposalCodex::create_runtime_upgrade_proposal( + RawOrigin::Signed(1).into(), + b"title".to_vec(), + b"body".to_vec(), + Vec::new(), + ), + Err(crate::Error::RuntimeProposalIsEmpty) + ); + }); +} + + +#[test] +fn create_upgrade_runtime_proposal_codex_call_fails_with_insufficient_rights() { + initial_test_ext().execute_with(|| { + let origin = RawOrigin::None.into(); + + assert!(ProposalCodex::create_runtime_upgrade_proposal( + origin, + b"title".to_vec(), + b"body".to_vec(), + b"wasm".to_vec(), + ) + .is_err()); + }); +} + +#[test] +fn create_runtime_upgrade_proposal_codex_call_succeeds() { + initial_test_ext().execute_with(|| { + let origin = RawOrigin::Signed(1).into(); + + assert_eq!( + ProposalCodex::create_runtime_upgrade_proposal( + origin, + b"title".to_vec(), + b"body".to_vec(), + b"wasm".to_vec(), + ), + Ok(()) + ); + }); +} \ No newline at end of file diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index 5bfd1fb099..6379f9f9d5 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -55,7 +55,7 @@ pub trait Trait: system::Trait + timestamp::Trait + stake::Trait { type TotalVotersCounter: VotersParameters; /// Converts proposal code binary to executable representation - type ProposalCodeDecoder: ProposalCodeDecoder; + type ProposalCodeDecoder: ProposalCodeDecoder; } decl_event!( diff --git a/modules/proposals/engine/src/tests/mock.rs b/modules/proposals/engine/src/tests/mock.rs index 3e1111a978..3a4a48db83 100644 --- a/modules/proposals/engine/src/tests/mock.rs +++ b/modules/proposals/engine/src/tests/mock.rs @@ -167,7 +167,7 @@ impl ProposalType { } } -impl ProposalCodeDecoder for ProposalType { +impl ProposalCodeDecoder for ProposalType { fn decode_proposal( proposal_type: u32, proposal_code: Vec, diff --git a/modules/proposals/engine/src/types.rs b/modules/proposals/engine/src/types.rs index f7a9cecc8c..0390a027c1 100644 --- a/modules/proposals/engine/src/types.rs +++ b/modules/proposals/engine/src/types.rs @@ -294,7 +294,7 @@ pub trait ProposalExecutable { } /// Proposal code binary converter -pub trait ProposalCodeDecoder { +pub trait ProposalCodeDecoder { /// Converts proposal code binary to executable representation fn decode_proposal( proposal_type: u32, From d75711a5f9e77831b43d888be4404100f8bf4b48 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 18 Feb 2020 10:31:15 +0300 Subject: [PATCH 029/286] Make Text and Wasm length configurable in codex storage --- modules/proposals/codex/src/lib.rs | 20 ++++++++++++++++---- modules/proposals/engine/src/lib.rs | 4 ++-- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/modules/proposals/codex/src/lib.rs b/modules/proposals/codex/src/lib.rs index 4e678d53bd..f2c2ef84c1 100644 --- a/modules/proposals/codex/src/lib.rs +++ b/modules/proposals/codex/src/lib.rs @@ -23,7 +23,7 @@ use rstd::clone::Clone; use rstd::marker::PhantomData; use rstd::prelude::*; use rstd::vec::Vec; -use srml_support::{decl_error, decl_module, ensure}; +use srml_support::{decl_error, decl_module, decl_storage, ensure}; /// 'Proposals codex' substrate module Trait pub trait Trait: system::Trait + proposal_engine::Trait {} @@ -32,8 +32,9 @@ use srml_support::traits::Currency; pub type BalanceOf = <::Currency as Currency<::AccountId>>::Balance; -//TODO: make configurable +// Defines max allowed text proposal text length. Can be override in the config. const DEFAULT_TEXT_PROPOSAL_MAX_LEN: u32 = 20_000; +// Defines max allowed text proposal text length. Can be override in the config. const DEFAULT_RUNTIME_PROPOSAL_WASM_MAX_LEN: u32 = 20_000; decl_error! { @@ -52,6 +53,17 @@ decl_error! { } } +// Storage for the proposals codex module +decl_storage! { + pub trait Store for Module as ProposalCodex{ + /// Defines max allowed text proposal text length. + pub TextProposalMaxLen get(text_max_len) config(): u32 = DEFAULT_TEXT_PROPOSAL_MAX_LEN; + + /// Defines max allowed runtime upgrade proposal wasm code length. + pub RuntimeUpgradeMaxLen get(wasm_max_len) config(): u32 = DEFAULT_RUNTIME_PROPOSAL_WASM_MAX_LEN; + } +} + decl_module! { /// 'Proposal codex' substrate module pub struct Module for enum Call where origin: T::Origin { @@ -69,7 +81,7 @@ decl_module! { }; ensure!(!text.is_empty(), Error::TextProposalIsEmpty); - ensure!(text.len() as u32 <= DEFAULT_TEXT_PROPOSAL_MAX_LEN, + ensure!(text.len() as u32 <= Self::text_max_len(), Error::TextProposalSizeExceeded); let text_proposal = TextProposalExecutable{ @@ -105,7 +117,7 @@ decl_module! { }; ensure!(!wasm.is_empty(), Error::RuntimeProposalIsEmpty); - ensure!(wasm.len() as u32 <= DEFAULT_RUNTIME_PROPOSAL_WASM_MAX_LEN, + ensure!(wasm.len() as u32 <= Self::wasm_max_len(), Error::RuntimeProposalSizeExceeded); let proposal = RuntimeUpgradeProposalExecutable{ diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index 6379f9f9d5..13b00aeecb 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -96,9 +96,9 @@ decl_event!( } ); -// Storage for the proposals module +// Storage for the proposals engine module decl_storage! { - pub trait Store for Module as ProposalsEngine{ + pub trait Store for Module as ProposalEngine{ /// Map proposal by its id. pub Proposals get(fn proposals): map u32 => Proposal>; From d5d9f6906dd52bac54573bd34b793a878660471a Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 18 Feb 2020 13:36:06 +0300 Subject: [PATCH 030/286] Add MaxActiveProposals storage config parameter - add MaxActiveProposals storage config parameter - add comments - refactor: fix clippy suggestions --- modules/proposals/engine/src/lib.rs | 31 ++++++++++++++++----------- modules/proposals/engine/src/types.rs | 3 +-- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index c989259b2e..ae3891a023 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -22,8 +22,6 @@ pub use types::{Proposal, ProposalParameters, ProposalStatus}; pub use types::{ProposalCodeDecoder, ProposalExecutable}; pub use types::{VoteKind, VotersParameters}; -pub use rstd::collections::btree_set::BTreeSet; //TODO change to linked_map - mod errors; mod types; @@ -38,15 +36,12 @@ use srml_support::{ }; use system::ensure_root; -// TODO: add maximum allowed active proposals // TODO: update proposal.finalized_at - update on all proposal finalization points. // Max allowed proposal title length. Can be used if config value is not filled. const DEFAULT_TITLE_MAX_LEN: u32 = 100; // Max allowed proposal body length. Can be used if config value is not filled. const DEFAULT_BODY_MAX_LEN: u32 = 10_000; - -// TODO add to config // Max simultaneous active proposals number. const MAX_ACTIVE_PROPOSALS_NUMBER: u32 = 100; @@ -65,7 +60,6 @@ pub trait Trait: system::Trait + timestamp::Trait + stake::Trait { type TotalVotersCounter: VotersParameters; /// Converts proposal code binary to executable representation - type ProposalCodeDecoder: ProposalCodeDecoder; /// Proposal Id type @@ -148,6 +142,9 @@ decl_storage! { /// Defines max allowed proposal body length. Can be configured. pub BodyMaxLen get(body_max_len) config(): u32 = DEFAULT_BODY_MAX_LEN; + + /// Defines max simultaneous active proposals number. Can be configured. + pub MaxActiveProposals get(max_active_proposals) config(): u32 = MAX_ACTIVE_PROPOSALS_NUMBER; } } @@ -221,12 +218,13 @@ decl_module! { fn on_finalize(_n: T::BlockNumber) { let executable_proposal_ids = Self::get_approved_proposal_with_expired_grace_period_ids(); - let finalized_proposals_data = Self::get_finalized_proposals_data(); + + let finalized_proposals = Self::get_finalized_proposals(); // mutation // Check vote results - for proposal_data in finalized_proposals_data { + for proposal_data in finalized_proposals { >::insert(proposal_data.proposal_id, proposal_data.proposal); Self::update_proposal_status(proposal_data.proposal_id, proposal_data.status); } @@ -265,7 +263,7 @@ impl Module { ); ensure!( - (Self::active_proposal_count()) < MAX_ACTIVE_PROPOSALS_NUMBER, + (Self::active_proposal_count()) < Self::max_active_proposals(), errors::MSG_MAX_ACTIVE_PROPOSAL_NUMBER_EXCEEDED ); @@ -333,9 +331,7 @@ impl Module { /// Enumerates through active proposals. Tally Voting results. /// Returns proposals with finalized status and id - fn get_finalized_proposals_data( - ) -> Vec>> - { + fn get_finalized_proposals() -> Vec> { // enumerate active proposals id and gather finalization data >::enumerate() .filter_map(|(proposal_id, _)| { @@ -412,6 +408,7 @@ impl Module { Self::update_proposal_status(proposal_id, ProposalStatus::PendingExecution); } + /// Enumerates approved proposals and checks their grace period expiration fn get_approved_proposal_with_expired_grace_period_ids() -> Vec { >::enumerate() .filter_map(|(proposal_id, _)| { @@ -437,8 +434,16 @@ impl Module { let current_active_proposal_counter = Self::active_proposal_count(); if current_active_proposal_counter > 0 { - let next_active_proposal_count_value = current_active_proposal_counter - 1; + let next_active_proposal_count_value = current_active_proposal_counter - 1; ActiveProposalCount::put(next_active_proposal_count_value); }; } } + +/// Simplification of the 'FinalizedProposalData' type +type FinalizedProposal = FinalizedProposalData< + ::ProposalId, + ::BlockNumber, + ::ProposerId, + types::BalanceOf, +>; diff --git a/modules/proposals/engine/src/types.rs b/modules/proposals/engine/src/types.rs index 0ea034bcd9..e93b0872b2 100644 --- a/modules/proposals/engine/src/types.rs +++ b/modules/proposals/engine/src/types.rs @@ -105,6 +105,7 @@ pub struct ProposalParameters { /// Approval votes percentage threshold to pass the vote. pub approval_threshold_percentage: u32, + /// Proposal stake pub stake: Option, } @@ -163,8 +164,6 @@ pub struct Proposal { /// When it was approved. pub approved_at: Option, - // Any stake associated with the proposal. - //pub stake: Option> /// Current proposal status pub status: ProposalStatus, From e2d2284aa63df9b9209d3bb0ae21d72f03bc0e45 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Wed, 19 Feb 2020 12:29:15 +0300 Subject: [PATCH 031/286] Add stake to the proposal on creation --- modules/proposals/codex/src/lib.rs | 23 ++++- modules/proposals/codex/src/tests/mock.rs | 2 + modules/proposals/codex/src/tests/mod.rs | 8 ++ modules/proposals/engine/src/lib.rs | 35 ++++++-- modules/proposals/engine/src/tests/mock.rs | 2 + modules/proposals/engine/src/tests/mod.rs | 35 ++++++-- .../engine/src/{types.rs => types/mod.rs} | 56 +++++++----- modules/proposals/engine/src/types/stakes.rs | 89 +++++++++++++++++++ 8 files changed, 209 insertions(+), 41 deletions(-) rename modules/proposals/engine/src/{types.rs => types/mod.rs} (89%) create mode 100644 modules/proposals/engine/src/types/stakes.rs diff --git a/modules/proposals/codex/src/lib.rs b/modules/proposals/codex/src/lib.rs index 99b4c60d12..7772da8b24 100644 --- a/modules/proposals/codex/src/lib.rs +++ b/modules/proposals/codex/src/lib.rs @@ -29,9 +29,15 @@ use srml_support::{decl_error, decl_module, decl_storage, ensure}; pub trait Trait: system::Trait + proposal_engine::Trait {} use srml_support::traits::Currency; + +/// Balance alias pub type BalanceOf = <::Currency as Currency<::AccountId>>::Balance; +/// Balance alias for staking +pub type NegativeImbalance = +<::Currency as Currency<::AccountId>>::NegativeImbalance; + // Defines max allowed text proposal text length. Can be override in the config. const DEFAULT_TEXT_PROPOSAL_MAX_LEN: u32 = 20_000; // Defines max allowed text proposal text length. Can be override in the config. @@ -71,13 +77,19 @@ decl_module! { type Error = Error; /// Create text (signal) proposal type. On approval prints its content. - pub fn create_text_proposal(origin, title: Vec, body: Vec, text: Vec) { + pub fn create_text_proposal( + origin, + title: Vec, + body: Vec, + text: Vec, + stake_balance: Option>, + ) { let parameters = crate::ProposalParameters { voting_period: T::BlockNumber::from(50000u32), grace_period: T::BlockNumber::from(10000u32), approval_quorum_percentage: 40, approval_threshold_percentage: 51, - stake: Some(>::from(500u32)) + required_stake: Some(>::from(500u32)) }; ensure!(!text.is_empty(), Error::TextProposalIsEmpty); @@ -96,6 +108,7 @@ decl_module! { parameters, title, body, + stake_balance, text_proposal.proposal_type(), proposal_code )?; @@ -106,14 +119,15 @@ decl_module! { origin, title: Vec, body: Vec, - wasm: Vec + wasm: Vec, + stake_balance: Option>, ) { let parameters = crate::ProposalParameters { voting_period: T::BlockNumber::from(50000u32), grace_period: T::BlockNumber::from(10000u32), approval_quorum_percentage: 80, approval_threshold_percentage: 80, - stake: Some(>::from(50000u32)) + required_stake: Some(>::from(50000u32)) }; ensure!(!wasm.is_empty(), Error::RuntimeProposalIsEmpty); @@ -133,6 +147,7 @@ decl_module! { parameters, title, body, + stake_balance, proposal.proposal_type(), proposal_code )?; diff --git a/modules/proposals/codex/src/tests/mock.rs b/modules/proposals/codex/src/tests/mock.rs index 1276247935..f02ec964d0 100644 --- a/modules/proposals/codex/src/tests/mock.rs +++ b/modules/proposals/codex/src/tests/mock.rs @@ -83,6 +83,8 @@ impl proposal_engine::Trait for Test { type ProposerId = u64; type VoterId = u64; + + type StakeHandlerProvider = proposal_engine::DefaultStakeHandlerProvider; } pub struct MockVotersParameters; diff --git a/modules/proposals/codex/src/tests/mod.rs b/modules/proposals/codex/src/tests/mod.rs index 2858e147f6..3c7ed70944 100644 --- a/modules/proposals/codex/src/tests/mod.rs +++ b/modules/proposals/codex/src/tests/mod.rs @@ -14,6 +14,7 @@ fn create_text_proposal_codex_call_succeeds() { b"title".to_vec(), b"body".to_vec(), b"text".to_vec(), + None, ), Ok(()) ); @@ -32,6 +33,7 @@ fn create_text_proposal_codex_call_fails_with_incorrect_text_size() { b"title".to_vec(), b"body".to_vec(), long_text, + None, ), Err(crate::Error::TextProposalSizeExceeded) ); @@ -42,6 +44,7 @@ fn create_text_proposal_codex_call_fails_with_incorrect_text_size() { b"title".to_vec(), b"body".to_vec(), Vec::new(), + None, ), Err(crate::Error::TextProposalIsEmpty) ); @@ -58,6 +61,7 @@ fn create_text_proposal_codex_call_fails_with_insufficient_rights() { b"title".to_vec(), b"body".to_vec(), b"text".to_vec(), + None, ) .is_err()); }); @@ -75,6 +79,7 @@ fn create_upgrade_runtime_proposal_codex_call_fails_with_incorrect_wasm_size() { b"title".to_vec(), b"body".to_vec(), long_wasm, + None, ), Err(crate::Error::RuntimeProposalSizeExceeded) ); @@ -85,6 +90,7 @@ fn create_upgrade_runtime_proposal_codex_call_fails_with_incorrect_wasm_size() { b"title".to_vec(), b"body".to_vec(), Vec::new(), + None, ), Err(crate::Error::RuntimeProposalIsEmpty) ); @@ -101,6 +107,7 @@ fn create_upgrade_runtime_proposal_codex_call_fails_with_insufficient_rights() { b"title".to_vec(), b"body".to_vec(), b"wasm".to_vec(), + None, ) .is_err()); }); @@ -117,6 +124,7 @@ fn create_runtime_upgrade_proposal_codex_call_succeeds() { b"title".to_vec(), b"body".to_vec(), b"wasm".to_vec(), + None, ), Ok(()) ); diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index ae3891a023..45bda4d046 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -14,14 +14,15 @@ #![cfg_attr(not(feature = "std"), no_std)] // Do not delete! Cannot be uncommented by default, because of Parity decl_module! issue. -//#![warn(missing_docs)] +#![warn(missing_docs)] use types::FinalizedProposalData; +pub use types::BalanceOf; pub use types::VotingResults; +pub use types::{DefaultStakeHandlerProvider, StakeHandler, StakeHandlerProvider}; pub use types::{Proposal, ProposalParameters, ProposalStatus}; pub use types::{ProposalCodeDecoder, ProposalExecutable}; pub use types::{VoteKind, VotersParameters}; - mod errors; mod types; @@ -70,6 +71,9 @@ pub trait Trait: system::Trait + timestamp::Trait + stake::Trait { /// Type for the voter id. Should be authenticated by account id. type VoterId: From + Parameter + Default + Clone; + + /// Provides stake logic implementation. Can be used to mock stake logic. + type StakeHandlerProvider: StakeHandlerProvider; } decl_event!( @@ -116,7 +120,8 @@ decl_event!( decl_storage! { pub trait Store for Module as ProposalEngine{ /// Map proposal by its id. - pub Proposals get(fn proposals): map T::ProposalId => Proposal>; + pub Proposals get(fn proposals): map T::ProposalId => + Proposal, T::StakeId>; /// Count of all proposals that have been created. pub ProposalCount get(fn proposal_count): u32; @@ -244,11 +249,12 @@ impl Module { parameters: ProposalParameters>, title: Vec, body: Vec, + stake_balance: Option>, proposal_type: u32, proposal_code: Vec, ) -> dispatch::Result { let account_id = T::ProposalOrigin::ensure_origin(origin)?; - let proposer_id = T::ProposerId::from(account_id); + let proposer_id = T::ProposerId::from(account_id.clone()); ensure!(!title.is_empty(), errors::MSG_EMPTY_TITLE_PROVIDED); ensure!( @@ -267,9 +273,27 @@ impl Module { errors::MSG_MAX_ACTIVE_PROPOSAL_NUMBER_EXCEEDED ); + // ensure 4 cases of stakes (parameters.required_stake) + let next_proposal_count_value = Self::proposal_count() + 1; let new_proposal_id = next_proposal_count_value; + // mutation + + // let stake_id = if let Some(stake_amount) = stake_balance { + // let stake_id = T::StakeHandlerProvider::stakes().create_stake(stake_amount)?; + // + // Some(stake_id) + // } else { + // None + // }; + + let stake_id = stake_balance + .map(|stake_amount| { + T::StakeHandlerProvider::stakes().create_stake(stake_amount, account_id) + }) + .transpose()?; + let new_proposal = Proposal { created_at: Self::current_block(), parameters, @@ -281,9 +305,9 @@ impl Module { approved_at: None, voting_results: VotingResults::default(), finalized_at: None, + stake_id, }; - // mutation let proposal_id = T::ProposalId::from(new_proposal_id); >::insert(proposal_id, new_proposal); >::insert(proposal_id, proposal_code); @@ -446,4 +470,5 @@ type FinalizedProposal = FinalizedProposalData< ::BlockNumber, ::ProposerId, types::BalanceOf, + ::StakeId, >; diff --git a/modules/proposals/engine/src/tests/mock.rs b/modules/proposals/engine/src/tests/mock.rs index b69d35eaa5..d942363612 100644 --- a/modules/proposals/engine/src/tests/mock.rs +++ b/modules/proposals/engine/src/tests/mock.rs @@ -82,6 +82,8 @@ impl crate::Trait for Test { type ProposerId = u64; type VoterId = u64; + + type StakeHandlerProvider = crate::DefaultStakeHandlerProvider; } impl crate::VotersParameters for () { diff --git a/modules/proposals/engine/src/tests/mod.rs b/modules/proposals/engine/src/tests/mod.rs index 25c1322092..ed2802ecd0 100644 --- a/modules/proposals/engine/src/tests/mod.rs +++ b/modules/proposals/engine/src/tests/mod.rs @@ -16,6 +16,7 @@ struct DummyProposalFixture { proposal_code: Vec, title: Vec, body: Vec, + stake_balance: Option>, } impl Default for DummyProposalFixture { @@ -31,13 +32,14 @@ impl Default for DummyProposalFixture { approval_quorum_percentage: 60, approval_threshold_percentage: 60, grace_period: 0, - stake: None, + required_stake: None, }, origin: RawOrigin::Signed(1), proposal_type: dummy_proposal.proposal_type(), proposal_code: dummy_proposal.encode(), title: dummy_proposal.title, body: dummy_proposal.body, + stake_balance: None, } } } @@ -59,6 +61,13 @@ impl DummyProposalFixture { DummyProposalFixture { origin, ..self } } + fn with_stake(self, stake_balance: BalanceOf) -> Self { + DummyProposalFixture { + stake_balance: Some(stake_balance), + ..self + } + } + fn with_proposal_type_and_code(self, proposal_type: u32, proposal_code: Vec) -> Self { DummyProposalFixture { proposal_type, @@ -74,6 +83,7 @@ impl DummyProposalFixture { self.parameters, self.title, self.body, + self.stake_balance, self.proposal_type, self.proposal_code, ), @@ -255,7 +265,7 @@ fn proposal_execution_succeeds() { approval_quorum_percentage: 60, approval_threshold_percentage: 60, grace_period: 0, - stake: None, + required_stake: None, }; let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters); let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); @@ -290,6 +300,7 @@ fn proposal_execution_succeeds() { rejections: 0, }, finalized_at: None, + stake_id: None, } ); @@ -306,7 +317,7 @@ fn proposal_execution_failed() { approval_quorum_percentage: 60, approval_threshold_percentage: 60, grace_period: 0, - stake: None, + required_stake: None, }; let faulty_proposal = FaultyExecutable; @@ -345,6 +356,7 @@ fn proposal_execution_failed() { rejections: 0, }, finalized_at: None, + stake_id: None, } ) }); @@ -358,7 +370,7 @@ fn voting_results_calculation_succeeds() { approval_quorum_percentage: 50, approval_threshold_percentage: 50, grace_period: 0, - stake: None, + required_stake: None, }; let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters); let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); @@ -505,7 +517,7 @@ fn cancel_proposal_succeeds() { approval_quorum_percentage: 60, approval_threshold_percentage: 60, grace_period: 0, - stake: None, + required_stake: None, }; let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters); let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); @@ -528,6 +540,7 @@ fn cancel_proposal_succeeds() { approved_at: None, voting_results: VotingResults::default(), finalized_at: None, + stake_id: None, } ) }); @@ -577,7 +590,7 @@ fn veto_proposal_succeeds() { approval_quorum_percentage: 60, approval_threshold_percentage: 60, grace_period: 0, - stake: None, + required_stake: None, }; let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters); let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); @@ -603,6 +616,7 @@ fn veto_proposal_succeeds() { approved_at: None, voting_results: VotingResults::default(), finalized_at: None, + stake_id: None, } ); @@ -711,7 +725,7 @@ fn create_proposal_and_expire_it() { approval_quorum_percentage: 49, approval_threshold_percentage: 60, grace_period: 0, - stake: None, + required_stake: None, }; let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters.clone()); @@ -738,6 +752,7 @@ fn create_proposal_and_expire_it() { rejections: 0, }, finalized_at: None, + stake_id: None, } ) }); @@ -751,7 +766,7 @@ fn proposal_execution_postponed_because_of_grace_period() { approval_quorum_percentage: 60, approval_threshold_percentage: 60, grace_period: 2, - stake: None, + required_stake: None, }; let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters); let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); @@ -789,6 +804,7 @@ fn proposal_execution_postponed_because_of_grace_period() { approvals: 4, rejections: 0, }, + stake_id: None, } ); }); @@ -802,7 +818,7 @@ fn proposal_execution_succeeds_after_the_grace_period() { approval_quorum_percentage: 60, approval_threshold_percentage: 60, grace_period: 1, - stake: None, + required_stake: None, }; let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters); let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); @@ -837,6 +853,7 @@ fn proposal_execution_succeeds_after_the_grace_period() { approvals: 4, rejections: 0, }, + stake_id: None, }; assert_eq!(proposal, expected_proposal); diff --git a/modules/proposals/engine/src/types.rs b/modules/proposals/engine/src/types/mod.rs similarity index 89% rename from modules/proposals/engine/src/types.rs rename to modules/proposals/engine/src/types/mod.rs index e93b0872b2..797b080846 100644 --- a/modules/proposals/engine/src/types.rs +++ b/modules/proposals/engine/src/types/mod.rs @@ -11,6 +11,10 @@ use serde::{Deserialize, Serialize}; use srml_support::dispatch; use srml_support::traits::Currency; +mod stakes; + +pub use stakes::{DefaultStakeHandlerProvider, StakeHandler, StakeHandlerProvider}; + /// Current status of the proposal #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] #[derive(Encode, Decode, Clone, PartialEq, Eq, Debug)] @@ -36,7 +40,7 @@ pub enum ProposalStatus { /// Proposal was executed and failed with an error Failed { - /// Fail error + /// Error message error: Vec, }, @@ -106,7 +110,7 @@ pub struct ProposalParameters { pub approval_threshold_percentage: u32, /// Proposal stake - pub stake: Option, + pub required_stake: Option, } /// Contains current voting results @@ -142,7 +146,7 @@ impl VotingResults { /// 'Proposal' contains information necessary for the proposal system functioning. #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] #[derive(Encode, Decode, Default, Clone, PartialEq, Eq, Debug)] -pub struct Proposal { +pub struct Proposal { /// Proposal type id pub proposal_type: u32, @@ -173,9 +177,12 @@ pub struct Proposal { // TODO: update proposal.finalized_at /// Proposal finalization block number pub finalized_at: Option, + + /// Created stake id for the proposal + pub stake_id: Option, } -impl Proposal +impl Proposal where BlockNumber: Add + PartialOrd + Copy, { @@ -230,16 +237,16 @@ pub trait VotersParameters { } // Calculates quorum, votes threshold, expiration status -struct ProposalStatusDecision<'a, BlockNumber, ProposerId, Balance> { - proposal: &'a Proposal, +struct ProposalStatusDecision<'a, BlockNumber, ProposerId, Balance, StakeId> { + proposal: &'a Proposal, now: BlockNumber, votes_count: u32, total_voters_count: u32, approvals: u32, } -impl<'a, BlockNumber, ProposerId, Balance> - ProposalStatusDecision<'a, BlockNumber, ProposerId, Balance> +impl<'a, BlockNumber, ProposerId, Balance, StakeId> + ProposalStatusDecision<'a, BlockNumber, ProposerId, Balance, StakeId> where BlockNumber: Add + PartialOrd + Copy, { @@ -295,17 +302,20 @@ pub trait ProposalCodeDecoder { pub type BalanceOf = <::Currency as Currency<::AccountId>>::Balance; -///// Balance alias for staking -//pub type NegativeImbalance = -// <::Currency as Currency<::AccountId>>::NegativeImbalance; +/// Balance alias for staking +pub type NegativeImbalance = + <::Currency as Currency<::AccountId>>::NegativeImbalance; + +/// Balance type of runtime +pub type CurrencyOf = ::Currency; /// Data container for the finalized proposal results -pub(crate) struct FinalizedProposalData { +pub(crate) struct FinalizedProposalData { /// Proposal id pub proposal_id: ProposalId, /// Proposal to be finalized - pub proposal: Proposal, + pub proposal: Proposal, /// Proposal finalization status pub status: ProposalStatus, @@ -320,7 +330,7 @@ mod tests { #[test] fn proposal_voting_period_expired() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); proposal.created_at = 1; proposal.parameters.voting_period = 3; @@ -330,7 +340,7 @@ mod tests { #[test] fn proposal_voting_period_not_expired() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); proposal.created_at = 1; proposal.parameters.voting_period = 3; @@ -340,7 +350,7 @@ mod tests { #[test] fn proposal_grace_period_expired() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); proposal.approved_at = Some(1); proposal.parameters.grace_period = 3; @@ -350,7 +360,7 @@ mod tests { #[test] fn proposal_grace_period_auto_expired() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); proposal.approved_at = Some(1); proposal.parameters.grace_period = 0; @@ -360,7 +370,7 @@ mod tests { #[test] fn proposal_grace_period_not_expired() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); proposal.approved_at = Some(1); proposal.parameters.grace_period = 3; @@ -370,7 +380,7 @@ mod tests { #[test] fn proposal_grace_period_not_expired_because_of_not_approved_proposal() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); proposal.approved_at = None; proposal.parameters.grace_period = 3; @@ -380,7 +390,7 @@ mod tests { #[test] fn define_proposal_decision_status_returns_expired() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); let now = 5; proposal.created_at = 1; proposal.parameters.voting_period = 3; @@ -407,7 +417,7 @@ mod tests { #[test] fn define_proposal_decision_status_returns_approved() { let now = 2; - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); proposal.created_at = 1; proposal.parameters.voting_period = 3; proposal.parameters.approval_quorum_percentage = 60; @@ -432,7 +442,7 @@ mod tests { #[test] fn define_proposal_decision_status_returns_rejected() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); let now = 2; proposal.created_at = 1; @@ -460,7 +470,7 @@ mod tests { #[test] fn define_proposal_decision_status_returns_none() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); let now = 2; proposal.created_at = 1; diff --git a/modules/proposals/engine/src/types/stakes.rs b/modules/proposals/engine/src/types/stakes.rs new file mode 100644 index 0000000000..6d1c2d06b8 --- /dev/null +++ b/modules/proposals/engine/src/types/stakes.rs @@ -0,0 +1,89 @@ +use super::{BalanceOf, CurrencyOf, NegativeImbalance}; +use crate::Trait; +use rstd::marker::PhantomData; +use srml_support::traits::{Currency, ExistenceRequirement, WithdrawReasons}; + +/// Returns registered stake handler. This is scaffolds for the mocking of the stake module. +pub trait StakeHandlerProvider { + /// Returns stake logic handler + fn stakes() -> Box>; +} + +/// Default implementation of the stake module logic provider. Returns actual implementation +/// dependent on the stake module. +pub struct DefaultStakeHandlerProvider; +impl StakeHandlerProvider for DefaultStakeHandlerProvider { + /// Returns stake logic handler + fn stakes() -> Box> { + Box::new(DefaultStakeHandler { + marker: PhantomData::::default(), + }) + } +} + +/// Stake logic handler. +pub trait StakeHandler { + /// Creates a stake using stake balance and source account. + /// Returns created stake id or an error. + fn create_stake( + &self, + stake_balance: BalanceOf, + source_account_id: T::AccountId, + ) -> Result; +} + +/// Default implementation of the stake logic. Uses actual stake module. +/// 'marker' responsible for the 'Trait' binding. +pub struct DefaultStakeHandler { + marker: PhantomData, +} + +impl StakeHandler for DefaultStakeHandler { + /// Creates a stake using stake balance and source account. + /// Returns created stake id or an error. + fn create_stake( + &self, + stake_balance: BalanceOf, + source_account_id: T::AccountId, + ) -> Result { + // error conversion for the stake() operation + fn convert_stake_action_error( + err: stake::StakeActionError, + ) -> &'static str { + match err { + stake::StakeActionError::StakeNotFound => "StakeNotFound", + stake::StakeActionError::Error(e) => match e { + stake::StakingError::CannotStakeZero => "CannotStakeZero", + stake::StakingError::CannotStakeLessThanMinimumBalance => { + "CannotStakeLessThanMinimumBalance" + } + stake::StakingError::AlreadyStaked => "AlreadyStaked", + }, + } + }; + + let stake_id = stake::Module::::create_stake(); + + let stake_imbalance = Self::make_stake_imbalance(stake_balance, &source_account_id)?; + + stake::Module::::stake(&stake_id, stake_imbalance) + .map_err(convert_stake_action_error)?; + + Ok(stake_id) + } +} + +impl DefaultStakeHandler { + // Withdraw some balance from the source account and create stake imbalance + fn make_stake_imbalance( + balance: BalanceOf, + source_account_id: &T::AccountId, + ) -> Result, &'static str> { + CurrencyOf::::withdraw( + source_account_id, + balance, + WithdrawReasons::all(), + ExistenceRequirement::AllowDeath, + ) + } +} From 11270412e7f04c60e96d9b6c4390a09474b672be Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Wed, 19 Feb 2020 18:36:58 +0300 Subject: [PATCH 032/286] Change ProposalStatus type - introduce ProposalDecisionStatus - introduce ApprovedProposalStatus - introduce finalize_proposal() - remove update_proposal_status() - change tests --- modules/proposals/engine/src/lib.rs | 169 +++++++++------------ modules/proposals/engine/src/tests/mock.rs | 2 +- modules/proposals/engine/src/tests/mod.rs | 60 +++++--- modules/proposals/engine/src/types/mod.rs | 104 +++++++------ 4 files changed, 160 insertions(+), 175 deletions(-) diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index 45bda4d046..2971a5a6af 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -14,13 +14,15 @@ #![cfg_attr(not(feature = "std"), no_std)] // Do not delete! Cannot be uncommented by default, because of Parity decl_module! issue. -#![warn(missing_docs)] +//#![warn(missing_docs)] -use types::FinalizedProposalData; pub use types::BalanceOf; +use types::FinalizedProposalData; pub use types::VotingResults; +pub use types::{ + ApprovedProposalStatus, Proposal, ProposalDecisionStatus, ProposalParameters, ProposalStatus, +}; pub use types::{DefaultStakeHandlerProvider, StakeHandler, StakeHandlerProvider}; -pub use types::{Proposal, ProposalParameters, ProposalStatus}; pub use types::{ProposalCodeDecoder, ProposalExecutable}; pub use types::{VoteKind, VotersParameters}; mod errors; @@ -37,8 +39,6 @@ use srml_support::{ }; use system::ensure_root; -// TODO: update proposal.finalized_at - update on all proposal finalization points. - // Max allowed proposal title length. Can be used if config value is not filled. const DEFAULT_TITLE_MAX_LEN: u32 = 100; // Max allowed proposal body length. Can be used if config value is not filled. @@ -86,32 +86,21 @@ decl_event!( { /// Emits on proposal creation. /// Params: - /// * Account id of a proposer. - /// * Id of a newly created proposal after it was saved in storage. + /// - Account id of a proposer. + /// - Id of a newly created proposal after it was saved in storage. ProposalCreated(ProposerId, ProposalId), - /// Emits on proposal cancellation. - /// Params: - /// * Account id of a proposer. - /// * Id of a cancelled proposal. - ProposalCanceled(ProposerId, ProposalId), - - /// Emits on proposal veto. - /// Params: - /// * Id of a vetoed proposal. - ProposalVetoed(ProposalId), - /// Emits on proposal status change. /// Params: - /// * Id of a updated proposal. - /// * New proposal status + /// - Id of a updated proposal. + /// - New proposal status ProposalStatusUpdated(ProposalId, ProposalStatus), /// Emits on voting for the proposal /// Params: - /// * Voter - an account id of a voter. - /// * Id of a proposal. - /// * Kind of vote. + /// - Voter - an account id of a voter. + /// - Id of a proposal. + /// - Kind of vote. Voted(VoterId, ProposalId, VoteKind), } ); @@ -199,8 +188,7 @@ decl_module! { // mutation - Self::update_proposal_status(proposal_id, ProposalStatus::Canceled); - Self::deposit_event(RawEvent::ProposalCanceled(proposer_id, proposal_id)); + Self::finalize_proposal(proposal_id, ProposalDecisionStatus::Canceled); } /// Veto a proposal. Must be root. @@ -214,26 +202,26 @@ decl_module! { // mutation - Self::update_proposal_status(proposal_id, ProposalStatus::Vetoed); - Self::deposit_event(RawEvent::ProposalVetoed(proposal_id)); + Self::finalize_proposal(proposal_id, ProposalDecisionStatus::Vetoed); } /// Block finalization. Perform voting period check, vote result tally, approved proposals /// grace period checks, and proposal execution. fn on_finalize(_n: T::BlockNumber) { - let executable_proposal_ids = - Self::get_approved_proposal_with_expired_grace_period_ids(); - let finalized_proposals = Self::get_finalized_proposals(); // mutation - // Check vote results + // Check vote results. Approved proposals with zero grace period will be + // transitioned to the PendingExecution status. for proposal_data in finalized_proposals { >::insert(proposal_data.proposal_id, proposal_data.proposal); - Self::update_proposal_status(proposal_data.proposal_id, proposal_data.status); + Self::finalize_proposal(proposal_data.proposal_id, proposal_data.status); } + let executable_proposal_ids = + Self::get_approved_proposal_with_expired_grace_period_ids(); + // Execute approved proposals with expired grace period for proposal_id in executable_proposal_ids { Self::execute_proposal(proposal_id); @@ -273,21 +261,13 @@ impl Module { errors::MSG_MAX_ACTIVE_PROPOSAL_NUMBER_EXCEEDED ); - // ensure 4 cases of stakes (parameters.required_stake) + // TODO: ensure 4 cases of stakes (parameters.required_stake) let next_proposal_count_value = Self::proposal_count() + 1; let new_proposal_id = next_proposal_count_value; // mutation - // let stake_id = if let Some(stake_amount) = stake_balance { - // let stake_id = T::StakeHandlerProvider::stakes().create_stake(stake_amount)?; - // - // Some(stake_id) - // } else { - // None - // }; - let stake_id = stake_balance .map(|stake_amount| { T::StakeHandlerProvider::stakes().create_stake(stake_amount, account_id) @@ -327,32 +307,6 @@ impl Module { >::block_number() } - // Executes approved proposal code - fn execute_proposal(proposal_id: T::ProposalId) { - let proposal = Self::proposals(proposal_id); - let proposal_code = Self::proposal_codes(proposal_id); - - let proposal_code_result = - T::ProposalCodeDecoder::decode_proposal(proposal.proposal_type, proposal_code); - - let new_proposal_status = match proposal_code_result { - Ok(proposal_code) => { - if let Err(error) = proposal_code.execute() { - ProposalStatus::Failed { - error: error.as_bytes().to_vec(), - } - } else { - ProposalStatus::Executed - } - } - Err(error) => ProposalStatus::Failed { - error: error.as_bytes().to_vec(), - }, - }; - - Self::update_proposal_status(proposal_id, new_proposal_status) - } - /// Enumerates through active proposals. Tally Voting results. /// Returns proposals with finalized status and id fn get_finalized_proposals() -> Vec> { @@ -381,44 +335,64 @@ impl Module { .collect() // compose output vector } - // TODO: update proposal.finalized_at - // TODO: to be refactored or removed after introducing stakes. Events should be fired on actions - // such as 'rejected' or 'approved'. - /// Updates proposal status and removes proposal id from active id set. - fn update_proposal_status(proposal_id: T::ProposalId, new_status: ProposalStatus) { - if new_status != ProposalStatus::Active { - >::remove(&proposal_id); - } - >::mutate(proposal_id, |p| p.status = new_status.clone()); + // Executes approved proposal code + fn execute_proposal(proposal_id: T::ProposalId) { + let mut proposal = Self::proposals(proposal_id); + let proposal_code = Self::proposal_codes(proposal_id); + + let proposal_code_result = + T::ProposalCodeDecoder::decode_proposal(proposal.proposal_type, proposal_code); + + let approved_proposal_status = match proposal_code_result { + Ok(proposal_code) => { + if let Err(error) = proposal_code.execute() { + ApprovedProposalStatus::ExecutionFailed { + error: error.as_bytes().to_vec(), + } + } else { + ApprovedProposalStatus::Executed + } + } + Err(error) => ApprovedProposalStatus::ExecutionFailed { + error: error.as_bytes().to_vec(), + }, + }; + + let proposal_execution_status = + ProposalStatus::Finalized(ProposalDecisionStatus::Approved(approved_proposal_status)); + + proposal.status = proposal_execution_status.clone(); + >::insert(proposal_id, proposal); Self::deposit_event(RawEvent::ProposalStatusUpdated( proposal_id, - new_status.clone(), + proposal_execution_status, )); - if new_status.is_decision_status() { - Self::decrease_active_proposal_counter(); - } + >::remove(&proposal_id); + } - match new_status { - ProposalStatus::Rejected | ProposalStatus::Expired => { - Self::reject_proposal(proposal_id) - } - ProposalStatus::Approved => Self::approve_proposal(proposal_id), - ProposalStatus::Active => {} - ProposalStatus::PendingExecution => { - let proposal = Self::proposals(proposal_id); + fn finalize_proposal(proposal_id: T::ProposalId, decision_status: ProposalDecisionStatus) { + Self::decrease_active_proposal_counter(); + >::remove(&proposal_id.clone()); - // immediate execution - // grace period from proposal parameters was set to zero - if proposal.is_grace_period_expired(Self::current_block()) { - Self::execute_proposal(proposal_id); - } - } - ProposalStatus::Executed | ProposalStatus::Failed { .. } => { - >::remove(&proposal_id); + let new_proposal_status = ProposalStatus::Finalized(decision_status.clone()); + >::mutate(proposal_id, |p| { + p.status = new_proposal_status.clone(); + p.finalized_at = Some(Self::current_block()); + }); + + Self::deposit_event(RawEvent::ProposalStatusUpdated( + proposal_id.clone(), + new_proposal_status, + )); + + match decision_status { + ProposalDecisionStatus::Rejected | ProposalDecisionStatus::Expired => { + Self::reject_proposal(proposal_id) } - ProposalStatus::Vetoed | ProposalStatus::Canceled => {} // do nothing + ProposalDecisionStatus::Approved { .. } => Self::approve_proposal(proposal_id), + ProposalDecisionStatus::Vetoed | ProposalDecisionStatus::Canceled => {} //TODO add actions after stakes } } @@ -429,7 +403,6 @@ impl Module { fn approve_proposal(proposal_id: T::ProposalId) { >::mutate(proposal_id, |p| p.approved_at = Some(Self::current_block())); >::insert(proposal_id, ()); - Self::update_proposal_status(proposal_id, ProposalStatus::PendingExecution); } /// Enumerates approved proposals and checks their grace period expiration diff --git a/modules/proposals/engine/src/tests/mock.rs b/modules/proposals/engine/src/tests/mock.rs index d942363612..b5afb1fc29 100644 --- a/modules/proposals/engine/src/tests/mock.rs +++ b/modules/proposals/engine/src/tests/mock.rs @@ -210,7 +210,7 @@ impl ProposalExecutable for DummyExecutable { pub struct FaultyExecutable; impl ProposalExecutable for FaultyExecutable { fn execute(&self) -> dispatch::Result { - Err("Failed") + Err("ExecutionFailed") } } diff --git a/modules/proposals/engine/src/tests/mod.rs b/modules/proposals/engine/src/tests/mod.rs index ed2802ecd0..22fab85015 100644 --- a/modules/proposals/engine/src/tests/mod.rs +++ b/modules/proposals/engine/src/tests/mod.rs @@ -279,7 +279,7 @@ fn proposal_execution_succeeds() { vote_generator.vote_and_assert_ok(VoteKind::Approve); vote_generator.vote_and_assert_ok(VoteKind::Approve); - run_to_block_and_finalize(2); + run_to_block_and_finalize(1); let proposal = >::get(proposal_id); @@ -290,7 +290,9 @@ fn proposal_execution_succeeds() { parameters, proposer_id: 1, created_at: 1, - status: ProposalStatus::Executed, + status: ProposalStatus::Finalized(ProposalDecisionStatus::Approved( + ApprovedProposalStatus::Executed + )), title: b"title".to_vec(), body: b"body".to_vec(), approved_at: Some(1), @@ -299,7 +301,7 @@ fn proposal_execution_succeeds() { approvals: 4, rejections: 0, }, - finalized_at: None, + finalized_at: Some(1), stake_id: None, } ); @@ -344,9 +346,11 @@ fn proposal_execution_failed() { parameters, proposer_id: 1, created_at: 1, - status: ProposalStatus::Failed { - error: "Failed".as_bytes().to_vec() - }, + status: ProposalStatus::Finalized(ProposalDecisionStatus::Approved( + ApprovedProposalStatus::ExecutionFailed { + error: "ExecutionFailed".as_bytes().to_vec() + } + )), title: b"title".to_vec(), body: b"body".to_vec(), approved_at: Some(1), @@ -355,7 +359,7 @@ fn proposal_execution_failed() { approvals: 4, rejections: 0, }, - finalized_at: None, + finalized_at: Some(1), stake_id: None, } ) @@ -423,7 +427,7 @@ fn rejected_voting_results_and_remove_proposal_id_from_active_succeeds() { } ); - assert_eq!(proposal.status, ProposalStatus::Rejected); + assert_eq!(proposal.status, ProposalStatus::Finalized(ProposalDecisionStatus::Rejected)); assert!(!>::exists(proposal_id)); }); } @@ -534,12 +538,12 @@ fn cancel_proposal_succeeds() { parameters, proposer_id: 1, created_at: 1, - status: ProposalStatus::Canceled, + status: ProposalStatus::Finalized(ProposalDecisionStatus::Canceled), title: b"title".to_vec(), body: b"body".to_vec(), approved_at: None, voting_results: VotingResults::default(), - finalized_at: None, + finalized_at: Some(1), stake_id: None, } ) @@ -610,12 +614,12 @@ fn veto_proposal_succeeds() { parameters, proposer_id: 1, created_at: 1, - status: ProposalStatus::Vetoed, + status: ProposalStatus::Finalized(ProposalDecisionStatus::Vetoed), title: b"title".to_vec(), body: b"body".to_vec(), approved_at: None, voting_results: VotingResults::default(), - finalized_at: None, + finalized_at: Some(1), stake_id: None, } ); @@ -678,8 +682,10 @@ fn veto_proposal_event_emitted() { EventFixture::assert_events(vec![ RawEvent::ProposalCreated(1, 1), - RawEvent::ProposalStatusUpdated(1, ProposalStatus::Vetoed), - RawEvent::ProposalVetoed(1), + RawEvent::ProposalStatusUpdated( + 1, + ProposalStatus::Finalized(ProposalDecisionStatus::Vetoed), + ), ]); }); } @@ -695,8 +701,10 @@ fn cancel_proposal_event_emitted() { EventFixture::assert_events(vec![ RawEvent::ProposalCreated(1, 1), - RawEvent::ProposalStatusUpdated(1, ProposalStatus::Canceled), - RawEvent::ProposalCanceled(1, 1), + RawEvent::ProposalStatusUpdated( + 1, + ProposalStatus::Finalized(ProposalDecisionStatus::Canceled), + ), ]); }); } @@ -742,7 +750,7 @@ fn create_proposal_and_expire_it() { parameters, proposer_id: 1, created_at: 1, - status: ProposalStatus::Expired, + status: ProposalStatus::Finalized(ProposalDecisionStatus::Expired), title: b"title".to_vec(), body: b"body".to_vec(), approved_at: None, @@ -751,7 +759,7 @@ fn create_proposal_and_expire_it() { approvals: 0, rejections: 0, }, - finalized_at: None, + finalized_at: Some(4), stake_id: None, } ) @@ -794,11 +802,13 @@ fn proposal_execution_postponed_because_of_grace_period() { parameters, proposer_id: 1, created_at: 1, - status: ProposalStatus::PendingExecution, + status: ProposalStatus::Finalized(ProposalDecisionStatus::Approved( + ApprovedProposalStatus::PendingExecution + )), title: b"title".to_vec(), body: b"body".to_vec(), approved_at: Some(1), - finalized_at: None, + finalized_at: Some(1), voting_results: VotingResults { abstentions: 0, approvals: 4, @@ -843,11 +853,13 @@ fn proposal_execution_succeeds_after_the_grace_period() { parameters, proposer_id: 1, created_at: 1, - status: ProposalStatus::PendingExecution, + status: ProposalStatus::Finalized(ProposalDecisionStatus::Approved( + ApprovedProposalStatus::PendingExecution, + )), title: b"title".to_vec(), body: b"body".to_vec(), approved_at: Some(1), - finalized_at: None, + finalized_at: Some(1), voting_results: VotingResults { abstentions: 0, approvals: 4, @@ -862,7 +874,9 @@ fn proposal_execution_succeeds_after_the_grace_period() { proposal = >::get(proposal_id); - expected_proposal.status = ProposalStatus::Executed; + expected_proposal.status = ProposalStatus::Finalized(ProposalDecisionStatus::Approved( + ApprovedProposalStatus::Executed, + )); assert_eq!(proposal, expected_proposal); // check internal cache for proposal_id absense diff --git a/modules/proposals/engine/src/types/mod.rs b/modules/proposals/engine/src/types/mod.rs index 797b080846..1e569c454b 100644 --- a/modules/proposals/engine/src/types/mod.rs +++ b/modules/proposals/engine/src/types/mod.rs @@ -22,49 +22,48 @@ pub enum ProposalStatus { /// A new proposal that is available for voting. Active, - /// To clear the quorum requirement, the percentage of council members with revealed votes - /// must be no less than the quorum value for the given proposal type. - Approved, + /// The proposal decision was made. + Finalized(ProposalDecisionStatus), +} +/// Status of the approved proposal. Defines execution stages. +#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive(Encode, Decode, Clone, PartialEq, Eq, Debug)] +pub enum ApprovedProposalStatus { /// A proposal was approved and grace period is in effect PendingExecution, - /// A proposal was rejected - Rejected, - - /// Not enough votes and voting period expired. - Expired, - /// Proposal was successfully executed Executed, /// Proposal was executed and failed with an error - Failed { + ExecutionFailed { /// Error message error: Vec, }, +} +/// Status for the proposal with finalized decision +#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive(Encode, Decode, Clone, PartialEq, Eq, Debug)] +pub enum ProposalDecisionStatus { /// Proposal was withdrawn by its proposer. Canceled, /// Proposal was vetoed by root. Vetoed, -} -impl ProposalStatus { - /// Defines whether proposal status is 'point of the proposal decision' (the decision about - /// this proposal was made). - pub fn is_decision_status(&self) -> bool { - match self { - ProposalStatus::Approved - | ProposalStatus::Vetoed - | ProposalStatus::Canceled - | ProposalStatus::Expired - | ProposalStatus::Rejected => true, - _ => false, - } - } + /// A proposal was rejected + Rejected, + + /// Not enough votes and voting period expired. + Expired, + + /// To clear the quorum requirement, the percentage of council members with revealed votes + /// must be no less than the quorum value for the given proposal type. + Approved(ApprovedProposalStatus), } + impl Default for ProposalStatus { fn default() -> Self { ProposalStatus::Active @@ -174,7 +173,6 @@ pub struct Proposal { /// Curring voting result for the proposal pub voting_results: VotingResults, - // TODO: update proposal.finalized_at /// Proposal finalization block number pub finalized_at: Option, @@ -207,8 +205,8 @@ where &self, total_voters_count: u32, now: BlockNumber, - ) -> Option { - let proposal_status_decision = ProposalStatusDecision { + ) -> Option { + let proposal_status_resolution = ProposalStatusResolution { proposal: self, approvals: self.voting_results.approvals, now, @@ -216,14 +214,16 @@ where total_voters_count, }; - if proposal_status_decision.is_approval_quorum_reached() - && proposal_status_decision.is_approval_threshold_reached() + if proposal_status_resolution.is_approval_quorum_reached() + && proposal_status_resolution.is_approval_threshold_reached() { - Some(ProposalStatus::Approved) - } else if proposal_status_decision.is_expired() { - Some(ProposalStatus::Expired) - } else if proposal_status_decision.is_voting_completed() { - Some(ProposalStatus::Rejected) + Some(ProposalDecisionStatus::Approved( + ApprovedProposalStatus::PendingExecution, + )) + } else if proposal_status_resolution.is_expired() { + Some(ProposalDecisionStatus::Expired) + } else if proposal_status_resolution.is_voting_completed() { + Some(ProposalDecisionStatus::Rejected) } else { None } @@ -237,7 +237,7 @@ pub trait VotersParameters { } // Calculates quorum, votes threshold, expiration status -struct ProposalStatusDecision<'a, BlockNumber, ProposerId, Balance, StakeId> { +struct ProposalStatusResolution<'a, BlockNumber, ProposerId, Balance, StakeId> { proposal: &'a Proposal, now: BlockNumber, votes_count: u32, @@ -246,7 +246,7 @@ struct ProposalStatusDecision<'a, BlockNumber, ProposerId, Balance, StakeId> { } impl<'a, BlockNumber, ProposerId, Balance, StakeId> - ProposalStatusDecision<'a, BlockNumber, ProposerId, Balance, StakeId> + ProposalStatusResolution<'a, BlockNumber, ProposerId, Balance, StakeId> where BlockNumber: Add + PartialOrd + Copy, { @@ -318,7 +318,7 @@ pub(crate) struct FinalizedProposalData, /// Proposal finalization status - pub status: ProposalStatus, + pub status: ProposalDecisionStatus, /// Proposal finalization block number pub finalized_at: BlockNumber, @@ -411,7 +411,10 @@ mod tests { ); let expected_proposal_status = proposal.define_proposal_decision_status(5, now); - assert_eq!(expected_proposal_status, Some(ProposalStatus::Expired)); + assert_eq!( + expected_proposal_status, + Some(ProposalDecisionStatus::Expired) + ); } #[test] @@ -437,7 +440,12 @@ mod tests { ); let expected_proposal_status = proposal.define_proposal_decision_status(5, now); - assert_eq!(expected_proposal_status, Some(ProposalStatus::Approved)); + assert_eq!( + expected_proposal_status, + Some(ProposalDecisionStatus::Approved( + ApprovedProposalStatus::PendingExecution + )) + ); } #[test] @@ -465,7 +473,10 @@ mod tests { ); let expected_proposal_status = proposal.define_proposal_decision_status(4, now); - assert_eq!(expected_proposal_status, Some(ProposalStatus::Rejected)); + assert_eq!( + expected_proposal_status, + Some(ProposalDecisionStatus::Rejected) + ); } #[test] @@ -490,17 +501,4 @@ mod tests { let expected_proposal_status = proposal.define_proposal_decision_status(5, now); assert_eq!(expected_proposal_status, None); } - - #[test] - fn proposal_status_is_decision_status_check_works() { - assert!(ProposalStatus::Approved.is_decision_status()); - assert!(ProposalStatus::Rejected.is_decision_status()); - assert!(ProposalStatus::Vetoed.is_decision_status()); - assert!(ProposalStatus::Canceled.is_decision_status()); - assert!(ProposalStatus::Expired.is_decision_status()); - assert!(!(ProposalStatus::Active.is_decision_status())); - assert!(!(ProposalStatus::PendingExecution.is_decision_status())); - assert!(!(ProposalStatus::Executed.is_decision_status())); - assert!(!(ProposalStatus::Failed { error: Vec::new() }.is_decision_status())); - } } From 7c66d0ab37bc22c561cc5cddcf2ba3d82783dfb3 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Wed, 19 Feb 2020 20:10:29 +0300 Subject: [PATCH 033/286] Add stakes to the proposal --- modules/proposals/codex/src/lib.rs | 2 +- modules/proposals/codex/src/tests/mod.rs | 95 +++++++++++++++++-- modules/proposals/engine/src/errors.rs | 5 + modules/proposals/engine/src/lib.rs | 42 ++++++--- modules/proposals/engine/src/tests/mod.rs | 108 +++++++++++++++++++++- 5 files changed, 227 insertions(+), 25 deletions(-) diff --git a/modules/proposals/codex/src/lib.rs b/modules/proposals/codex/src/lib.rs index 7772da8b24..61ff3d5fa3 100644 --- a/modules/proposals/codex/src/lib.rs +++ b/modules/proposals/codex/src/lib.rs @@ -36,7 +36,7 @@ pub type BalanceOf = /// Balance alias for staking pub type NegativeImbalance = -<::Currency as Currency<::AccountId>>::NegativeImbalance; + <::Currency as Currency<::AccountId>>::NegativeImbalance; // Defines max allowed text proposal text length. Can be override in the config. const DEFAULT_TEXT_PROPOSAL_MAX_LEN: u32 = 20_000; diff --git a/modules/proposals/codex/src/tests/mod.rs b/modules/proposals/codex/src/tests/mod.rs index 3c7ed70944..345b954e2e 100644 --- a/modules/proposals/codex/src/tests/mod.rs +++ b/modules/proposals/codex/src/tests/mod.rs @@ -1,12 +1,19 @@ mod mock; -use mock::*; +use srml_support::traits::Currency; use system::RawOrigin; +use crate::{BalanceOf, Error}; +use mock::*; + #[test] fn create_text_proposal_codex_call_succeeds() { initial_test_ext().execute_with(|| { - let origin = RawOrigin::Signed(1).into(); + let account_id = 1; + let origin = RawOrigin::Signed(account_id).into(); + + let required_stake = Some(>::from(500u32)); + let _imbalance = ::Currency::deposit_creating(&account_id, 50000); assert_eq!( ProposalCodex::create_text_proposal( @@ -14,13 +21,46 @@ fn create_text_proposal_codex_call_succeeds() { b"title".to_vec(), b"body".to_vec(), b"text".to_vec(), - None, + required_stake, ), Ok(()) ); }); } +#[test] +fn create_text_proposal_codex_call_fails_with_invalid_stake() { + initial_test_ext().execute_with(|| { + assert_eq!( + ProposalCodex::create_text_proposal( + RawOrigin::Signed(1).into(), + b"title".to_vec(), + b"body".to_vec(), + b"text".to_vec(), + None, + ), + Err(Error::Other( + "Stake cannot be empty with this proposal" + )) + ); + + let invalid_stake = Some(>::from(5000u32)); + + assert_eq!( + ProposalCodex::create_text_proposal( + RawOrigin::Signed(1).into(), + b"title".to_vec(), + b"body".to_vec(), + b"text".to_vec(), + invalid_stake, + ), + Err(Error::Other( + "Stake differs from the proposal requirements" + )) + ); + }); +} + #[test] fn create_text_proposal_codex_call_fails_with_incorrect_text_size() { initial_test_ext().execute_with(|| { @@ -35,7 +75,7 @@ fn create_text_proposal_codex_call_fails_with_incorrect_text_size() { long_text, None, ), - Err(crate::Error::TextProposalSizeExceeded) + Err(Error::TextProposalSizeExceeded) ); assert_eq!( @@ -46,7 +86,7 @@ fn create_text_proposal_codex_call_fails_with_incorrect_text_size() { Vec::new(), None, ), - Err(crate::Error::TextProposalIsEmpty) + Err(Error::TextProposalIsEmpty) ); }); } @@ -81,7 +121,7 @@ fn create_upgrade_runtime_proposal_codex_call_fails_with_incorrect_wasm_size() { long_wasm, None, ), - Err(crate::Error::RuntimeProposalSizeExceeded) + Err(Error::RuntimeProposalSizeExceeded) ); assert_eq!( @@ -92,7 +132,7 @@ fn create_upgrade_runtime_proposal_codex_call_fails_with_incorrect_wasm_size() { Vec::new(), None, ), - Err(crate::Error::RuntimeProposalIsEmpty) + Err(Error::RuntimeProposalIsEmpty) ); }); } @@ -113,10 +153,47 @@ fn create_upgrade_runtime_proposal_codex_call_fails_with_insufficient_rights() { }); } +#[test] +fn create_runtime_upgrade_proposal_codex_call_fails_with_invalid_stake() { + initial_test_ext().execute_with(|| { + assert_eq!( + ProposalCodex::create_runtime_upgrade_proposal( + RawOrigin::Signed(1).into(), + b"title".to_vec(), + b"body".to_vec(), + b"wasm".to_vec(), + None, + ), + Err(Error::Other( + "Stake cannot be empty with this proposal" + )) + ); + + let invalid_stake = Some(>::from(500u32)); + + assert_eq!( + ProposalCodex::create_runtime_upgrade_proposal( + RawOrigin::Signed(1).into(), + b"title".to_vec(), + b"body".to_vec(), + b"wasm".to_vec(), + invalid_stake, + ), + Err(Error::Other( + "Stake differs from the proposal requirements" + )) + ); + }); +} + #[test] fn create_runtime_upgrade_proposal_codex_call_succeeds() { initial_test_ext().execute_with(|| { - let origin = RawOrigin::Signed(1).into(); + let account_id = 1; + let origin = RawOrigin::Signed(account_id).into(); + + let required_stake = Some(>::from(50000u32)); + let _imbalance = ::Currency::deposit_creating(&account_id, 50000); assert_eq!( ProposalCodex::create_runtime_upgrade_proposal( @@ -124,7 +201,7 @@ fn create_runtime_upgrade_proposal_codex_call_succeeds() { b"title".to_vec(), b"body".to_vec(), b"wasm".to_vec(), - None, + required_stake, ), Ok(()) ); diff --git a/modules/proposals/engine/src/errors.rs b/modules/proposals/engine/src/errors.rs index 5d94fa46c9..be784c5e4d 100644 --- a/modules/proposals/engine/src/errors.rs +++ b/modules/proposals/engine/src/errors.rs @@ -7,6 +7,11 @@ pub const MSG_PROPOSAL_FINALIZED: &str = "Proposal is finalized already"; pub const MSG_YOU_ALREADY_VOTED: &str = "You have already voted on this proposal"; pub const MSG_YOU_DONT_OWN_THIS_PROPOSAL: &str = "You do not own this proposal"; pub const MSG_MAX_ACTIVE_PROPOSAL_NUMBER_EXCEEDED: &str = "Max active proposals number exceeded"; + +pub const MSG_STAKE_IS_EMPTY: &str = "Stake cannot be empty with this proposal"; +pub const MSG_STAKE_SHOULD_BE_EMPTY: &str = "Stake should be empty for this proposal"; +pub const MSG_STAKE_DIFFERS_FROM_REQUIRED: &str = "Stake differs from the proposal requirements"; + //pub const MSG_STAKE_IS_GREATER_THAN_BALANCE: &str = "Balance is too low to be staked"; //pub const MSG_ONLY_MEMBERS_CAN_PROPOSE: &str = "Only members can make a proposal"; diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index 2971a5a6af..a9d1e3238a 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -261,13 +261,30 @@ impl Module { errors::MSG_MAX_ACTIVE_PROPOSAL_NUMBER_EXCEEDED ); - // TODO: ensure 4 cases of stakes (parameters.required_stake) + // check stake parameters + if let Some(required_stake) = parameters.required_stake { + if let Some(staked_balance) = stake_balance { + ensure!( + required_stake == staked_balance, + errors::MSG_STAKE_DIFFERS_FROM_REQUIRED + ); + } else { + return Err(errors::MSG_STAKE_IS_EMPTY); + } + } - let next_proposal_count_value = Self::proposal_count() + 1; - let new_proposal_id = next_proposal_count_value; + if stake_balance.is_some() && parameters.required_stake.is_none() { + return Err(errors::MSG_STAKE_SHOULD_BE_EMPTY); + } + // checks passed // mutation + let next_proposal_count_value = Self::proposal_count() + 1; + let new_proposal_id = next_proposal_count_value; + + // Check stake_balance for value and create stake if value exists, else take None + // If create_stake() returns error - return error from extrinsic let stake_id = stake_balance .map(|stake_amount| { T::StakeHandlerProvider::stakes().create_stake(stake_amount, account_id) @@ -321,16 +338,13 @@ impl Module { Self::current_block(), ); - if let Some(status) = decision_status { - Some(FinalizedProposalData { - proposal_id, - proposal, - status, - finalized_at: Self::current_block(), - }) - } else { - None - } + // map to FinalizedProposalData or None + decision_status.map(|status| FinalizedProposalData { + proposal_id, + proposal, + status, + finalized_at: Self::current_block(), + }) }) .collect() // compose output vector } @@ -383,7 +397,7 @@ impl Module { }); Self::deposit_event(RawEvent::ProposalStatusUpdated( - proposal_id.clone(), + proposal_id, new_proposal_status, )); diff --git a/modules/proposals/engine/src/tests/mod.rs b/modules/proposals/engine/src/tests/mod.rs index 22fab85015..cd683de21c 100644 --- a/modules/proposals/engine/src/tests/mod.rs +++ b/modules/proposals/engine/src/tests/mod.rs @@ -9,6 +9,9 @@ use srml_support::{dispatch, StorageMap, StorageValue}; use system::RawOrigin; use system::{EventRecord, Phase}; +use srml_support::traits::Currency; + +#[derive(Clone)] struct DummyProposalFixture { parameters: ProposalParameters, origin: RawOrigin, @@ -427,7 +430,10 @@ fn rejected_voting_results_and_remove_proposal_id_from_active_succeeds() { } ); - assert_eq!(proposal.status, ProposalStatus::Finalized(ProposalDecisionStatus::Rejected)); + assert_eq!( + proposal.status, + ProposalStatus::Finalized(ProposalDecisionStatus::Rejected) + ); assert!(!>::exists(proposal_id)); }); } @@ -933,3 +939,103 @@ fn voting_internal_cache_exists_after_proposal_finalization() { )); }); } + + +#[test] +fn create_dummy_proposal_succeeds_with_stake() { + initial_test_ext().execute_with(|| { + let account_id = 1; + + let parameters = ProposalParameters { + voting_period: 3, + approval_quorum_percentage: 50, + approval_threshold_percentage: 60, + grace_period: 5, + required_stake: Some(200), + }; + let dummy_proposal = DummyProposalFixture::default() + .with_parameters(parameters) + .with_origin(RawOrigin::Signed(account_id)) + .with_stake(200); + + let _imbalance = ::Currency::deposit_creating(&account_id, 500); + + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); + + let proposal = >::get(proposal_id); + + assert_eq!( + proposal, + Proposal { + proposal_type: 1, + parameters, + proposer_id: 1, + created_at: 1, + status: ProposalStatus::Active, + title: b"title".to_vec(), + body: b"body".to_vec(), + approved_at: None, + voting_results: VotingResults { + abstentions: 0, + approvals: 0, + rejections: 0, + }, + finalized_at: None, + stake_id: Some(0), // valid stake_id + } + ) + }); +} + +#[test] +fn create_dummy_proposal_fail_with_stake_on_empty_account() { + initial_test_ext().execute_with(|| { + let account_id = 1; + + let parameters = ProposalParameters { + voting_period: 3, + approval_quorum_percentage: 50, + approval_threshold_percentage: 60, + grace_period: 0, + required_stake: Some(200), + }; + let dummy_proposal = DummyProposalFixture::default() + .with_parameters(parameters) + .with_origin(RawOrigin::Signed(account_id)) + .with_stake(200); + + dummy_proposal.create_proposal_and_assert(Err("too few free funds in account")); + }); +} + +#[test] +fn create_proposal_fais_with_invalid_stake_parameters() { + initial_test_ext().execute_with(|| { + let mut parameters = ProposalParameters { + voting_period: 3, + approval_quorum_percentage: 50, + approval_threshold_percentage: 60, + grace_period: 0, + required_stake: None, + }; + + let mut dummy_proposal = DummyProposalFixture::default() + .with_parameters(parameters.clone()) + .with_stake(200); + + dummy_proposal.create_proposal_and_assert(Err("Stake should be empty for this proposal")); + + parameters.required_stake = Some(200); + dummy_proposal = DummyProposalFixture::default().with_parameters(parameters.clone()); + + dummy_proposal.create_proposal_and_assert(Err("Stake cannot be empty with this proposal")); + + parameters.required_stake = Some(300); + dummy_proposal = DummyProposalFixture::default() + .with_parameters(parameters.clone()) + .with_stake(200); + + dummy_proposal + .create_proposal_and_assert(Err("Stake differs from the proposal requirements")); + }); +} From 672eca562e1b8ea1357a5b0dfeac1ddd6817f5c2 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Thu, 20 Feb 2020 12:08:25 +0300 Subject: [PATCH 034/286] Add remove_stake() function with errors mapping --- modules/proposals/engine/src/tests/mod.rs | 1 - modules/proposals/engine/src/types/stakes.rs | 71 +++++++++++++++----- 2 files changed, 54 insertions(+), 18 deletions(-) diff --git a/modules/proposals/engine/src/tests/mod.rs b/modules/proposals/engine/src/tests/mod.rs index cd683de21c..b54fb323a4 100644 --- a/modules/proposals/engine/src/tests/mod.rs +++ b/modules/proposals/engine/src/tests/mod.rs @@ -940,7 +940,6 @@ fn voting_internal_cache_exists_after_proposal_finalization() { }); } - #[test] fn create_dummy_proposal_succeeds_with_stake() { initial_test_ext().execute_with(|| { diff --git a/modules/proposals/engine/src/types/stakes.rs b/modules/proposals/engine/src/types/stakes.rs index 6d1c2d06b8..5fd43d393a 100644 --- a/modules/proposals/engine/src/types/stakes.rs +++ b/modules/proposals/engine/src/types/stakes.rs @@ -30,6 +30,9 @@ pub trait StakeHandler { stake_balance: BalanceOf, source_account_id: T::AccountId, ) -> Result; + + /// Execute unstaking and removes stake + fn remove_stake(&self, stake_id: T::StakeId) -> Result<(), &'static str>; } /// Default implementation of the stake logic. Uses actual stake module. @@ -46,31 +49,40 @@ impl StakeHandler for DefaultStakeHandler { stake_balance: BalanceOf, source_account_id: T::AccountId, ) -> Result { - // error conversion for the stake() operation - fn convert_stake_action_error( - err: stake::StakeActionError, - ) -> &'static str { - match err { - stake::StakeActionError::StakeNotFound => "StakeNotFound", - stake::StakeActionError::Error(e) => match e { - stake::StakingError::CannotStakeZero => "CannotStakeZero", - stake::StakingError::CannotStakeLessThanMinimumBalance => { - "CannotStakeLessThanMinimumBalance" - } - stake::StakingError::AlreadyStaked => "AlreadyStaked", - }, - } - }; - let stake_id = stake::Module::::create_stake(); let stake_imbalance = Self::make_stake_imbalance(stake_balance, &source_account_id)?; stake::Module::::stake(&stake_id, stake_imbalance) - .map_err(convert_stake_action_error)?; + .map_err(|err| Self::convert_stake_action_error(err, Self::convert_staking_error))?; Ok(stake_id) } + + /// Execute unstaking and removes the stake + fn remove_stake(&self, stake_id: T::StakeId) -> Result<(), &'static str> { + // error conversion for the initiate_unstaking() operation + fn convert_unstaking_error(err: stake::InitiateUnstakingError) -> &'static str { + match err { + stake::InitiateUnstakingError::UnstakingPeriodShouldBeGreaterThanZero => { + "UnstakingPeriodShouldBeGreaterThanZero" + } + stake::InitiateUnstakingError::UnstakingError(e) => match e { + stake::UnstakingError::NotStaked => "NotStaked", + stake::UnstakingError::AlreadyUnstaking => "AlreadyUnstaking", + stake::UnstakingError::CannotUnstakeWhileSlashesOngoing => { + "CannotUnstakeWhileSlashesOngoing" + } + }, + } + }; + + stake::Module::::initiate_unstaking(&stake_id, None) + .map_err(|err| Self::convert_stake_action_error(err, convert_unstaking_error))?; + + stake::Module::::remove_stake(&stake_id) + .map_err(|err| Self::convert_stake_action_error(err, Self::convert_staking_error)) + } } impl DefaultStakeHandler { @@ -86,4 +98,29 @@ impl DefaultStakeHandler { ExistenceRequirement::AllowDeath, ) } + + // error conversion for the generic StakeActionError + fn convert_stake_action_error( + err: stake::StakeActionError, + convert_exact_stake_error: F, + ) -> &'static str + where + F: Fn(E) -> &'static str, + { + match err { + stake::StakeActionError::StakeNotFound => "StakeNotFound", + stake::StakeActionError::Error(e) => convert_exact_stake_error(e), + } + } + + // error conversion for the stake() and remove_stake() operations + fn convert_staking_error(err: stake::StakingError) -> &'static str { + match err { + stake::StakingError::CannotStakeZero => "CannotStakeZero", + stake::StakingError::CannotStakeLessThanMinimumBalance => { + "CannotStakeLessThanMinimumBalance" + } + stake::StakingError::AlreadyStaked => "AlreadyStaked", + } + } } From 209012b80ca3cef789e24045211474aae6d36cf3 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Thu, 20 Feb 2020 13:14:07 +0300 Subject: [PATCH 035/286] Refactor stakes error handling. --- modules/proposals/engine/src/types/stakes.rs | 82 ++++++++++---------- 1 file changed, 43 insertions(+), 39 deletions(-) diff --git a/modules/proposals/engine/src/types/stakes.rs b/modules/proposals/engine/src/types/stakes.rs index 5fd43d393a..0421888e33 100644 --- a/modules/proposals/engine/src/types/stakes.rs +++ b/modules/proposals/engine/src/types/stakes.rs @@ -1,5 +1,6 @@ use super::{BalanceOf, CurrencyOf, NegativeImbalance}; use crate::Trait; +use rstd::convert::From; use rstd::marker::PhantomData; use srml_support::traits::{Currency, ExistenceRequirement, WithdrawReasons}; @@ -53,35 +54,18 @@ impl StakeHandler for DefaultStakeHandler { let stake_imbalance = Self::make_stake_imbalance(stake_balance, &source_account_id)?; - stake::Module::::stake(&stake_id, stake_imbalance) - .map_err(|err| Self::convert_stake_action_error(err, Self::convert_staking_error))?; + stake::Module::::stake(&stake_id, stake_imbalance).map_err(|err| WrappedError(err))?; Ok(stake_id) } /// Execute unstaking and removes the stake fn remove_stake(&self, stake_id: T::StakeId) -> Result<(), &'static str> { - // error conversion for the initiate_unstaking() operation - fn convert_unstaking_error(err: stake::InitiateUnstakingError) -> &'static str { - match err { - stake::InitiateUnstakingError::UnstakingPeriodShouldBeGreaterThanZero => { - "UnstakingPeriodShouldBeGreaterThanZero" - } - stake::InitiateUnstakingError::UnstakingError(e) => match e { - stake::UnstakingError::NotStaked => "NotStaked", - stake::UnstakingError::AlreadyUnstaking => "AlreadyUnstaking", - stake::UnstakingError::CannotUnstakeWhileSlashesOngoing => { - "CannotUnstakeWhileSlashesOngoing" - } - }, - } - }; + stake::Module::::initiate_unstaking(&stake_id, None).map_err(|err| WrappedError(err))?; - stake::Module::::initiate_unstaking(&stake_id, None) - .map_err(|err| Self::convert_stake_action_error(err, convert_unstaking_error))?; + stake::Module::::remove_stake(&stake_id).map_err(|err| WrappedError(err))?; - stake::Module::::remove_stake(&stake_id) - .map_err(|err| Self::convert_stake_action_error(err, Self::convert_staking_error)) + Ok(()) } } @@ -98,29 +82,49 @@ impl DefaultStakeHandler { ExistenceRequirement::AllowDeath, ) } +} + +// 'New type' pattern for the error +// https://doc.rust-lang.org/book/ch19-03-advanced-traits.html#using-the-newtype-pattern-to-implement-external-traits-on-external-types +struct WrappedError(E); - // error conversion for the generic StakeActionError - fn convert_stake_action_error( - err: stake::StakeActionError, - convert_exact_stake_error: F, - ) -> &'static str - where - F: Fn(E) -> &'static str, - { - match err { - stake::StakeActionError::StakeNotFound => "StakeNotFound", - stake::StakeActionError::Error(e) => convert_exact_stake_error(e), +// error conversion for the Wrapped StakeActionError with the inner InitiateUnstakingError +impl From>> for &str { + fn from(wrapper: WrappedError>) -> Self { + { + match wrapper.0 { + stake::StakeActionError::StakeNotFound => "StakeNotFound", + stake::StakeActionError::Error(err) => match err { + stake::InitiateUnstakingError::UnstakingPeriodShouldBeGreaterThanZero => { + "UnstakingPeriodShouldBeGreaterThanZero" + } + stake::InitiateUnstakingError::UnstakingError(e) => match e { + stake::UnstakingError::NotStaked => "NotStaked", + stake::UnstakingError::AlreadyUnstaking => "AlreadyUnstaking", + stake::UnstakingError::CannotUnstakeWhileSlashesOngoing => { + "CannotUnstakeWhileSlashesOngoing" + } + }, + }, + } } } +} - // error conversion for the stake() and remove_stake() operations - fn convert_staking_error(err: stake::StakingError) -> &'static str { - match err { - stake::StakingError::CannotStakeZero => "CannotStakeZero", - stake::StakingError::CannotStakeLessThanMinimumBalance => { - "CannotStakeLessThanMinimumBalance" +// error conversion for the Wrapped StakeActionError with the inner StakingError +impl From>> for &str { + fn from(wrapper: WrappedError>) -> Self { + { + match wrapper.0 { + stake::StakeActionError::StakeNotFound => "StakeNotFound", + stake::StakeActionError::Error(err) => match err { + stake::StakingError::CannotStakeZero => "CannotStakeZero", + stake::StakingError::CannotStakeLessThanMinimumBalance => { + "CannotStakeLessThanMinimumBalance" + } + stake::StakingError::AlreadyStaked => "AlreadyStaked", + }, } - stake::StakingError::AlreadyStaked => "AlreadyStaked", } } } From dfaf17eeb1d917619d68af6056d6993f219980d0 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Thu, 20 Feb 2020 16:31:51 +0300 Subject: [PATCH 036/286] Add stake removing during proposal finalization - add remove_stake() call - introduce FinalizationStatus --- modules/proposals/engine/src/lib.rs | 39 ++++++++-- modules/proposals/engine/src/tests/mod.rs | 77 ++++++++++++++------ modules/proposals/engine/src/types/mod.rs | 13 +++- modules/proposals/engine/src/types/stakes.rs | 6 +- 4 files changed, 101 insertions(+), 34 deletions(-) diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index a9d1e3238a..a72290a943 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -20,7 +20,8 @@ pub use types::BalanceOf; use types::FinalizedProposalData; pub use types::VotingResults; pub use types::{ - ApprovedProposalStatus, Proposal, ProposalDecisionStatus, ProposalParameters, ProposalStatus, + ApprovedProposalStatus, FinalizationStatus, Proposal, ProposalDecisionStatus, + ProposalParameters, ProposalStatus, }; pub use types::{DefaultStakeHandlerProvider, StakeHandler, StakeHandlerProvider}; pub use types::{ProposalCodeDecoder, ProposalExecutable}; @@ -372,8 +373,10 @@ impl Module { }, }; - let proposal_execution_status = - ProposalStatus::Finalized(ProposalDecisionStatus::Approved(approved_proposal_status)); + let proposal_execution_status = ProposalStatus::Finalized(FinalizationStatus { + proposal_status: ProposalDecisionStatus::Approved(approved_proposal_status), + finalization_error: None, + }); proposal.status = proposal_execution_status.clone(); >::insert(proposal_id, proposal); @@ -390,11 +393,33 @@ impl Module { Self::decrease_active_proposal_counter(); >::remove(&proposal_id.clone()); - let new_proposal_status = ProposalStatus::Finalized(decision_status.clone()); - >::mutate(proposal_id, |p| { - p.status = new_proposal_status.clone(); - p.finalized_at = Some(Self::current_block()); + let mut new_proposal_status = ProposalStatus::Finalized(FinalizationStatus { + proposal_status: decision_status.clone(), + finalization_error: None, }); + let mut proposal = Self::proposals(proposal_id); + proposal.finalized_at = Some(Self::current_block()); + + if let Some(stake_id) = proposal.stake_id { + let unstaking_result = T::StakeHandlerProvider::stakes().remove_stake(stake_id); + + let mut finalization_error = None; + match unstaking_result { + Ok(()) => { + proposal.stake_id = None; + } + Err(err) => { + finalization_error = Some(err.as_bytes().to_vec()); + } + }; + + new_proposal_status = ProposalStatus::Finalized(FinalizationStatus { + proposal_status: decision_status.clone(), + finalization_error, + }); + } + proposal.status = new_proposal_status.clone(); + >::insert(proposal_id, proposal); Self::deposit_event(RawEvent::ProposalStatusUpdated( proposal_id, diff --git a/modules/proposals/engine/src/tests/mod.rs b/modules/proposals/engine/src/tests/mod.rs index b54fb323a4..676cc883d7 100644 --- a/modules/proposals/engine/src/tests/mod.rs +++ b/modules/proposals/engine/src/tests/mod.rs @@ -293,9 +293,12 @@ fn proposal_execution_succeeds() { parameters, proposer_id: 1, created_at: 1, - status: ProposalStatus::Finalized(ProposalDecisionStatus::Approved( - ApprovedProposalStatus::Executed - )), + status: ProposalStatus::Finalized(FinalizationStatus { + proposal_status: ProposalDecisionStatus::Approved( + ApprovedProposalStatus::Executed + ), + finalization_error: None, + }), title: b"title".to_vec(), body: b"body".to_vec(), approved_at: Some(1), @@ -349,11 +352,14 @@ fn proposal_execution_failed() { parameters, proposer_id: 1, created_at: 1, - status: ProposalStatus::Finalized(ProposalDecisionStatus::Approved( - ApprovedProposalStatus::ExecutionFailed { - error: "ExecutionFailed".as_bytes().to_vec() - } - )), + status: ProposalStatus::Finalized(FinalizationStatus { + proposal_status: ProposalDecisionStatus::Approved( + ApprovedProposalStatus::ExecutionFailed { + error: "ExecutionFailed".as_bytes().to_vec() + } + ), + finalization_error: None, + }), title: b"title".to_vec(), body: b"body".to_vec(), approved_at: Some(1), @@ -432,7 +438,10 @@ fn rejected_voting_results_and_remove_proposal_id_from_active_succeeds() { assert_eq!( proposal.status, - ProposalStatus::Finalized(ProposalDecisionStatus::Rejected) + ProposalStatus::Finalized(FinalizationStatus { + proposal_status: ProposalDecisionStatus::Rejected, + finalization_error: None, + }), ); assert!(!>::exists(proposal_id)); }); @@ -544,7 +553,10 @@ fn cancel_proposal_succeeds() { parameters, proposer_id: 1, created_at: 1, - status: ProposalStatus::Finalized(ProposalDecisionStatus::Canceled), + status: ProposalStatus::Finalized(FinalizationStatus { + proposal_status: ProposalDecisionStatus::Canceled, + finalization_error: None, + }), title: b"title".to_vec(), body: b"body".to_vec(), approved_at: None, @@ -620,7 +632,10 @@ fn veto_proposal_succeeds() { parameters, proposer_id: 1, created_at: 1, - status: ProposalStatus::Finalized(ProposalDecisionStatus::Vetoed), + status: ProposalStatus::Finalized(FinalizationStatus { + proposal_status: ProposalDecisionStatus::Vetoed, + finalization_error: None, + }), title: b"title".to_vec(), body: b"body".to_vec(), approved_at: None, @@ -690,7 +705,10 @@ fn veto_proposal_event_emitted() { RawEvent::ProposalCreated(1, 1), RawEvent::ProposalStatusUpdated( 1, - ProposalStatus::Finalized(ProposalDecisionStatus::Vetoed), + ProposalStatus::Finalized(FinalizationStatus { + proposal_status: ProposalDecisionStatus::Vetoed, + finalization_error: None, + }), ), ]); }); @@ -709,7 +727,10 @@ fn cancel_proposal_event_emitted() { RawEvent::ProposalCreated(1, 1), RawEvent::ProposalStatusUpdated( 1, - ProposalStatus::Finalized(ProposalDecisionStatus::Canceled), + ProposalStatus::Finalized(FinalizationStatus { + proposal_status: ProposalDecisionStatus::Canceled, + finalization_error: None, + }), ), ]); }); @@ -756,7 +777,10 @@ fn create_proposal_and_expire_it() { parameters, proposer_id: 1, created_at: 1, - status: ProposalStatus::Finalized(ProposalDecisionStatus::Expired), + status: ProposalStatus::Finalized(FinalizationStatus { + proposal_status: ProposalDecisionStatus::Expired, + finalization_error: None, + }), title: b"title".to_vec(), body: b"body".to_vec(), approved_at: None, @@ -808,9 +832,12 @@ fn proposal_execution_postponed_because_of_grace_period() { parameters, proposer_id: 1, created_at: 1, - status: ProposalStatus::Finalized(ProposalDecisionStatus::Approved( - ApprovedProposalStatus::PendingExecution - )), + status: ProposalStatus::Finalized(FinalizationStatus { + proposal_status: ProposalDecisionStatus::Approved( + ApprovedProposalStatus::PendingExecution + ), + finalization_error: None, + }), title: b"title".to_vec(), body: b"body".to_vec(), approved_at: Some(1), @@ -859,9 +886,12 @@ fn proposal_execution_succeeds_after_the_grace_period() { parameters, proposer_id: 1, created_at: 1, - status: ProposalStatus::Finalized(ProposalDecisionStatus::Approved( - ApprovedProposalStatus::PendingExecution, - )), + status: ProposalStatus::Finalized(FinalizationStatus { + proposal_status: ProposalDecisionStatus::Approved( + ApprovedProposalStatus::PendingExecution, + ), + finalization_error: None, + }), title: b"title".to_vec(), body: b"body".to_vec(), approved_at: Some(1), @@ -880,9 +910,10 @@ fn proposal_execution_succeeds_after_the_grace_period() { proposal = >::get(proposal_id); - expected_proposal.status = ProposalStatus::Finalized(ProposalDecisionStatus::Approved( - ApprovedProposalStatus::Executed, - )); + expected_proposal.status = ProposalStatus::Finalized(FinalizationStatus { + proposal_status: ProposalDecisionStatus::Approved(ApprovedProposalStatus::Executed), + finalization_error: None, + }); assert_eq!(proposal, expected_proposal); // check internal cache for proposal_id absense diff --git a/modules/proposals/engine/src/types/mod.rs b/modules/proposals/engine/src/types/mod.rs index 1e569c454b..96b945ca24 100644 --- a/modules/proposals/engine/src/types/mod.rs +++ b/modules/proposals/engine/src/types/mod.rs @@ -23,7 +23,18 @@ pub enum ProposalStatus { Active, /// The proposal decision was made. - Finalized(ProposalDecisionStatus), + Finalized(FinalizationStatus), +} + +/// Final proposal status and potential error. +#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive(Encode, Decode, Clone, PartialEq, Eq, Debug)] +pub struct FinalizationStatus { + /// Final proposal status + pub proposal_status: ProposalDecisionStatus, + + /// Error occured during the proposal finalization + pub finalization_error: Option>, } /// Status of the approved proposal. Defines execution stages. diff --git a/modules/proposals/engine/src/types/stakes.rs b/modules/proposals/engine/src/types/stakes.rs index 0421888e33..7f7c7e95fb 100644 --- a/modules/proposals/engine/src/types/stakes.rs +++ b/modules/proposals/engine/src/types/stakes.rs @@ -54,16 +54,16 @@ impl StakeHandler for DefaultStakeHandler { let stake_imbalance = Self::make_stake_imbalance(stake_balance, &source_account_id)?; - stake::Module::::stake(&stake_id, stake_imbalance).map_err(|err| WrappedError(err))?; + stake::Module::::stake(&stake_id, stake_imbalance).map_err(WrappedError)?; Ok(stake_id) } /// Execute unstaking and removes the stake fn remove_stake(&self, stake_id: T::StakeId) -> Result<(), &'static str> { - stake::Module::::initiate_unstaking(&stake_id, None).map_err(|err| WrappedError(err))?; + stake::Module::::initiate_unstaking(&stake_id, None).map_err(WrappedError)?; - stake::Module::::remove_stake(&stake_id).map_err(|err| WrappedError(err))?; + stake::Module::::remove_stake(&stake_id).map_err(WrappedError)?; Ok(()) } From d9c8cb9554b5d8ed6dc7d3c626dc28f88cc894ea Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Thu, 20 Feb 2020 17:12:38 +0300 Subject: [PATCH 037/286] Add test for stakes and balances --- modules/proposals/engine/src/tests/mock.rs | 34 +++++++++- modules/proposals/engine/src/tests/mod.rs | 74 ++++++++++++++++++++++ 2 files changed, 106 insertions(+), 2 deletions(-) diff --git a/modules/proposals/engine/src/tests/mock.rs b/modules/proposals/engine/src/tests/mock.rs index b5afb1fc29..bd3e83ed5e 100644 --- a/modules/proposals/engine/src/tests/mock.rs +++ b/modules/proposals/engine/src/tests/mock.rs @@ -3,11 +3,12 @@ pub use primitives::{Blake2Hasher, H256}; pub use runtime_primitives::{ testing::{Digest, DigestItem, Header, UintAuthorityId}, - traits::{BlakeTwo256, Convert, IdentityLookup, OnFinalize}, + traits::{BlakeTwo256, Convert, IdentityLookup, OnFinalize, Zero}, weights::Weight, BuildStorage, Perbill, }; use srml_support::{impl_outer_dispatch, impl_outer_event, impl_outer_origin, parameter_types}; +use srml_support::traits::{Currency, Imbalance}; pub use system; // Workaround for https://github.com/rust-lang/rust/issues/26925 . Remove when sorted. @@ -61,11 +62,40 @@ impl balances::Trait for Test { impl stake::Trait for Test { type Currency = Balances; type StakePoolId = StakePoolId; - type StakingEventsHandler = (); + type StakingEventsHandler = BalanceRestoratorStakingEventsHandler; type StakeId = u64; type SlashId = u64; } +pub struct BalanceRestoratorStakingEventsHandler; +impl stake::StakingEventsHandler for BalanceRestoratorStakingEventsHandler { + fn unstaked( + _id: &u64, + _unstaked_amount: stake::BalanceOf, + imbalance: stake::NegativeImbalance, + ) -> stake::NegativeImbalance { + + let default_account_id = 1; + + ::Currency::resolve_creating( + &default_account_id, + imbalance, + ); + + stake::NegativeImbalance::::zero() + } + + fn slashed( + _id: &u64, + _slash_id: &u64, + _slashed_amount: stake::BalanceOf, + _remaining_stake: stake::BalanceOf, + _imbalance: stake::NegativeImbalance, + ) -> stake::NegativeImbalance { + unreachable!(); + } +} + impl crate::Trait for Test { type Event = TestEvent; diff --git a/modules/proposals/engine/src/tests/mod.rs b/modules/proposals/engine/src/tests/mod.rs index 676cc883d7..0dad167730 100644 --- a/modules/proposals/engine/src/tests/mod.rs +++ b/modules/proposals/engine/src/tests/mod.rs @@ -1069,3 +1069,77 @@ fn create_proposal_fais_with_invalid_stake_parameters() { .create_proposal_and_assert(Err("Stake differs from the proposal requirements")); }); } + +#[test] +fn finalization_proposal_and_stake_removing_with_balance_checks_succeeds() { + initial_test_ext().execute_with(|| { + let account_id = 1; + + let stake_amount = 200; + let parameters = ProposalParameters { + voting_period: 3, + approval_quorum_percentage: 50, + approval_threshold_percentage: 60, + grace_period: 5, + required_stake: Some(stake_amount), + }; + let dummy_proposal = DummyProposalFixture::default() + .with_parameters(parameters) + .with_origin(RawOrigin::Signed(account_id)) + .with_stake(stake_amount); + + let account_balance = 500; + let _imbalance = + ::Currency::deposit_creating(&account_id, account_balance); + + assert_eq!( + ::Currency::total_balance(&account_id), + account_balance + ); + + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); + assert_eq!( + ::Currency::total_balance(&account_id), + account_balance - stake_amount + ); + + let mut proposal = >::get(proposal_id); + + let mut expected_proposal = Proposal { + proposal_type: 1, + parameters, + proposer_id: 1, + created_at: 1, + status: ProposalStatus::Active, + title: b"title".to_vec(), + body: b"body".to_vec(), + approved_at: None, + voting_results: VotingResults { + abstentions: 0, + approvals: 0, + rejections: 0, + }, + finalized_at: None, + stake_id: Some(0), // valid stake_id + }; + + assert_eq!(proposal, expected_proposal); + + run_to_block_and_finalize(5); + + assert_eq!( + ::Currency::total_balance(&account_id), + account_balance + ); + proposal = >::get(proposal_id); + + expected_proposal.stake_id = None; + expected_proposal.finalized_at = Some(4); + expected_proposal.status = ProposalStatus::Finalized(FinalizationStatus { + proposal_status: ProposalDecisionStatus::Expired, + finalization_error: None, + }); + + assert_eq!(proposal, expected_proposal); + }); +} From b5fe6541e1aa4bf4529b1c784d8395689935f7ce Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Thu, 20 Feb 2020 17:57:56 +0300 Subject: [PATCH 038/286] Add stake mocks --- modules/proposals/engine/Cargo.toml | 4 + .../src/tests/mock/balance_restorator.rs | 31 +++++ .../engine/src/tests/{mock.rs => mock/mod.rs} | 127 +++--------------- .../engine/src/tests/mock/proposals.rs | 83 ++++++++++++ .../proposals/engine/src/tests/mock/stakes.rs | 66 +++++++++ modules/proposals/engine/src/types/mod.rs | 3 + modules/proposals/engine/src/types/stakes.rs | 18 ++- 7 files changed, 216 insertions(+), 116 deletions(-) create mode 100644 modules/proposals/engine/src/tests/mock/balance_restorator.rs rename modules/proposals/engine/src/tests/{mock.rs => mock/mod.rs} (52%) create mode 100644 modules/proposals/engine/src/tests/mock/proposals.rs create mode 100644 modules/proposals/engine/src/tests/mock/stakes.rs diff --git a/modules/proposals/engine/Cargo.toml b/modules/proposals/engine/Cargo.toml index ff0f9a6881..130220b780 100644 --- a/modules/proposals/engine/Cargo.toml +++ b/modules/proposals/engine/Cargo.toml @@ -84,9 +84,13 @@ git = 'https://github.com/joystream/substrate-stake-module' package = 'substrate-stake-module' rev = '0516efe9230da112bc095e28f34a3715c2e03ca8' +[dev-dependencies] +mockall = "0.6.0" + [dev-dependencies.runtime-io] default_features = false git = 'https://github.com/paritytech/substrate.git' package = 'sr-io' rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' + diff --git a/modules/proposals/engine/src/tests/mock/balance_restorator.rs b/modules/proposals/engine/src/tests/mock/balance_restorator.rs new file mode 100644 index 0000000000..5249f51dbc --- /dev/null +++ b/modules/proposals/engine/src/tests/mock/balance_restorator.rs @@ -0,0 +1,31 @@ +#![cfg(test)] + +pub use runtime_primitives::traits::Zero; +use srml_support::traits::{Currency, Imbalance}; + +use super::*; + +pub struct BalanceRestoratorStakingEventsHandler; +impl stake::StakingEventsHandler for BalanceRestoratorStakingEventsHandler { + fn unstaked( + _id: &u64, + _unstaked_amount: stake::BalanceOf, + imbalance: stake::NegativeImbalance, + ) -> stake::NegativeImbalance { + let default_account_id = 1; + + ::Currency::resolve_creating(&default_account_id, imbalance); + + stake::NegativeImbalance::::zero() + } + + fn slashed( + _id: &u64, + _slash_id: &u64, + _slashed_amount: stake::BalanceOf, + _remaining_stake: stake::BalanceOf, + _imbalance: stake::NegativeImbalance, + ) -> stake::NegativeImbalance { + unreachable!(); + } +} diff --git a/modules/proposals/engine/src/tests/mock.rs b/modules/proposals/engine/src/tests/mock/mod.rs similarity index 52% rename from modules/proposals/engine/src/tests/mock.rs rename to modules/proposals/engine/src/tests/mock/mod.rs index bd3e83ed5e..b01b2fca62 100644 --- a/modules/proposals/engine/src/tests/mock.rs +++ b/modules/proposals/engine/src/tests/mock/mod.rs @@ -8,9 +8,16 @@ pub use runtime_primitives::{ BuildStorage, Perbill, }; use srml_support::{impl_outer_dispatch, impl_outer_event, impl_outer_origin, parameter_types}; -use srml_support::traits::{Currency, Imbalance}; pub use system; +mod balance_restorator; +mod proposals; +mod stakes; + +use balance_restorator::*; +pub use proposals::*; +use stakes::*; + // Workaround for https://github.com/rust-lang/rust/issues/26925 . Remove when sorted. #[derive(Clone, PartialEq, Eq, Debug)] pub struct Test; @@ -67,35 +74,6 @@ impl stake::Trait for Test { type SlashId = u64; } -pub struct BalanceRestoratorStakingEventsHandler; -impl stake::StakingEventsHandler for BalanceRestoratorStakingEventsHandler { - fn unstaked( - _id: &u64, - _unstaked_amount: stake::BalanceOf, - imbalance: stake::NegativeImbalance, - ) -> stake::NegativeImbalance { - - let default_account_id = 1; - - ::Currency::resolve_creating( - &default_account_id, - imbalance, - ); - - stake::NegativeImbalance::::zero() - } - - fn slashed( - _id: &u64, - _slash_id: &u64, - _slashed_amount: stake::BalanceOf, - _remaining_stake: stake::BalanceOf, - _imbalance: stake::NegativeImbalance, - ) -> stake::NegativeImbalance { - unreachable!(); - } -} - impl crate::Trait for Test { type Event = TestEvent; @@ -165,88 +143,15 @@ pub fn initial_test_ext() -> runtime_io::TestExternalities { t.into() } -pub type ProposalsEngine = crate::Module; -pub type System = system::Module; -pub type Balances = balances::Module; - -use codec::{Decode, Encode}; -use num_enum::{IntoPrimitive, TryFromPrimitive}; -use rstd::convert::TryFrom; -use rstd::prelude::*; - -use srml_support::dispatch; - -use crate::{ProposalCodeDecoder, ProposalExecutable}; - -/// Defines allowed proposals types. Integer value serves as proposal_type_id. -#[derive(Debug, Eq, PartialEq, TryFromPrimitive, IntoPrimitive)] -#[repr(u32)] -pub enum ProposalType { - /// Dummy(Text) proposal type - Dummy = 1, - - /// Testing proposal type for faults - Faulty = 10001, -} - -impl ProposalType { - fn compose_executable( - &self, - proposal_data: Vec, - ) -> Result, &'static str> { - match self { - ProposalType::Dummy => DummyExecutable::decode(&mut &proposal_data[..]) - .map_err(|err| err.what()) - .map(|obj| Box::new(obj) as Box), - ProposalType::Faulty => FaultyExecutable::decode(&mut &proposal_data[..]) - .map_err(|err| err.what()) - .map(|obj| Box::new(obj) as Box), - } - } -} - -impl ProposalCodeDecoder for ProposalType { - fn decode_proposal( - proposal_type: u32, - proposal_code: Vec, - ) -> Result, &'static str> { - Self::try_from(proposal_type) - .map_err(|_| "Unsupported proposal type")? - .compose_executable(proposal_code) - } -} +// Intercepts panic in provided function, test mock expectation and restores default behaviour +pub(crate) fn handle_mock(func: F) { + let panicked = panics(func); -/// Testing proposal type -#[derive(Encode, Decode, Clone, PartialEq, Eq, Debug, Default)] -pub struct DummyExecutable { - pub title: Vec, - pub body: Vec, -} + test_expectation_and_clear_mock(); -impl DummyExecutable { - pub fn proposal_type(&self) -> u32 { - ProposalType::Dummy.into() - } + assert!(!panicked); } -impl ProposalExecutable for DummyExecutable { - fn execute(&self) -> dispatch::Result { - Ok(()) - } -} - -/// Faulty proposal executable code wrapper. Used for failed proposal execution tests. -#[derive(Encode, Decode, Clone, PartialEq, Eq, Debug, Default)] -pub struct FaultyExecutable; -impl ProposalExecutable for FaultyExecutable { - fn execute(&self) -> dispatch::Result { - Err("ExecutionFailed") - } -} - -impl FaultyExecutable { - /// Converts faulty proposal type to proposal_type_id - pub fn proposal_type(&self) -> u32 { - ProposalType::Faulty.into() - } -} +pub type ProposalsEngine = crate::Module; +pub type System = system::Module; +pub type Balances = balances::Module; diff --git a/modules/proposals/engine/src/tests/mock/proposals.rs b/modules/proposals/engine/src/tests/mock/proposals.rs new file mode 100644 index 0000000000..92f64b4261 --- /dev/null +++ b/modules/proposals/engine/src/tests/mock/proposals.rs @@ -0,0 +1,83 @@ +use codec::{Decode, Encode}; +use num_enum::{IntoPrimitive, TryFromPrimitive}; +use rstd::convert::TryFrom; +use rstd::prelude::*; + +use srml_support::dispatch; + +use crate::{ProposalCodeDecoder, ProposalExecutable}; + +use super::*; + +/// Defines allowed proposals types. Integer value serves as proposal_type_id. +#[derive(Debug, Eq, PartialEq, TryFromPrimitive, IntoPrimitive)] +#[repr(u32)] +pub enum ProposalType { + /// Dummy(Text) proposal type + Dummy = 1, + + /// Testing proposal type for faults + Faulty = 10001, +} + +impl ProposalType { + fn compose_executable( + &self, + proposal_data: Vec, + ) -> Result, &'static str> { + match self { + ProposalType::Dummy => DummyExecutable::decode(&mut &proposal_data[..]) + .map_err(|err| err.what()) + .map(|obj| Box::new(obj) as Box), + ProposalType::Faulty => FaultyExecutable::decode(&mut &proposal_data[..]) + .map_err(|err| err.what()) + .map(|obj| Box::new(obj) as Box), + } + } +} + +impl ProposalCodeDecoder for ProposalType { + fn decode_proposal( + proposal_type: u32, + proposal_code: Vec, + ) -> Result, &'static str> { + Self::try_from(proposal_type) + .map_err(|_| "Unsupported proposal type")? + .compose_executable(proposal_code) + } +} + +/// Testing proposal type +#[derive(Encode, Decode, Clone, PartialEq, Eq, Debug, Default)] +pub struct DummyExecutable { + pub title: Vec, + pub body: Vec, +} + +impl DummyExecutable { + pub fn proposal_type(&self) -> u32 { + ProposalType::Dummy.into() + } +} + +impl ProposalExecutable for DummyExecutable { + fn execute(&self) -> dispatch::Result { + Ok(()) + } +} + +/// Faulty proposal executable code wrapper. Used for failed proposal execution tests. +#[derive(Encode, Decode, Clone, PartialEq, Eq, Debug, Default)] +pub struct FaultyExecutable; +impl ProposalExecutable for FaultyExecutable { + fn execute(&self) -> dispatch::Result { + Err("ExecutionFailed") + } +} + +impl FaultyExecutable { + /// Converts faulty proposal type to proposal_type_id + pub fn proposal_type(&self) -> u32 { + ProposalType::Faulty.into() + } +} diff --git a/modules/proposals/engine/src/tests/mock/stakes.rs b/modules/proposals/engine/src/tests/mock/stakes.rs new file mode 100644 index 0000000000..72806c0281 --- /dev/null +++ b/modules/proposals/engine/src/tests/mock/stakes.rs @@ -0,0 +1,66 @@ +#![cfg(test)] + +use rstd::marker::PhantomData; +use std::cell::RefCell; +use std::panic; +use std::rc::Rc; + +use super::Test; + +// Intercepts panic method +// Returns: whether panic occurred +pub(crate) fn panics(could_panic_func: F) -> bool { + { + let default_hook = panic::take_hook(); + panic::set_hook(Box::new(|info| { + println!("{}", info); + })); + + // intercept panic + let result = panic::catch_unwind(|| could_panic_func()); + + //restore default behaviour + panic::set_hook(default_hook); + + result.is_err() + } +} + +// Test StakeHandlerProvider implementation based on local thread static variables +pub(crate) struct TestStakeHandlerProvider; +impl crate::StakeHandlerProvider for TestStakeHandlerProvider { + /// Returns StakeHandler. Mock entry point for stake module. + fn stakes() -> Rc> { + THREAD_LOCAL_STAKE_HANDLER.with(|f| f.borrow().clone()) + } +} + +// 1. RefCell - thread_local! mutation pattern +// 2. Rc - ability to have multiple references +thread_local! { + pub static THREAD_LOCAL_STAKE_HANDLER: + RefCell>> = RefCell::new(Rc::new(crate::types::DefaultStakeHandler{marker: PhantomData::})); +} + +// Sets stake handler implementation. Mockall framework integration. +pub(crate) fn set_stake_handler_impl(mock: Rc>) { + THREAD_LOCAL_STAKE_HANDLER.with(|f| { + *f.borrow_mut() = mock.clone(); + }); +} + +// Tests mock expectation and restores default behaviour +pub(crate) fn test_expectation_and_clear_mock() { + set_stake_handler_impl(Rc::new(crate::types::DefaultStakeHandler { + marker: PhantomData::, + })); +} + +// Intercepts panic in provided function, test mock expectation and restores default behaviour +pub(crate) fn handle_mock(func: F) { + let panicked = panics(func); + + test_expectation_and_clear_mock(); + + assert!(!panicked); +} diff --git a/modules/proposals/engine/src/types/mod.rs b/modules/proposals/engine/src/types/mod.rs index 96b945ca24..63ef1e81b0 100644 --- a/modules/proposals/engine/src/types/mod.rs +++ b/modules/proposals/engine/src/types/mod.rs @@ -15,6 +15,9 @@ mod stakes; pub use stakes::{DefaultStakeHandlerProvider, StakeHandler, StakeHandlerProvider}; +#[cfg(test)] +pub(crate) use stakes::DefaultStakeHandler; + /// Current status of the proposal #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] #[derive(Encode, Decode, Clone, PartialEq, Eq, Debug)] diff --git a/modules/proposals/engine/src/types/stakes.rs b/modules/proposals/engine/src/types/stakes.rs index 7f7c7e95fb..6a7560145c 100644 --- a/modules/proposals/engine/src/types/stakes.rs +++ b/modules/proposals/engine/src/types/stakes.rs @@ -2,12 +2,19 @@ use super::{BalanceOf, CurrencyOf, NegativeImbalance}; use crate::Trait; use rstd::convert::From; use rstd::marker::PhantomData; +use rstd::rc::Rc; use srml_support::traits::{Currency, ExistenceRequirement, WithdrawReasons}; +// Mocking dependencies for testing +#[cfg(test)] +use mockall::predicate::*; +#[cfg(test)] +use mockall::*; + /// Returns registered stake handler. This is scaffolds for the mocking of the stake module. pub trait StakeHandlerProvider { /// Returns stake logic handler - fn stakes() -> Box>; + fn stakes() -> Rc>; } /// Default implementation of the stake module logic provider. Returns actual implementation @@ -15,14 +22,15 @@ pub trait StakeHandlerProvider { pub struct DefaultStakeHandlerProvider; impl StakeHandlerProvider for DefaultStakeHandlerProvider { /// Returns stake logic handler - fn stakes() -> Box> { - Box::new(DefaultStakeHandler { + fn stakes() -> Rc> { + Rc::new(DefaultStakeHandler { marker: PhantomData::::default(), }) } } /// Stake logic handler. +#[cfg_attr(test, automock)] // attributes creates mocks in tesing environment pub trait StakeHandler { /// Creates a stake using stake balance and source account. /// Returns created stake id or an error. @@ -38,8 +46,8 @@ pub trait StakeHandler { /// Default implementation of the stake logic. Uses actual stake module. /// 'marker' responsible for the 'Trait' binding. -pub struct DefaultStakeHandler { - marker: PhantomData, +pub(crate) struct DefaultStakeHandler { + pub marker: PhantomData, } impl StakeHandler for DefaultStakeHandler { From 1767f3d4456f1c8f5ec4743ff4830635c2ecb9d9 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Thu, 20 Feb 2020 18:33:30 +0300 Subject: [PATCH 039/286] Add stake mock test --- modules/proposals/engine/src/lib.rs | 3 +- .../proposals/engine/src/tests/mock/mod.rs | 14 ++----- .../proposals/engine/src/tests/mock/stakes.rs | 2 +- modules/proposals/engine/src/tests/mod.rs | 39 ++++++++++++++++++- modules/proposals/engine/src/types/mod.rs | 3 ++ 5 files changed, 47 insertions(+), 14 deletions(-) diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index a72290a943..afaf93f1d3 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -26,8 +26,9 @@ pub use types::{ pub use types::{DefaultStakeHandlerProvider, StakeHandler, StakeHandlerProvider}; pub use types::{ProposalCodeDecoder, ProposalExecutable}; pub use types::{VoteKind, VotersParameters}; + mod errors; -mod types; +pub(crate) mod types; #[cfg(test)] mod tests; diff --git a/modules/proposals/engine/src/tests/mock/mod.rs b/modules/proposals/engine/src/tests/mock/mod.rs index b01b2fca62..f274071762 100644 --- a/modules/proposals/engine/src/tests/mock/mod.rs +++ b/modules/proposals/engine/src/tests/mock/mod.rs @@ -16,7 +16,7 @@ mod stakes; use balance_restorator::*; pub use proposals::*; -use stakes::*; +pub use stakes::*; // Workaround for https://github.com/rust-lang/rust/issues/26925 . Remove when sorted. #[derive(Clone, PartialEq, Eq, Debug)] @@ -91,7 +91,8 @@ impl crate::Trait for Test { type VoterId = u64; - type StakeHandlerProvider = crate::DefaultStakeHandlerProvider; + type StakeHandlerProvider = stakes::TestStakeHandlerProvider; + // type StakeHandlerProvider = crate::DefaultStakeHandlerProvider; } impl crate::VotersParameters for () { @@ -143,15 +144,6 @@ pub fn initial_test_ext() -> runtime_io::TestExternalities { t.into() } -// Intercepts panic in provided function, test mock expectation and restores default behaviour -pub(crate) fn handle_mock(func: F) { - let panicked = panics(func); - - test_expectation_and_clear_mock(); - - assert!(!panicked); -} - pub type ProposalsEngine = crate::Module; pub type System = system::Module; pub type Balances = balances::Module; diff --git a/modules/proposals/engine/src/tests/mock/stakes.rs b/modules/proposals/engine/src/tests/mock/stakes.rs index 72806c0281..188c69c9e7 100644 --- a/modules/proposals/engine/src/tests/mock/stakes.rs +++ b/modules/proposals/engine/src/tests/mock/stakes.rs @@ -27,7 +27,7 @@ pub(crate) fn panics(could_panic_func: F) - } // Test StakeHandlerProvider implementation based on local thread static variables -pub(crate) struct TestStakeHandlerProvider; +pub struct TestStakeHandlerProvider; impl crate::StakeHandlerProvider for TestStakeHandlerProvider { /// Returns StakeHandler. Mock entry point for stake module. fn stakes() -> Rc> { diff --git a/modules/proposals/engine/src/tests/mod.rs b/modules/proposals/engine/src/tests/mod.rs index 0dad167730..7ae7c1a1f1 100644 --- a/modules/proposals/engine/src/tests/mod.rs +++ b/modules/proposals/engine/src/tests/mod.rs @@ -4,6 +4,7 @@ use crate::*; use mock::*; use codec::Encode; +use rstd::rc::Rc; use runtime_primitives::traits::{OnFinalize, OnInitialize}; use srml_support::{dispatch, StorageMap, StorageValue}; use system::RawOrigin; @@ -1071,7 +1072,7 @@ fn create_proposal_fais_with_invalid_stake_parameters() { } #[test] -fn finalization_proposal_and_stake_removing_with_balance_checks_succeeds() { +fn finalize_proposal_and_check_stake_removing_with_balance_checks_succeeds() { initial_test_ext().execute_with(|| { let account_id = 1; @@ -1143,3 +1144,39 @@ fn finalization_proposal_and_stake_removing_with_balance_checks_succeeds() { assert_eq!(proposal, expected_proposal); }); } + +#[test] +fn finalize_proposal_using_stake_mocks() { + handle_mock(|| { + initial_test_ext().execute_with(|| { + let mock = { + let mut mock = crate::types::MockStakeHandler::::new(); + mock.expect_create_stake().times(1).returning(|_, _| Ok(1)); + + mock.expect_remove_stake().times(1).returning(|_| Ok(())); + + Rc::new(mock) + }; + set_stake_handler_impl(mock.clone()); + + let account_id = 1; + + let stake_amount = 200; + let parameters = ProposalParameters { + voting_period: 3, + approval_quorum_percentage: 50, + approval_threshold_percentage: 60, + grace_period: 5, + required_stake: Some(stake_amount), + }; + let dummy_proposal = DummyProposalFixture::default() + .with_parameters(parameters) + .with_origin(RawOrigin::Signed(account_id)) + .with_stake(stake_amount); + + let _proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); + + run_to_block_and_finalize(5); + }); + }); +} diff --git a/modules/proposals/engine/src/types/mod.rs b/modules/proposals/engine/src/types/mod.rs index 63ef1e81b0..b6b2606000 100644 --- a/modules/proposals/engine/src/types/mod.rs +++ b/modules/proposals/engine/src/types/mod.rs @@ -18,6 +18,9 @@ pub use stakes::{DefaultStakeHandlerProvider, StakeHandler, StakeHandlerProvider #[cfg(test)] pub(crate) use stakes::DefaultStakeHandler; +#[cfg(test)] +pub(crate) use stakes::MockStakeHandler; + /// Current status of the proposal #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] #[derive(Encode, Decode, Clone, PartialEq, Eq, Debug)] From 8040356dbc32e5ac0f99e33aa4b78e1b34d152bf Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 21 Feb 2020 11:10:36 +0300 Subject: [PATCH 040/286] Add comments --- modules/proposals/engine/src/lib.rs | 3 +++ .../engine/src/tests/mock/balance_restorator.rs | 1 + modules/proposals/engine/src/tests/mock/mod.rs | 12 ++++++++++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index afaf93f1d3..f5ae8dfe06 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -16,6 +16,9 @@ // Do not delete! Cannot be uncommented by default, because of Parity decl_module! issue. //#![warn(missing_docs)] +//TODO: - refactor on_finalize (proposal actions) +//TODO: - add proposal status helpers + pub use types::BalanceOf; use types::FinalizedProposalData; pub use types::VotingResults; diff --git a/modules/proposals/engine/src/tests/mock/balance_restorator.rs b/modules/proposals/engine/src/tests/mock/balance_restorator.rs index 5249f51dbc..b4ea5e767b 100644 --- a/modules/proposals/engine/src/tests/mock/balance_restorator.rs +++ b/modules/proposals/engine/src/tests/mock/balance_restorator.rs @@ -5,6 +5,7 @@ use srml_support::traits::{Currency, Imbalance}; use super::*; +/// StakingEventsHandler implementation for the stake::Trait. Restores balances after the unstaking. pub struct BalanceRestoratorStakingEventsHandler; impl stake::StakingEventsHandler for BalanceRestoratorStakingEventsHandler { fn unstaked( diff --git a/modules/proposals/engine/src/tests/mock/mod.rs b/modules/proposals/engine/src/tests/mock/mod.rs index f274071762..75a4b537ac 100644 --- a/modules/proposals/engine/src/tests/mock/mod.rs +++ b/modules/proposals/engine/src/tests/mock/mod.rs @@ -1,5 +1,12 @@ -#![cfg(test)] +//! Mock runtime for the module testing. +//! +//! Submodules: +//! - stakes: contains support for mocking external 'stake' module +//! - balance_restorator: restores balances after unstaking +//! - proposals: provides types for proposal execution tests +//! +#![cfg(test)] pub use primitives::{Blake2Hasher, H256}; pub use runtime_primitives::{ testing::{Digest, DigestItem, Header, UintAuthorityId}, @@ -92,9 +99,10 @@ impl crate::Trait for Test { type VoterId = u64; type StakeHandlerProvider = stakes::TestStakeHandlerProvider; - // type StakeHandlerProvider = crate::DefaultStakeHandlerProvider; } +// If changing count is required, we can upgrade the implementation as shown here: +// https://substrate.dev/recipes/3-entrees/testing/externalities.html impl crate::VotersParameters for () { fn total_voters_count() -> u32 { 4 From b1858b6843fd7a19566f14075e5115ebb009cba3 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 21 Feb 2020 12:19:36 +0300 Subject: [PATCH 041/286] Add proposal slashing with tests --- modules/proposals/engine/src/lib.rs | 1 + modules/proposals/engine/src/tests/mod.rs | 93 ++++++++++-- modules/proposals/engine/src/types/mod.rs | 171 +++++++++++++++++++++- 3 files changed, 246 insertions(+), 19 deletions(-) diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index f5ae8dfe06..2a50885782 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -436,6 +436,7 @@ impl Module { } ProposalDecisionStatus::Approved { .. } => Self::approve_proposal(proposal_id), ProposalDecisionStatus::Vetoed | ProposalDecisionStatus::Canceled => {} //TODO add actions after stakes + ProposalDecisionStatus::Slashed => {} //TODO } } diff --git a/modules/proposals/engine/src/tests/mod.rs b/modules/proposals/engine/src/tests/mod.rs index 7ae7c1a1f1..87ac3bcdaf 100644 --- a/modules/proposals/engine/src/tests/mod.rs +++ b/modules/proposals/engine/src/tests/mod.rs @@ -35,6 +35,8 @@ impl Default for DummyProposalFixture { voting_period: 3, approval_quorum_percentage: 60, approval_threshold_percentage: 60, + slashing_quorum_percentage: 60, + slashing_threshold_percentage: 60, grace_period: 0, required_stake: None, }, @@ -268,6 +270,8 @@ fn proposal_execution_succeeds() { voting_period: 3, approval_quorum_percentage: 60, approval_threshold_percentage: 60, + slashing_quorum_percentage: 60, + slashing_threshold_percentage: 60, grace_period: 0, required_stake: None, }; @@ -307,6 +311,7 @@ fn proposal_execution_succeeds() { abstentions: 0, approvals: 4, rejections: 0, + slashes: 0, }, finalized_at: Some(1), stake_id: None, @@ -325,6 +330,8 @@ fn proposal_execution_failed() { voting_period: 3, approval_quorum_percentage: 60, approval_threshold_percentage: 60, + slashing_quorum_percentage: 60, + slashing_threshold_percentage: 60, grace_period: 0, required_stake: None, }; @@ -368,6 +375,7 @@ fn proposal_execution_failed() { abstentions: 0, approvals: 4, rejections: 0, + slashes: 0, }, finalized_at: Some(1), stake_id: None, @@ -383,6 +391,8 @@ fn voting_results_calculation_succeeds() { voting_period: 3, approval_quorum_percentage: 50, approval_threshold_percentage: 50, + slashing_quorum_percentage: 60, + slashing_threshold_percentage: 60, grace_period: 0, required_stake: None, }; @@ -405,6 +415,7 @@ fn voting_results_calculation_succeeds() { abstentions: 1, approvals: 2, rejections: 1, + slashes: 0, } ) }); @@ -434,6 +445,7 @@ fn rejected_voting_results_and_remove_proposal_id_from_active_succeeds() { abstentions: 2, approvals: 0, rejections: 2, + slashes: 0, } ); @@ -536,6 +548,8 @@ fn cancel_proposal_succeeds() { voting_period: 3, approval_quorum_percentage: 60, approval_threshold_percentage: 60, + slashing_quorum_percentage: 60, + slashing_threshold_percentage: 60, grace_period: 0, required_stake: None, }; @@ -612,6 +626,8 @@ fn veto_proposal_succeeds() { voting_period: 3, approval_quorum_percentage: 60, approval_threshold_percentage: 60, + slashing_quorum_percentage: 60, + slashing_threshold_percentage: 60, grace_period: 0, required_stake: None, }; @@ -760,6 +776,8 @@ fn create_proposal_and_expire_it() { voting_period: 3, approval_quorum_percentage: 49, approval_threshold_percentage: 60, + slashing_quorum_percentage: 60, + slashing_threshold_percentage: 60, grace_period: 0, required_stake: None, }; @@ -785,11 +803,7 @@ fn create_proposal_and_expire_it() { title: b"title".to_vec(), body: b"body".to_vec(), approved_at: None, - voting_results: VotingResults { - abstentions: 0, - approvals: 0, - rejections: 0, - }, + voting_results: VotingResults::default(), finalized_at: Some(4), stake_id: None, } @@ -804,6 +818,8 @@ fn proposal_execution_postponed_because_of_grace_period() { voting_period: 3, approval_quorum_percentage: 60, approval_threshold_percentage: 60, + slashing_quorum_percentage: 60, + slashing_threshold_percentage: 60, grace_period: 2, required_stake: None, }; @@ -847,6 +863,7 @@ fn proposal_execution_postponed_because_of_grace_period() { abstentions: 0, approvals: 4, rejections: 0, + slashes: 0, }, stake_id: None, } @@ -861,6 +878,8 @@ fn proposal_execution_succeeds_after_the_grace_period() { voting_period: 3, approval_quorum_percentage: 60, approval_threshold_percentage: 60, + slashing_quorum_percentage: 60, + slashing_threshold_percentage: 60, grace_period: 1, required_stake: None, }; @@ -875,7 +894,7 @@ fn proposal_execution_succeeds_after_the_grace_period() { run_to_block_and_finalize(1); - // check internal cache for proposal_id presense + // check internal cache for proposal_id presence assert!(>::enumerate() .find(|(x, _)| *x == proposal_id) .is_some()); @@ -901,6 +920,7 @@ fn proposal_execution_succeeds_after_the_grace_period() { abstentions: 0, approvals: 4, rejections: 0, + slashes: 0, }, stake_id: None, }; @@ -981,6 +1001,8 @@ fn create_dummy_proposal_succeeds_with_stake() { voting_period: 3, approval_quorum_percentage: 50, approval_threshold_percentage: 60, + slashing_quorum_percentage: 60, + slashing_threshold_percentage: 60, grace_period: 5, required_stake: Some(200), }; @@ -1006,11 +1028,7 @@ fn create_dummy_proposal_succeeds_with_stake() { title: b"title".to_vec(), body: b"body".to_vec(), approved_at: None, - voting_results: VotingResults { - abstentions: 0, - approvals: 0, - rejections: 0, - }, + voting_results: VotingResults::default(), finalized_at: None, stake_id: Some(0), // valid stake_id } @@ -1027,6 +1045,8 @@ fn create_dummy_proposal_fail_with_stake_on_empty_account() { voting_period: 3, approval_quorum_percentage: 50, approval_threshold_percentage: 60, + slashing_quorum_percentage: 60, + slashing_threshold_percentage: 60, grace_period: 0, required_stake: Some(200), }; @@ -1046,6 +1066,8 @@ fn create_proposal_fais_with_invalid_stake_parameters() { voting_period: 3, approval_quorum_percentage: 50, approval_threshold_percentage: 60, + slashing_quorum_percentage: 60, + slashing_threshold_percentage: 60, grace_period: 0, required_stake: None, }; @@ -1081,6 +1103,8 @@ fn finalize_proposal_and_check_stake_removing_with_balance_checks_succeeds() { voting_period: 3, approval_quorum_percentage: 50, approval_threshold_percentage: 60, + slashing_quorum_percentage: 60, + slashing_threshold_percentage: 60, grace_period: 5, required_stake: Some(stake_amount), }; @@ -1115,11 +1139,7 @@ fn finalize_proposal_and_check_stake_removing_with_balance_checks_succeeds() { title: b"title".to_vec(), body: b"body".to_vec(), approved_at: None, - voting_results: VotingResults { - abstentions: 0, - approvals: 0, - rejections: 0, - }, + voting_results: VotingResults::default(), finalized_at: None, stake_id: Some(0), // valid stake_id }; @@ -1166,6 +1186,8 @@ fn finalize_proposal_using_stake_mocks() { voting_period: 3, approval_quorum_percentage: 50, approval_threshold_percentage: 60, + slashing_quorum_percentage: 60, + slashing_threshold_percentage: 60, grace_period: 5, required_stake: Some(stake_amount), }; @@ -1180,3 +1202,42 @@ fn finalize_proposal_using_stake_mocks() { }); }); } + +#[test] +fn proposal_slashing_succeeds() { + initial_test_ext().execute_with(|| { + let dummy_proposal = DummyProposalFixture::default(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); + + let mut vote_generator = VoteGenerator::new(proposal_id); + vote_generator.vote_and_assert_ok(VoteKind::Reject); + vote_generator.vote_and_assert_ok(VoteKind::Slash); + vote_generator.vote_and_assert_ok(VoteKind::Slash); + vote_generator.vote_and_assert_ok(VoteKind::Slash); + + assert!(>::exists(proposal_id)); + + run_to_block_and_finalize(2); + + let proposal = >::get(proposal_id); + + assert_eq!( + proposal.voting_results, + VotingResults { + abstentions: 0, + approvals: 0, + rejections: 1, + slashes: 3, + } + ); + + assert_eq!( + proposal.status, + ProposalStatus::Finalized(FinalizationStatus { + proposal_status: ProposalDecisionStatus::Slashed, + finalization_error: None, + }), + ); + assert!(!>::exists(proposal_id)); + }); +} \ No newline at end of file diff --git a/modules/proposals/engine/src/types/mod.rs b/modules/proposals/engine/src/types/mod.rs index b6b2606000..61cfaf8284 100644 --- a/modules/proposals/engine/src/types/mod.rs +++ b/modules/proposals/engine/src/types/mod.rs @@ -73,6 +73,9 @@ pub enum ProposalDecisionStatus { /// A proposal was rejected Rejected, + /// A proposal was rejected ans its stake should be slashed + Slashed, + /// Not enough votes and voting period expired. Expired, @@ -98,6 +101,9 @@ pub enum VoteKind { /// Against proposal. Reject, + /// Reject proposal and slash it stake. + Slash, + /// Signals presence, but unwillingness to cast judgment on substance of vote. Abstain, } @@ -119,12 +125,18 @@ pub struct ProposalParameters { /// executed immediately. pub grace_period: BlockNumber, - /// Quorum percentage of approving voters required to pass a proposal. + /// Quorum percentage of approving voters required to pass the proposal. pub approval_quorum_percentage: u32, - /// Approval votes percentage threshold to pass the vote. + /// Approval votes percentage threshold to pass the proposal. pub approval_threshold_percentage: u32, + /// Quorum percentage of voters required to slash the proposal. + pub slashing_quorum_percentage: u32, + + /// Slashing votes percentage threshold to slash the proposal. + pub slashing_threshold_percentage: u32, + /// Proposal stake pub required_stake: Option, } @@ -141,6 +153,9 @@ pub struct VotingResults { /// 'Reject' votes counter pub rejections: u32, + + /// 'Slash' votes counter + pub slashes: u32, } impl VotingResults { @@ -150,12 +165,13 @@ impl VotingResults { VoteKind::Abstain => self.abstentions += 1, VoteKind::Approve => self.approvals += 1, VoteKind::Reject => self.rejections += 1, + VoteKind::Slash => self.slashes += 1, } } /// Calculates number of votes so far pub fn votes_number(&self) -> u32 { - self.abstentions + self.approvals + self.rejections + self.abstentions + self.approvals + self.rejections + self.slashes } } @@ -226,6 +242,7 @@ where let proposal_status_resolution = ProposalStatusResolution { proposal: self, approvals: self.voting_results.approvals, + slashes: self.voting_results.slashes, now, votes_count: self.voting_results.votes_number(), total_voters_count, @@ -237,6 +254,10 @@ where Some(ProposalDecisionStatus::Approved( ApprovedProposalStatus::PendingExecution, )) + } else if proposal_status_resolution.is_slashing_quorum_reached() + && proposal_status_resolution.is_slashing_threshold_reached() + { + Some(ProposalDecisionStatus::Slashed) } else if proposal_status_resolution.is_expired() { Some(ProposalDecisionStatus::Expired) } else if proposal_status_resolution.is_voting_completed() { @@ -260,6 +281,7 @@ struct ProposalStatusResolution<'a, BlockNumber, ProposerId, Balance, StakeId> { votes_count: u32, total_voters_count: u32, approvals: u32, + slashes: u32, } impl<'a, BlockNumber, ProposerId, Balance, StakeId> @@ -283,6 +305,17 @@ where actual_votes_fraction >= approval_quorum_fraction } + // Slashing quorum reached for the proposal. Compares predefined parameter with actual + // votes sum divided by total possible votes count. + pub fn is_slashing_quorum_reached(&self) -> bool { + let actual_votes_fraction: f32 = self.votes_count as f32 / self.total_voters_count as f32; + + let slashing_quorum_fraction = + self.proposal.parameters.slashing_quorum_percentage as f32 / 100.0; + + actual_votes_fraction >= slashing_quorum_fraction + } + // Approval threshold reached for the proposal. Compares predefined parameter with 'approve' // votes sum divided by actual votes count. pub fn is_approval_threshold_reached(&self) -> bool { @@ -294,6 +327,17 @@ where approval_votes_fraction >= required_threshold_fraction } + // Slashing threshold reached for the proposal. Compares predefined parameter with 'approve' + // votes sum divided by actual votes count. + pub fn is_slashing_threshold_reached(&self) -> bool { + let slashing_votes_fraction: f32 = self.slashes as f32 / self.votes_count as f32; + + let required_threshold_fraction = + self.proposal.parameters.slashing_threshold_percentage as f32 / 100.0; + + slashing_votes_fraction >= required_threshold_fraction + } + // All voters had voted pub fn is_voting_completed(&self) -> bool { self.votes_count == self.total_voters_count @@ -413,6 +457,8 @@ mod tests { proposal.parameters.voting_period = 3; proposal.parameters.approval_quorum_percentage = 80; proposal.parameters.approval_threshold_percentage = 40; + proposal.parameters.slashing_quorum_percentage = 50; + proposal.parameters.slashing_threshold_percentage = 50; proposal.voting_results.add_vote(VoteKind::Reject); proposal.voting_results.add_vote(VoteKind::Approve); @@ -424,6 +470,7 @@ mod tests { abstentions: 0, approvals: 2, rejections: 1, + slashes: 0, } ); @@ -441,6 +488,8 @@ mod tests { proposal.created_at = 1; proposal.parameters.voting_period = 3; proposal.parameters.approval_quorum_percentage = 60; + proposal.parameters.slashing_quorum_percentage = 50; + proposal.parameters.slashing_threshold_percentage = 50; proposal.voting_results.add_vote(VoteKind::Reject); proposal.voting_results.add_vote(VoteKind::Approve); @@ -453,6 +502,7 @@ mod tests { abstentions: 0, approvals: 3, rejections: 1, + slashes: 0, } ); @@ -474,6 +524,8 @@ mod tests { proposal.parameters.voting_period = 3; proposal.parameters.approval_quorum_percentage = 50; proposal.parameters.approval_threshold_percentage = 51; + proposal.parameters.slashing_quorum_percentage = 50; + proposal.parameters.slashing_threshold_percentage = 50; proposal.voting_results.add_vote(VoteKind::Reject); proposal.voting_results.add_vote(VoteKind::Reject); @@ -486,6 +538,7 @@ mod tests { abstentions: 1, approvals: 1, rejections: 2, + slashes: 0, } ); @@ -495,6 +548,39 @@ mod tests { Some(ProposalDecisionStatus::Rejected) ); } + #[test] + fn define_proposal_decision_status_returns_slashed() { + let mut proposal = Proposal::::default(); + let now = 2; + + proposal.created_at = 1; + proposal.parameters.voting_period = 3; + proposal.parameters.approval_quorum_percentage = 50; + proposal.parameters.approval_threshold_percentage = 50; + proposal.parameters.slashing_quorum_percentage = 50; + proposal.parameters.slashing_threshold_percentage = 50; + + proposal.voting_results.add_vote(VoteKind::Slash); + proposal.voting_results.add_vote(VoteKind::Reject); + proposal.voting_results.add_vote(VoteKind::Abstain); + proposal.voting_results.add_vote(VoteKind::Slash); + + assert_eq!( + proposal.voting_results, + VotingResults { + abstentions: 1, + approvals: 0, + rejections: 1, + slashes: 2, + } + ); + + let expected_proposal_status = proposal.define_proposal_decision_status(4, now); + assert_eq!( + expected_proposal_status, + Some(ProposalDecisionStatus::Slashed) + ); + } #[test] fn define_proposal_decision_status_returns_none() { @@ -504,6 +590,8 @@ mod tests { proposal.created_at = 1; proposal.parameters.voting_period = 3; proposal.parameters.approval_quorum_percentage = 60; + proposal.parameters.slashing_quorum_percentage = 50; + proposal.voting_results.add_vote(VoteKind::Abstain); assert_eq!( @@ -512,6 +600,7 @@ mod tests { abstentions: 1, approvals: 0, rejections: 0, + slashes: 0, } ); @@ -519,3 +608,79 @@ mod tests { assert_eq!(expected_proposal_status, None); } } + +#[test] +fn define_proposal_decision_status_returns_approved_before_slashing_before_rejection() { + let mut proposal = Proposal::::default(); + let now = 2; + + proposal.created_at = 1; + proposal.parameters.voting_period = 3; + proposal.parameters.approval_quorum_percentage = 50; + proposal.parameters.approval_threshold_percentage = 30; + proposal.parameters.slashing_quorum_percentage = 50; + proposal.parameters.slashing_threshold_percentage = 30; + + proposal.voting_results.add_vote(VoteKind::Approve); + proposal.voting_results.add_vote(VoteKind::Approve); + proposal.voting_results.add_vote(VoteKind::Reject); + proposal.voting_results.add_vote(VoteKind::Reject); + proposal.voting_results.add_vote(VoteKind::Slash); + proposal.voting_results.add_vote(VoteKind::Slash); + + assert_eq!( + proposal.voting_results, + VotingResults { + abstentions: 0, + approvals: 2, + rejections: 2, + slashes: 2, + } + ); + + let expected_proposal_status = proposal.define_proposal_decision_status(6, now); + + assert_eq!( + expected_proposal_status, + Some(ProposalDecisionStatus::Approved( + ApprovedProposalStatus::PendingExecution + )) + ); +} + +#[test] +fn define_proposal_decision_status_returns_slashed_before_rejection() { + let mut proposal = Proposal::::default(); + let now = 2; + + proposal.created_at = 1; + proposal.parameters.voting_period = 3; + proposal.parameters.approval_quorum_percentage = 50; + proposal.parameters.approval_threshold_percentage = 30; + proposal.parameters.slashing_quorum_percentage = 50; + proposal.parameters.slashing_threshold_percentage = 30; + + proposal.voting_results.add_vote(VoteKind::Abstain); + proposal.voting_results.add_vote(VoteKind::Approve); + proposal.voting_results.add_vote(VoteKind::Reject); + proposal.voting_results.add_vote(VoteKind::Reject); + proposal.voting_results.add_vote(VoteKind::Slash); + proposal.voting_results.add_vote(VoteKind::Slash); + + assert_eq!( + proposal.voting_results, + VotingResults { + abstentions: 1, + approvals: 1, + rejections: 2, + slashes: 2, + } + ); + + let expected_proposal_status = proposal.define_proposal_decision_status(6, now); + + assert_eq!( + expected_proposal_status, + Some(ProposalDecisionStatus::Slashed) + ); +} \ No newline at end of file From 1b7843d079730315112ea7766b7530b153222745 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 21 Feb 2020 12:41:02 +0300 Subject: [PATCH 042/286] =?UTF-8?q?Refactor=20create=5Fproposal()=20ensure?= =?UTF-8?q?=E2=80=99s=20and=20add=20new=20check.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - add ‘approval threshold parameters > 0’ - add ‘slashing threshold parameters > 0’ --- modules/proposals/engine/src/errors.rs | 5 +- modules/proposals/engine/src/lib.rs | 92 +++++++++++++++-------- modules/proposals/engine/src/tests/mod.rs | 2 +- modules/proposals/engine/src/types/mod.rs | 3 +- 4 files changed, 63 insertions(+), 39 deletions(-) diff --git a/modules/proposals/engine/src/errors.rs b/modules/proposals/engine/src/errors.rs index be784c5e4d..4fab05342d 100644 --- a/modules/proposals/engine/src/errors.rs +++ b/modules/proposals/engine/src/errors.rs @@ -7,13 +7,12 @@ pub const MSG_PROPOSAL_FINALIZED: &str = "Proposal is finalized already"; pub const MSG_YOU_ALREADY_VOTED: &str = "You have already voted on this proposal"; pub const MSG_YOU_DONT_OWN_THIS_PROPOSAL: &str = "You do not own this proposal"; pub const MSG_MAX_ACTIVE_PROPOSAL_NUMBER_EXCEEDED: &str = "Max active proposals number exceeded"; - pub const MSG_STAKE_IS_EMPTY: &str = "Stake cannot be empty with this proposal"; pub const MSG_STAKE_SHOULD_BE_EMPTY: &str = "Stake should be empty for this proposal"; pub const MSG_STAKE_DIFFERS_FROM_REQUIRED: &str = "Stake differs from the proposal requirements"; +pub const MSG_INVALID_PARAMETER_APPROVAL_THRESHOLD: &str = "Approval threshold cannot be zero"; +pub const MSG_INVALID_PARAMETER_SLASHING_THRESHOLD: &str = "Slashing threshold cannot be zero"; //pub const MSG_STAKE_IS_GREATER_THAN_BALANCE: &str = "Balance is too low to be staked"; - //pub const MSG_ONLY_MEMBERS_CAN_PROPOSE: &str = "Only members can make a proposal"; //pub const MSG_ONLY_COUNCILORS_CAN_VOTE: &str = "Only councilors can vote on proposals"; -//pub const MSG_PROPOSAL_STATUS_ALREADY_UPDATED: &str = "Proposal status has been updated already"; diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index 2a50885782..63e5c7a980 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -249,38 +249,12 @@ impl Module { let account_id = T::ProposalOrigin::ensure_origin(origin)?; let proposer_id = T::ProposerId::from(account_id.clone()); - ensure!(!title.is_empty(), errors::MSG_EMPTY_TITLE_PROVIDED); - ensure!( - title.len() as u32 <= Self::title_max_len(), - errors::MSG_TOO_LONG_TITLE - ); - - ensure!(!body.is_empty(), errors::MSG_EMPTY_BODY_PROVIDED); - ensure!( - body.len() as u32 <= Self::body_max_len(), - errors::MSG_TOO_LONG_BODY - ); - - ensure!( - (Self::active_proposal_count()) < Self::max_active_proposals(), - errors::MSG_MAX_ACTIVE_PROPOSAL_NUMBER_EXCEEDED - ); - - // check stake parameters - if let Some(required_stake) = parameters.required_stake { - if let Some(staked_balance) = stake_balance { - ensure!( - required_stake == staked_balance, - errors::MSG_STAKE_DIFFERS_FROM_REQUIRED - ); - } else { - return Err(errors::MSG_STAKE_IS_EMPTY); - } - } - - if stake_balance.is_some() && parameters.required_stake.is_none() { - return Err(errors::MSG_STAKE_SHOULD_BE_EMPTY); - } + Self::ensure_create_proposal_parameters_are_valid( + ¶meters, + &title, + &body, + stake_balance, + )?; // checks passed // mutation @@ -436,7 +410,7 @@ impl Module { } ProposalDecisionStatus::Approved { .. } => Self::approve_proposal(proposal_id), ProposalDecisionStatus::Vetoed | ProposalDecisionStatus::Canceled => {} //TODO add actions after stakes - ProposalDecisionStatus::Slashed => {} //TODO + ProposalDecisionStatus::Slashed => {} //TODO } } @@ -479,6 +453,58 @@ impl Module { ActiveProposalCount::put(next_active_proposal_count_value); }; } + + fn ensure_create_proposal_parameters_are_valid( + parameters: &ProposalParameters>, + title: &[u8], + body: &[u8], + stake_balance: Option>, + ) -> dispatch::Result { + ensure!(!title.is_empty(), errors::MSG_EMPTY_TITLE_PROVIDED); + ensure!( + title.len() as u32 <= Self::title_max_len(), + errors::MSG_TOO_LONG_TITLE + ); + + ensure!(!body.is_empty(), errors::MSG_EMPTY_BODY_PROVIDED); + ensure!( + body.len() as u32 <= Self::body_max_len(), + errors::MSG_TOO_LONG_BODY + ); + + ensure!( + (Self::active_proposal_count()) < Self::max_active_proposals(), + errors::MSG_MAX_ACTIVE_PROPOSAL_NUMBER_EXCEEDED + ); + + ensure!( + parameters.approval_threshold_percentage > 0, + errors::MSG_INVALID_PARAMETER_APPROVAL_THRESHOLD + ); + + ensure!( + parameters.slashing_threshold_percentage > 0, + errors::MSG_INVALID_PARAMETER_SLASHING_THRESHOLD + ); + + // check stake parameters + if let Some(required_stake) = parameters.required_stake { + if let Some(staked_balance) = stake_balance { + ensure!( + required_stake == staked_balance, + errors::MSG_STAKE_DIFFERS_FROM_REQUIRED + ); + } else { + return Err(errors::MSG_STAKE_IS_EMPTY); + } + } + + if stake_balance.is_some() && parameters.required_stake.is_none() { + return Err(errors::MSG_STAKE_SHOULD_BE_EMPTY); + } + + Ok(()) + } } /// Simplification of the 'FinalizedProposalData' type diff --git a/modules/proposals/engine/src/tests/mod.rs b/modules/proposals/engine/src/tests/mod.rs index 87ac3bcdaf..1acf94c624 100644 --- a/modules/proposals/engine/src/tests/mod.rs +++ b/modules/proposals/engine/src/tests/mod.rs @@ -1240,4 +1240,4 @@ fn proposal_slashing_succeeds() { ); assert!(!>::exists(proposal_id)); }); -} \ No newline at end of file +} diff --git a/modules/proposals/engine/src/types/mod.rs b/modules/proposals/engine/src/types/mod.rs index 61cfaf8284..0ff168c297 100644 --- a/modules/proposals/engine/src/types/mod.rs +++ b/modules/proposals/engine/src/types/mod.rs @@ -592,7 +592,6 @@ mod tests { proposal.parameters.approval_quorum_percentage = 60; proposal.parameters.slashing_quorum_percentage = 50; - proposal.voting_results.add_vote(VoteKind::Abstain); assert_eq!( proposal.voting_results, @@ -683,4 +682,4 @@ fn define_proposal_decision_status_returns_slashed_before_rejection() { expected_proposal_status, Some(ProposalDecisionStatus::Slashed) ); -} \ No newline at end of file +} From 119f66116109febb7a312de2ee1039de421ad4eb Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 21 Feb 2020 17:38:55 +0300 Subject: [PATCH 043/286] Add slashes --- modules/proposals/codex/src/lib.rs | 4 + modules/proposals/engine/src/lib.rs | 83 +++++++++++++------ ...lance_restorator.rs => balance_manager.rs} | 16 ++-- .../proposals/engine/src/tests/mock/mod.rs | 6 +- modules/proposals/engine/src/tests/mod.rs | 18 ++-- modules/proposals/engine/src/types/stakes.rs | 38 ++++++++- 6 files changed, 122 insertions(+), 43 deletions(-) rename modules/proposals/engine/src/tests/mock/{balance_restorator.rs => balance_manager.rs} (63%) diff --git a/modules/proposals/codex/src/lib.rs b/modules/proposals/codex/src/lib.rs index 61ff3d5fa3..3cde240176 100644 --- a/modules/proposals/codex/src/lib.rs +++ b/modules/proposals/codex/src/lib.rs @@ -89,6 +89,8 @@ decl_module! { grace_period: T::BlockNumber::from(10000u32), approval_quorum_percentage: 40, approval_threshold_percentage: 51, + slashing_quorum_percentage: 80, + slashing_threshold_percentage: 80, required_stake: Some(>::from(500u32)) }; @@ -127,6 +129,8 @@ decl_module! { grace_period: T::BlockNumber::from(10000u32), approval_quorum_percentage: 80, approval_threshold_percentage: 80, + slashing_quorum_percentage: 80, + slashing_threshold_percentage: 80, required_stake: Some(>::from(50000u32)) }; diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index 63e5c7a980..06708b2782 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -38,7 +38,7 @@ mod tests; use rstd::prelude::*; -use runtime_primitives::traits::EnsureOrigin; +use runtime_primitives::traits::{EnsureOrigin, Zero}; use srml_support::{ decl_event, decl_module, decl_storage, dispatch, ensure, Parameter, StorageDoubleMap, }; @@ -50,6 +50,10 @@ const DEFAULT_TITLE_MAX_LEN: u32 = 100; const DEFAULT_BODY_MAX_LEN: u32 = 10_000; // Max simultaneous active proposals number. const MAX_ACTIVE_PROPOSALS_NUMBER: u32 = 100; +// Default proposal cancellation fee to prevent spamming. +const DEFAULT_CANCELLATION_FEE: u32 = 5; +// Default proposal rejection fee to prevent spamming. +const DEFAULT_REJECTION_FEE: u32 = 17; /// Proposals engine trait. pub trait Trait: system::Trait + timestamp::Trait + stake::Trait { @@ -144,6 +148,14 @@ decl_storage! { /// Defines max simultaneous active proposals number. Can be configured. pub MaxActiveProposals get(max_active_proposals) config(): u32 = MAX_ACTIVE_PROPOSALS_NUMBER; + + /// A fee to be slashed (burn) in case a proposer decides to cancel a proposal. + pub CancellationFee get(cancellation_fee) config(): BalanceOf = + BalanceOf::::from(DEFAULT_CANCELLATION_FEE); + + /// A fee to be slashed (burn) in case a proposal was rejected. + pub RejectionFee get(rejection_fee) config(): BalanceOf = + BalanceOf::::from(DEFAULT_REJECTION_FEE); } } @@ -378,18 +390,48 @@ impl Module { let mut proposal = Self::proposals(proposal_id); proposal.finalized_at = Some(Self::current_block()); - if let Some(stake_id) = proposal.stake_id { - let unstaking_result = T::StakeHandlerProvider::stakes().remove_stake(stake_id); + let slash_balance = match decision_status { + ProposalDecisionStatus::Rejected | ProposalDecisionStatus::Expired => { + Self::rejection_fee() + } + ProposalDecisionStatus::Approved { .. } => { + proposal.approved_at = Some(Self::current_block()); + >::insert(proposal_id, ()); + + BalanceOf::::zero() + } + ProposalDecisionStatus::Vetoed => BalanceOf::::zero(), + ProposalDecisionStatus::Canceled => Self::cancellation_fee(), + ProposalDecisionStatus::Slashed => proposal + .parameters + .required_stake + .unwrap_or(BalanceOf::::zero()), + }; + if let Some(stake_id) = proposal.stake_id { let mut finalization_error = None; - match unstaking_result { - Ok(()) => { - proposal.stake_id = None; - } - Err(err) => { + if !slash_balance.is_zero() { + let slash_result = T::StakeHandlerProvider::stakes().slash(stake_id, slash_balance); + + if let Err(err) = slash_result { + println!("{:?}", err); finalization_error = Some(err.as_bytes().to_vec()); } - }; + } + + if finalization_error.is_none() { + let unstaking_result = T::StakeHandlerProvider::stakes().remove_stake(stake_id); + + match unstaking_result { + Ok(()) => { + proposal.stake_id = None; + } + Err(err) => { + println!("{:?}", err); + finalization_error = Some(err.as_bytes().to_vec()); + } + }; + } new_proposal_status = ProposalStatus::Finalized(FinalizationStatus { proposal_status: decision_status.clone(), @@ -403,24 +445,6 @@ impl Module { proposal_id, new_proposal_status, )); - - match decision_status { - ProposalDecisionStatus::Rejected | ProposalDecisionStatus::Expired => { - Self::reject_proposal(proposal_id) - } - ProposalDecisionStatus::Approved { .. } => Self::approve_proposal(proposal_id), - ProposalDecisionStatus::Vetoed | ProposalDecisionStatus::Canceled => {} //TODO add actions after stakes - ProposalDecisionStatus::Slashed => {} //TODO - } - } - - /// Reject a proposal. The staked deposit will be returned to a proposer. - fn reject_proposal(_proposal_id: T::ProposalId) {} - - /// Approve a proposal. The staked deposit will be returned. - fn approve_proposal(proposal_id: T::ProposalId) { - >::mutate(proposal_id, |p| p.approved_at = Some(Self::current_block())); - >::insert(proposal_id, ()); } /// Enumerates approved proposals and checks their grace period expiration @@ -454,6 +478,11 @@ impl Module { }; } + /// Performs all checks for the proposal creation: + /// - title, body lengths + /// - mac active proposal + /// - provided parameters: approval_threshold_percentage and slashing_threshold_percentage > 0 + /// - provided stake balance and parameters.required_stake are valid fn ensure_create_proposal_parameters_are_valid( parameters: &ProposalParameters>, title: &[u8], diff --git a/modules/proposals/engine/src/tests/mock/balance_restorator.rs b/modules/proposals/engine/src/tests/mock/balance_manager.rs similarity index 63% rename from modules/proposals/engine/src/tests/mock/balance_restorator.rs rename to modules/proposals/engine/src/tests/mock/balance_manager.rs index b4ea5e767b..b605a98e51 100644 --- a/modules/proposals/engine/src/tests/mock/balance_restorator.rs +++ b/modules/proposals/engine/src/tests/mock/balance_manager.rs @@ -5,9 +5,10 @@ use srml_support::traits::{Currency, Imbalance}; use super::*; -/// StakingEventsHandler implementation for the stake::Trait. Restores balances after the unstaking. -pub struct BalanceRestoratorStakingEventsHandler; -impl stake::StakingEventsHandler for BalanceRestoratorStakingEventsHandler { +/// StakingEventsHandler implementation for the stake::Trait. Restores balances after the unstaking +/// and slashes balances if necessary. +pub struct BalanceManagerStakingEventsHandler; +impl stake::StakingEventsHandler for BalanceManagerStakingEventsHandler { fn unstaked( _id: &u64, _unstaked_amount: stake::BalanceOf, @@ -23,10 +24,15 @@ impl stake::StakingEventsHandler for BalanceRestoratorStakingEventsHandler fn slashed( _id: &u64, _slash_id: &u64, - _slashed_amount: stake::BalanceOf, + slashed_amount: stake::BalanceOf, _remaining_stake: stake::BalanceOf, _imbalance: stake::NegativeImbalance, ) -> stake::NegativeImbalance { - unreachable!(); + let default_account_id = 1; + + let (remaining_imbalance, _) = + ::Currency::slash(&default_account_id, slashed_amount); + + remaining_imbalance } } diff --git a/modules/proposals/engine/src/tests/mock/mod.rs b/modules/proposals/engine/src/tests/mock/mod.rs index 75a4b537ac..344b020b93 100644 --- a/modules/proposals/engine/src/tests/mock/mod.rs +++ b/modules/proposals/engine/src/tests/mock/mod.rs @@ -17,11 +17,11 @@ pub use runtime_primitives::{ use srml_support::{impl_outer_dispatch, impl_outer_event, impl_outer_origin, parameter_types}; pub use system; -mod balance_restorator; +mod balance_manager; mod proposals; mod stakes; -use balance_restorator::*; +use balance_manager::*; pub use proposals::*; pub use stakes::*; @@ -76,7 +76,7 @@ impl balances::Trait for Test { impl stake::Trait for Test { type Currency = Balances; type StakePoolId = StakePoolId; - type StakingEventsHandler = BalanceRestoratorStakingEventsHandler; + type StakingEventsHandler = BalanceManagerStakingEventsHandler; type StakeId = u64; type SlashId = u64; } diff --git a/modules/proposals/engine/src/tests/mod.rs b/modules/proposals/engine/src/tests/mod.rs index 1acf94c624..8e9e43d7ac 100644 --- a/modules/proposals/engine/src/tests/mod.rs +++ b/modules/proposals/engine/src/tests/mod.rs @@ -1092,9 +1092,9 @@ fn create_proposal_fais_with_invalid_stake_parameters() { .create_proposal_and_assert(Err("Stake differs from the proposal requirements")); }); } - +/* TODO: restore #[test] -fn finalize_proposal_and_check_stake_removing_with_balance_checks_succeeds() { +fn finalize_expired_proposal_and_check_stake_removing_with_balance_checks_succeeds() { initial_test_ext().execute_with(|| { let account_id = 1; @@ -1148,10 +1148,6 @@ fn finalize_proposal_and_check_stake_removing_with_balance_checks_succeeds() { run_to_block_and_finalize(5); - assert_eq!( - ::Currency::total_balance(&account_id), - account_balance - ); proposal = >::get(proposal_id); expected_proposal.stake_id = None; @@ -1162,9 +1158,15 @@ fn finalize_proposal_and_check_stake_removing_with_balance_checks_succeeds() { }); assert_eq!(proposal, expected_proposal); + + let rejection_fee = >::get(); + assert_eq!( + ::Currency::total_balance(&account_id), + account_balance - rejection_fee + ); }); } - +*/ #[test] fn finalize_proposal_using_stake_mocks() { handle_mock(|| { @@ -1175,6 +1177,8 @@ fn finalize_proposal_using_stake_mocks() { mock.expect_remove_stake().times(1).returning(|_| Ok(())); + mock.expect_slash().times(1).returning(|_,_| Ok(())); + Rc::new(mock) }; set_stake_handler_impl(mock.clone()); diff --git a/modules/proposals/engine/src/types/stakes.rs b/modules/proposals/engine/src/types/stakes.rs index 6a7560145c..c2336d33b4 100644 --- a/modules/proposals/engine/src/types/stakes.rs +++ b/modules/proposals/engine/src/types/stakes.rs @@ -3,6 +3,8 @@ use crate::Trait; use rstd::convert::From; use rstd::marker::PhantomData; use rstd::rc::Rc; +use runtime_primitives::traits::{One}; +// use runtime_primitives::traits::{OnFinalize}; use srml_support::traits::{Currency, ExistenceRequirement, WithdrawReasons}; // Mocking dependencies for testing @@ -42,6 +44,9 @@ pub trait StakeHandler { /// Execute unstaking and removes stake fn remove_stake(&self, stake_id: T::StakeId) -> Result<(), &'static str>; + + /// Slash balance from the existing stake + fn slash(&self, stake_id: T::StakeId, slash_balance: BalanceOf) -> Result<(), &'static str>; } /// Default implementation of the stake logic. Uses actual stake module. @@ -67,9 +72,20 @@ impl StakeHandler for DefaultStakeHandler { Ok(stake_id) } + /// Slash balance from the existing stake + fn slash(&self, stake_id: T::StakeId, slash_balance: BalanceOf) -> Result<(), &'static str> { + let _slash_id = + stake::Module::::initiate_slashing(&stake_id, slash_balance, T::BlockNumber::one()) + .map_err(WrappedError)?; + +// stake::Module::::on_finalize(>::block_number()); + + Ok(()) + } + /// Execute unstaking and removes the stake fn remove_stake(&self, stake_id: T::StakeId) -> Result<(), &'static str> { - stake::Module::::initiate_unstaking(&stake_id, None).map_err(WrappedError)?; + stake::Module::::initiate_unstaking(&stake_id, Some(T::BlockNumber::one())).map_err(WrappedError)?; stake::Module::::remove_stake(&stake_id).map_err(WrappedError)?; @@ -136,3 +152,23 @@ impl From>> for &str { } } } + +// error conversion for the Wrapped StakeActionError with the inner InitiateSlashingError +impl From>> for &str { + fn from(wrapper: WrappedError>) -> Self { + { + match wrapper.0 { + stake::StakeActionError::StakeNotFound => "StakeNotFound", + stake::StakeActionError::Error(err) => match err { + stake::InitiateSlashingError::NotStaked => "NotStaked", + stake::InitiateSlashingError::SlashPeriodShouldBeGreaterThanZero => { + "SlashPeriodShouldBeGreaterThanZero" + } + stake::InitiateSlashingError::SlashAmountShouldBeGreaterThanZero => { + "SlashAmountShouldBeGreaterThanZero" + } + }, + } + } + } +} From 26acb33a7087e0959caa52b55aa1c1e8ab41f23d Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 21 Feb 2020 19:30:26 +0300 Subject: [PATCH 044/286] Refactor types and tests - add proposal status helpers - move lib and tests to helpers - add finalize_proposal_failed_using_stake_mocks() test - add proposal parameters helper --- modules/proposals/codex/src/tests/mod.rs | 16 +- modules/proposals/engine/src/lib.rs | 122 ++++--- modules/proposals/engine/src/tests/mod.rs | 337 +++++++++---------- modules/proposals/engine/src/types/mod.rs | 33 ++ modules/proposals/engine/src/types/stakes.rs | 7 +- 5 files changed, 263 insertions(+), 252 deletions(-) diff --git a/modules/proposals/codex/src/tests/mod.rs b/modules/proposals/codex/src/tests/mod.rs index 345b954e2e..a12ad4debd 100644 --- a/modules/proposals/codex/src/tests/mod.rs +++ b/modules/proposals/codex/src/tests/mod.rs @@ -39,9 +39,7 @@ fn create_text_proposal_codex_call_fails_with_invalid_stake() { b"text".to_vec(), None, ), - Err(Error::Other( - "Stake cannot be empty with this proposal" - )) + Err(Error::Other("Stake cannot be empty with this proposal")) ); let invalid_stake = Some(>::from(5000u32)); @@ -54,9 +52,7 @@ fn create_text_proposal_codex_call_fails_with_invalid_stake() { b"text".to_vec(), invalid_stake, ), - Err(Error::Other( - "Stake differs from the proposal requirements" - )) + Err(Error::Other("Stake differs from the proposal requirements")) ); }); } @@ -164,9 +160,7 @@ fn create_runtime_upgrade_proposal_codex_call_fails_with_invalid_stake() { b"wasm".to_vec(), None, ), - Err(Error::Other( - "Stake cannot be empty with this proposal" - )) + Err(Error::Other("Stake cannot be empty with this proposal")) ); let invalid_stake = Some(>::from(500u32)); @@ -179,9 +173,7 @@ fn create_runtime_upgrade_proposal_codex_call_fails_with_invalid_stake() { b"wasm".to_vec(), invalid_stake, ), - Err(Error::Other( - "Stake differs from the proposal requirements" - )) + Err(Error::Other("Stake differs from the proposal requirements")) ); }); } diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index 06708b2782..3db54298f3 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -16,9 +16,6 @@ // Do not delete! Cannot be uncommented by default, because of Parity decl_module! issue. //#![warn(missing_docs)] -//TODO: - refactor on_finalize (proposal actions) -//TODO: - add proposal status helpers - pub use types::BalanceOf; use types::FinalizedProposalData; pub use types::VotingResults; @@ -351,22 +348,15 @@ impl Module { let approved_proposal_status = match proposal_code_result { Ok(proposal_code) => { if let Err(error) = proposal_code.execute() { - ApprovedProposalStatus::ExecutionFailed { - error: error.as_bytes().to_vec(), - } + ApprovedProposalStatus::failed_execution(error) } else { ApprovedProposalStatus::Executed } } - Err(error) => ApprovedProposalStatus::ExecutionFailed { - error: error.as_bytes().to_vec(), - }, + Err(error) => ApprovedProposalStatus::failed_execution(error), }; - let proposal_execution_status = ProposalStatus::Finalized(FinalizationStatus { - proposal_status: ProposalDecisionStatus::Approved(approved_proposal_status), - finalization_error: None, - }); + let proposal_execution_status = ProposalStatus::approved(approved_proposal_status); proposal.status = proposal_execution_status.clone(); >::insert(proposal_id, proposal); @@ -379,66 +369,37 @@ impl Module { >::remove(&proposal_id); } + /// Performs all actions on proposal finalization: + /// - clean active proposal cache + /// - update proposal status fields (status, finalized_at, approved_at) + /// - add to pending execution proposal cache if approved + /// - slash and unstake proposal stake if stake exists + /// - fire an event fn finalize_proposal(proposal_id: T::ProposalId, decision_status: ProposalDecisionStatus) { Self::decrease_active_proposal_counter(); >::remove(&proposal_id.clone()); - let mut new_proposal_status = ProposalStatus::Finalized(FinalizationStatus { - proposal_status: decision_status.clone(), - finalization_error: None, - }); let mut proposal = Self::proposals(proposal_id); - proposal.finalized_at = Some(Self::current_block()); - - let slash_balance = match decision_status { - ProposalDecisionStatus::Rejected | ProposalDecisionStatus::Expired => { - Self::rejection_fee() - } - ProposalDecisionStatus::Approved { .. } => { - proposal.approved_at = Some(Self::current_block()); - >::insert(proposal_id, ()); - BalanceOf::::zero() - } - ProposalDecisionStatus::Vetoed => BalanceOf::::zero(), - ProposalDecisionStatus::Canceled => Self::cancellation_fee(), - ProposalDecisionStatus::Slashed => proposal - .parameters - .required_stake - .unwrap_or(BalanceOf::::zero()), - }; + if let ProposalDecisionStatus::Approved { .. } = decision_status { + proposal.approved_at = Some(Self::current_block()); + >::insert(proposal_id, ()); + } - if let Some(stake_id) = proposal.stake_id { - let mut finalization_error = None; - if !slash_balance.is_zero() { - let slash_result = T::StakeHandlerProvider::stakes().slash(stake_id, slash_balance); + // deal with stakes if necessary + let slash_balance = Self::calculate_slash_balance(&decision_status, &proposal.parameters); + let slash_and_unstake_result = Self::slash_and_unstake(proposal.stake_id, slash_balance); - if let Err(err) = slash_result { - println!("{:?}", err); - finalization_error = Some(err.as_bytes().to_vec()); - } - } + if slash_and_unstake_result.is_ok() { + proposal.stake_id = None; + } - if finalization_error.is_none() { - let unstaking_result = T::StakeHandlerProvider::stakes().remove_stake(stake_id); - - match unstaking_result { - Ok(()) => { - proposal.stake_id = None; - } - Err(err) => { - println!("{:?}", err); - finalization_error = Some(err.as_bytes().to_vec()); - } - }; - } + // create finalized proposal status with error if any + let new_proposal_status = + ProposalStatus::finalized_with_error(decision_status, slash_and_unstake_result.err()); - new_proposal_status = ProposalStatus::Finalized(FinalizationStatus { - proposal_status: decision_status.clone(), - finalization_error, - }); - } proposal.status = new_proposal_status.clone(); + proposal.finalized_at = Some(Self::current_block()); >::insert(proposal_id, proposal); Self::deposit_event(RawEvent::ProposalStatusUpdated( @@ -447,6 +408,43 @@ impl Module { )); } + /// Slashes the stake and perform unstake only in case of existing stake + fn slash_and_unstake( + current_stake_id: Option, + slash_balance: BalanceOf, + ) -> Result<(), &'static str> { + // only if stake exists + if let Some(stake_id) = current_stake_id { + if !slash_balance.is_zero() { + T::StakeHandlerProvider::stakes().slash(stake_id, slash_balance)?; + } + + T::StakeHandlerProvider::stakes().remove_stake(stake_id)?; + } + + Ok(()) + } + + /// Calculates required slash based on finalization ProposalDecisionStatus and proposal parameters. + fn calculate_slash_balance( + decision_status: &ProposalDecisionStatus, + proposal_parameters: &ProposalParameters>, + ) -> types::BalanceOf { + match decision_status { + ProposalDecisionStatus::Rejected | ProposalDecisionStatus::Expired => { + Self::rejection_fee() + } + ProposalDecisionStatus::Approved { .. } | ProposalDecisionStatus::Vetoed => { + BalanceOf::::zero() + } + ProposalDecisionStatus::Canceled => Self::cancellation_fee(), + ProposalDecisionStatus::Slashed => proposal_parameters + .required_stake + .clone() + .unwrap_or_else(BalanceOf::::zero), // stake if set or zero + } + } + /// Enumerates approved proposals and checks their grace period expiration fn get_approved_proposal_with_expired_grace_period_ids() -> Vec { >::enumerate() diff --git a/modules/proposals/engine/src/tests/mod.rs b/modules/proposals/engine/src/tests/mod.rs index 8e9e43d7ac..419edf9fc7 100644 --- a/modules/proposals/engine/src/tests/mod.rs +++ b/modules/proposals/engine/src/tests/mod.rs @@ -12,6 +12,49 @@ use system::{EventRecord, Phase}; use srml_support::traits::Currency; +struct ProposalParametersFixture { + parameters: ProposalParameters, +} + +impl ProposalParametersFixture { + fn with_required_stake(&self, required_stake: BalanceOf) -> Self { + ProposalParametersFixture { + parameters: ProposalParameters { + required_stake: Some(required_stake), + ..self.parameters + }, + } + } + fn with_grace_period(&self, grace_period: u64) -> Self { + ProposalParametersFixture { + parameters: ProposalParameters { + grace_period, + ..self.parameters + }, + } + } + + fn params(&self) -> ProposalParameters { + self.parameters.clone() + } +} + +impl Default for ProposalParametersFixture { + fn default() -> Self { + ProposalParametersFixture { + parameters: ProposalParameters { + voting_period: 3, + approval_quorum_percentage: 60, + approval_threshold_percentage: 60, + slashing_quorum_percentage: 60, + slashing_threshold_percentage: 60, + grace_period: 0, + required_stake: None, + }, + } + } +} + #[derive(Clone)] struct DummyProposalFixture { parameters: ProposalParameters, @@ -266,16 +309,9 @@ fn vote_fails_with_insufficient_rights() { #[test] fn proposal_execution_succeeds() { initial_test_ext().execute_with(|| { - let parameters = ProposalParameters { - voting_period: 3, - approval_quorum_percentage: 60, - approval_threshold_percentage: 60, - slashing_quorum_percentage: 60, - slashing_threshold_percentage: 60, - grace_period: 0, - required_stake: None, - }; - let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters); + let parameters_fixture = ProposalParametersFixture::default(); + let dummy_proposal = + DummyProposalFixture::default().with_parameters(parameters_fixture.params()); let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); // internal active proposal counter check @@ -295,15 +331,10 @@ fn proposal_execution_succeeds() { proposal, Proposal { proposal_type: 1, - parameters, + parameters: parameters_fixture.params(), proposer_id: 1, created_at: 1, - status: ProposalStatus::Finalized(FinalizationStatus { - proposal_status: ProposalDecisionStatus::Approved( - ApprovedProposalStatus::Executed - ), - finalization_error: None, - }), + status: ProposalStatus::approved(ApprovedProposalStatus::Executed), title: b"title".to_vec(), body: b"body".to_vec(), approved_at: Some(1), @@ -326,19 +357,11 @@ fn proposal_execution_succeeds() { #[test] fn proposal_execution_failed() { initial_test_ext().execute_with(|| { - let parameters = ProposalParameters { - voting_period: 3, - approval_quorum_percentage: 60, - approval_threshold_percentage: 60, - slashing_quorum_percentage: 60, - slashing_threshold_percentage: 60, - grace_period: 0, - required_stake: None, - }; + let parameters_fixture = ProposalParametersFixture::default(); let faulty_proposal = FaultyExecutable; let dummy_proposal = DummyProposalFixture::default() - .with_parameters(parameters) + .with_parameters(parameters_fixture.params()) .with_proposal_type_and_code(faulty_proposal.proposal_type(), faulty_proposal.encode()); let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); @@ -357,17 +380,12 @@ fn proposal_execution_failed() { proposal, Proposal { proposal_type: faulty_proposal.proposal_type(), - parameters, + parameters: parameters_fixture.params(), proposer_id: 1, created_at: 1, - status: ProposalStatus::Finalized(FinalizationStatus { - proposal_status: ProposalDecisionStatus::Approved( - ApprovedProposalStatus::ExecutionFailed { - error: "ExecutionFailed".as_bytes().to_vec() - } - ), - finalization_error: None, - }), + status: ProposalStatus::approved(ApprovedProposalStatus::failed_execution( + "ExecutionFailed" + )), title: b"title".to_vec(), body: b"body".to_vec(), approved_at: Some(1), @@ -451,10 +469,7 @@ fn rejected_voting_results_and_remove_proposal_id_from_active_succeeds() { assert_eq!( proposal.status, - ProposalStatus::Finalized(FinalizationStatus { - proposal_status: ProposalDecisionStatus::Rejected, - finalization_error: None, - }), + ProposalStatus::finalized(ProposalDecisionStatus::Rejected), ); assert!(!>::exists(proposal_id)); }); @@ -544,16 +559,9 @@ fn vote_fails_on_double_voting() { #[test] fn cancel_proposal_succeeds() { initial_test_ext().execute_with(|| { - let parameters = ProposalParameters { - voting_period: 3, - approval_quorum_percentage: 60, - approval_threshold_percentage: 60, - slashing_quorum_percentage: 60, - slashing_threshold_percentage: 60, - grace_period: 0, - required_stake: None, - }; - let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters); + let parameters_fixture = ProposalParametersFixture::default(); + let dummy_proposal = + DummyProposalFixture::default().with_parameters(parameters_fixture.params()); let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); let cancel_proposal = CancelProposalFixture::new(proposal_id); @@ -565,13 +573,10 @@ fn cancel_proposal_succeeds() { proposal, Proposal { proposal_type: 1, - parameters, + parameters: parameters_fixture.params(), proposer_id: 1, created_at: 1, - status: ProposalStatus::Finalized(FinalizationStatus { - proposal_status: ProposalDecisionStatus::Canceled, - finalization_error: None, - }), + status: ProposalStatus::finalized(ProposalDecisionStatus::Canceled), title: b"title".to_vec(), body: b"body".to_vec(), approved_at: None, @@ -622,16 +627,9 @@ fn veto_proposal_succeeds() { // internal active proposal counter check assert_eq!(::get(), 0); - let parameters = ProposalParameters { - voting_period: 3, - approval_quorum_percentage: 60, - approval_threshold_percentage: 60, - slashing_quorum_percentage: 60, - slashing_threshold_percentage: 60, - grace_period: 0, - required_stake: None, - }; - let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters); + let parameters_fixture = ProposalParametersFixture::default(); + let dummy_proposal = + DummyProposalFixture::default().with_parameters(parameters_fixture.params()); let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); // internal active proposal counter check @@ -646,13 +644,10 @@ fn veto_proposal_succeeds() { proposal, Proposal { proposal_type: 1, - parameters, + parameters: parameters_fixture.params(), proposer_id: 1, created_at: 1, - status: ProposalStatus::Finalized(FinalizationStatus { - proposal_status: ProposalDecisionStatus::Vetoed, - finalization_error: None, - }), + status: ProposalStatus::finalized(ProposalDecisionStatus::Vetoed), title: b"title".to_vec(), body: b"body".to_vec(), approved_at: None, @@ -722,10 +717,7 @@ fn veto_proposal_event_emitted() { RawEvent::ProposalCreated(1, 1), RawEvent::ProposalStatusUpdated( 1, - ProposalStatus::Finalized(FinalizationStatus { - proposal_status: ProposalDecisionStatus::Vetoed, - finalization_error: None, - }), + ProposalStatus::finalized(ProposalDecisionStatus::Vetoed), ), ]); }); @@ -772,17 +764,9 @@ fn vote_proposal_event_emitted() { #[test] fn create_proposal_and_expire_it() { initial_test_ext().execute_with(|| { - let parameters = ProposalParameters { - voting_period: 3, - approval_quorum_percentage: 49, - approval_threshold_percentage: 60, - slashing_quorum_percentage: 60, - slashing_threshold_percentage: 60, - grace_period: 0, - required_stake: None, - }; - - let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters.clone()); + let parameters_fixture = ProposalParametersFixture::default(); + let dummy_proposal = + DummyProposalFixture::default().with_parameters(parameters_fixture.params()); let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); run_to_block_and_finalize(8); @@ -793,13 +777,10 @@ fn create_proposal_and_expire_it() { proposal, Proposal { proposal_type: 1, - parameters, + parameters: parameters_fixture.params(), proposer_id: 1, created_at: 1, - status: ProposalStatus::Finalized(FinalizationStatus { - proposal_status: ProposalDecisionStatus::Expired, - finalization_error: None, - }), + status: ProposalStatus::finalized(ProposalDecisionStatus::Expired), title: b"title".to_vec(), body: b"body".to_vec(), approved_at: None, @@ -814,16 +795,10 @@ fn create_proposal_and_expire_it() { #[test] fn proposal_execution_postponed_because_of_grace_period() { initial_test_ext().execute_with(|| { - let parameters = ProposalParameters { - voting_period: 3, - approval_quorum_percentage: 60, - approval_threshold_percentage: 60, - slashing_quorum_percentage: 60, - slashing_threshold_percentage: 60, - grace_period: 2, - required_stake: None, - }; - let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters); + let parameters_fixture = ProposalParametersFixture::default().with_grace_period(2); + let dummy_proposal = + DummyProposalFixture::default().with_parameters(parameters_fixture.params()); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); let mut vote_generator = VoteGenerator::new(proposal_id); @@ -846,15 +821,10 @@ fn proposal_execution_postponed_because_of_grace_period() { proposal, Proposal { proposal_type: 1, - parameters, + parameters: parameters_fixture.params(), proposer_id: 1, created_at: 1, - status: ProposalStatus::Finalized(FinalizationStatus { - proposal_status: ProposalDecisionStatus::Approved( - ApprovedProposalStatus::PendingExecution - ), - finalization_error: None, - }), + status: ProposalStatus::approved(ApprovedProposalStatus::PendingExecution), title: b"title".to_vec(), body: b"body".to_vec(), approved_at: Some(1), @@ -874,16 +844,9 @@ fn proposal_execution_postponed_because_of_grace_period() { #[test] fn proposal_execution_succeeds_after_the_grace_period() { initial_test_ext().execute_with(|| { - let parameters = ProposalParameters { - voting_period: 3, - approval_quorum_percentage: 60, - approval_threshold_percentage: 60, - slashing_quorum_percentage: 60, - slashing_threshold_percentage: 60, - grace_period: 1, - required_stake: None, - }; - let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters); + let parameters_fixture = ProposalParametersFixture::default().with_grace_period(1); + let dummy_proposal = + DummyProposalFixture::default().with_parameters(parameters_fixture.params()); let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); let mut vote_generator = VoteGenerator::new(proposal_id); @@ -903,15 +866,10 @@ fn proposal_execution_succeeds_after_the_grace_period() { let mut expected_proposal = Proposal { proposal_type: 1, - parameters, + parameters: parameters_fixture.params(), proposer_id: 1, created_at: 1, - status: ProposalStatus::Finalized(FinalizationStatus { - proposal_status: ProposalDecisionStatus::Approved( - ApprovedProposalStatus::PendingExecution, - ), - finalization_error: None, - }), + status: ProposalStatus::approved(ApprovedProposalStatus::PendingExecution), title: b"title".to_vec(), body: b"body".to_vec(), approved_at: Some(1), @@ -931,10 +889,8 @@ fn proposal_execution_succeeds_after_the_grace_period() { proposal = >::get(proposal_id); - expected_proposal.status = ProposalStatus::Finalized(FinalizationStatus { - proposal_status: ProposalDecisionStatus::Approved(ApprovedProposalStatus::Executed), - finalization_error: None, - }); + expected_proposal.status = ProposalStatus::approved(ApprovedProposalStatus::Executed); + assert_eq!(proposal, expected_proposal); // check internal cache for proposal_id absense @@ -997,17 +953,12 @@ fn create_dummy_proposal_succeeds_with_stake() { initial_test_ext().execute_with(|| { let account_id = 1; - let parameters = ProposalParameters { - voting_period: 3, - approval_quorum_percentage: 50, - approval_threshold_percentage: 60, - slashing_quorum_percentage: 60, - slashing_threshold_percentage: 60, - grace_period: 5, - required_stake: Some(200), - }; + let required_stake = 200; + let parameters_fixture = + ProposalParametersFixture::default().with_required_stake(required_stake); + let dummy_proposal = DummyProposalFixture::default() - .with_parameters(parameters) + .with_parameters(parameters_fixture.params()) .with_origin(RawOrigin::Signed(account_id)) .with_stake(200); @@ -1021,7 +972,7 @@ fn create_dummy_proposal_succeeds_with_stake() { proposal, Proposal { proposal_type: 1, - parameters, + parameters: parameters_fixture.params(), proposer_id: 1, created_at: 1, status: ProposalStatus::Active, @@ -1041,19 +992,13 @@ fn create_dummy_proposal_fail_with_stake_on_empty_account() { initial_test_ext().execute_with(|| { let account_id = 1; - let parameters = ProposalParameters { - voting_period: 3, - approval_quorum_percentage: 50, - approval_threshold_percentage: 60, - slashing_quorum_percentage: 60, - slashing_threshold_percentage: 60, - grace_period: 0, - required_stake: Some(200), - }; + let required_stake = 200; + let parameters_fixture = + ProposalParametersFixture::default().with_required_stake(required_stake); let dummy_proposal = DummyProposalFixture::default() - .with_parameters(parameters) + .with_parameters(parameters_fixture.params()) .with_origin(RawOrigin::Signed(account_id)) - .with_stake(200); + .with_stake(required_stake); dummy_proposal.create_proposal_and_assert(Err("too few free funds in account")); }); @@ -1062,30 +1007,23 @@ fn create_dummy_proposal_fail_with_stake_on_empty_account() { #[test] fn create_proposal_fais_with_invalid_stake_parameters() { initial_test_ext().execute_with(|| { - let mut parameters = ProposalParameters { - voting_period: 3, - approval_quorum_percentage: 50, - approval_threshold_percentage: 60, - slashing_quorum_percentage: 60, - slashing_threshold_percentage: 60, - grace_period: 0, - required_stake: None, - }; + let parameters_fixture = ProposalParametersFixture::default(); let mut dummy_proposal = DummyProposalFixture::default() - .with_parameters(parameters.clone()) + .with_parameters(parameters_fixture.params()) .with_stake(200); dummy_proposal.create_proposal_and_assert(Err("Stake should be empty for this proposal")); - parameters.required_stake = Some(200); - dummy_proposal = DummyProposalFixture::default().with_parameters(parameters.clone()); + let parameters_fixture_stake_200 = parameters_fixture.with_required_stake(200); + dummy_proposal = + DummyProposalFixture::default().with_parameters(parameters_fixture_stake_200.params()); dummy_proposal.create_proposal_and_assert(Err("Stake cannot be empty with this proposal")); - parameters.required_stake = Some(300); + let parameters_fixture_stake_300 = parameters_fixture.with_required_stake(300); dummy_proposal = DummyProposalFixture::default() - .with_parameters(parameters.clone()) + .with_parameters(parameters_fixture_stake_300.params()) .with_stake(200); dummy_proposal @@ -1177,7 +1115,7 @@ fn finalize_proposal_using_stake_mocks() { mock.expect_remove_stake().times(1).returning(|_| Ok(())); - mock.expect_slash().times(1).returning(|_,_| Ok(())); + mock.expect_slash().times(1).returning(|_, _| Ok(())); Rc::new(mock) }; @@ -1186,17 +1124,10 @@ fn finalize_proposal_using_stake_mocks() { let account_id = 1; let stake_amount = 200; - let parameters = ProposalParameters { - voting_period: 3, - approval_quorum_percentage: 50, - approval_threshold_percentage: 60, - slashing_quorum_percentage: 60, - slashing_threshold_percentage: 60, - grace_period: 5, - required_stake: Some(stake_amount), - }; + let parameters_fixture = + ProposalParametersFixture::default().with_required_stake(stake_amount); let dummy_proposal = DummyProposalFixture::default() - .with_parameters(parameters) + .with_parameters(parameters_fixture.params()) .with_origin(RawOrigin::Signed(account_id)) .with_stake(stake_amount); @@ -1245,3 +1176,59 @@ fn proposal_slashing_succeeds() { assert!(!>::exists(proposal_id)); }); } + +#[test] +fn finalize_proposal_failed_using_stake_mocks() { + handle_mock(|| { + initial_test_ext().execute_with(|| { + let mock = { + let mut mock = crate::types::MockStakeHandler::::new(); + mock.expect_create_stake().times(1).returning(|_, _| Ok(1)); + + mock.expect_remove_stake() + .times(1) + .returning(|_| Err("Cannot remove stake")); + + mock.expect_slash().times(1).returning(|_, _| Ok(())); + + Rc::new(mock) + }; + set_stake_handler_impl(mock.clone()); + + let account_id = 1; + + let stake_amount = 200; + let parameters_fixture = + ProposalParametersFixture::default().with_required_stake(stake_amount); + let dummy_proposal = DummyProposalFixture::default() + .with_parameters(parameters_fixture.params()) + .with_origin(RawOrigin::Signed(account_id)) + .with_stake(stake_amount); + + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); + + run_to_block_and_finalize(5); + + let proposal = >::get(proposal_id); + assert_eq!( + proposal, + Proposal { + proposal_type: 1, + parameters: parameters_fixture.params(), + proposer_id: 1, + created_at: 1, + status: ProposalStatus::finalized_with_error( + ProposalDecisionStatus::Expired, + Some("Cannot remove stake") + ), + title: b"title".to_vec(), + body: b"body".to_vec(), + approved_at: None, + finalized_at: Some(4), + voting_results: VotingResults::default(), + stake_id: Some(1), + } + ); + }); + }); +} diff --git a/modules/proposals/engine/src/types/mod.rs b/modules/proposals/engine/src/types/mod.rs index 0ff168c297..cd72968284 100644 --- a/modules/proposals/engine/src/types/mod.rs +++ b/modules/proposals/engine/src/types/mod.rs @@ -32,6 +32,30 @@ pub enum ProposalStatus { Finalized(FinalizationStatus), } +impl ProposalStatus { + /// ProposalStatus helper, creates ExecutionFailed approved proposal status + pub fn approved(approved_status: ApprovedProposalStatus) -> ProposalStatus { + ProposalStatus::Finalized(FinalizationStatus { + proposal_status: ProposalDecisionStatus::Approved(approved_status), + finalization_error: None, + }) + } + + pub fn finalized(decision_status: ProposalDecisionStatus) -> ProposalStatus { + Self::finalized_with_error(decision_status, None) + } + + pub fn finalized_with_error( + decision_status: ProposalDecisionStatus, + finalization_error: Option<&str>, + ) -> ProposalStatus { + ProposalStatus::Finalized(FinalizationStatus { + proposal_status: decision_status, + finalization_error: finalization_error.map(|err| err.as_bytes().to_vec()), + }) + } +} + /// Final proposal status and potential error. #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] #[derive(Encode, Decode, Clone, PartialEq, Eq, Debug)] @@ -60,6 +84,15 @@ pub enum ApprovedProposalStatus { }, } +impl ApprovedProposalStatus { + /// ApprovedProposalStatus helper, creates ExecutionFailed approved proposal status + pub fn failed_execution(err: &str) -> ApprovedProposalStatus { + ApprovedProposalStatus::ExecutionFailed { + error: err.as_bytes().to_vec(), + } + } +} + /// Status for the proposal with finalized decision #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] #[derive(Encode, Decode, Clone, PartialEq, Eq, Debug)] diff --git a/modules/proposals/engine/src/types/stakes.rs b/modules/proposals/engine/src/types/stakes.rs index c2336d33b4..600fa78f70 100644 --- a/modules/proposals/engine/src/types/stakes.rs +++ b/modules/proposals/engine/src/types/stakes.rs @@ -3,7 +3,7 @@ use crate::Trait; use rstd::convert::From; use rstd::marker::PhantomData; use rstd::rc::Rc; -use runtime_primitives::traits::{One}; +use runtime_primitives::traits::One; // use runtime_primitives::traits::{OnFinalize}; use srml_support::traits::{Currency, ExistenceRequirement, WithdrawReasons}; @@ -78,14 +78,15 @@ impl StakeHandler for DefaultStakeHandler { stake::Module::::initiate_slashing(&stake_id, slash_balance, T::BlockNumber::one()) .map_err(WrappedError)?; -// stake::Module::::on_finalize(>::block_number()); + // stake::Module::::on_finalize(>::block_number()); Ok(()) } /// Execute unstaking and removes the stake fn remove_stake(&self, stake_id: T::StakeId) -> Result<(), &'static str> { - stake::Module::::initiate_unstaking(&stake_id, Some(T::BlockNumber::one())).map_err(WrappedError)?; + stake::Module::::initiate_unstaking(&stake_id, Some(T::BlockNumber::one())) + .map_err(WrappedError)?; stake::Module::::remove_stake(&stake_id).map_err(WrappedError)?; From f7022f77f7703e0c1510c8641b9032af37ca6a73 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Mon, 24 Feb 2020 10:44:50 +0300 Subject: [PATCH 045/286] Change comments --- modules/proposals/engine/src/lib.rs | 49 ++++++++++++----------- modules/proposals/engine/src/types/mod.rs | 2 + 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index 3db54298f3..e050abc461 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -1,13 +1,14 @@ //! Proposals engine module for the Joystream platform. Version 2. -//! Provides methods and extrinsics to create and vote for proposals. +//! Provides methods and extrinsics to create and vote for proposals, +//! inspired by Parity **Democracy module**. //! //! Supported extrinsics: -//! - vote -//! - cancel_proposal -//! - veto_proposal +//! - vote - registers a vote for the proposal +//! - cancel_proposal - cancels the proposal (can be canceled only by owner) +//! - veto_proposal - vetoes the proposal //! //! Public API (requires root origin): -//! - create_proposal +//! - create_proposal - creates proposal using provided parameters //! // Ensure we're `no_std` when compiling for Wasm. @@ -312,8 +313,8 @@ impl Module { >::block_number() } - /// Enumerates through active proposals. Tally Voting results. - /// Returns proposals with finalized status and id + // Enumerates through active proposals. Tally Voting results. + // Returns proposals with finalized status and id fn get_finalized_proposals() -> Vec> { // enumerate active proposals id and gather finalization data >::enumerate() @@ -369,12 +370,12 @@ impl Module { >::remove(&proposal_id); } - /// Performs all actions on proposal finalization: - /// - clean active proposal cache - /// - update proposal status fields (status, finalized_at, approved_at) - /// - add to pending execution proposal cache if approved - /// - slash and unstake proposal stake if stake exists - /// - fire an event + // Performs all actions on proposal finalization: + // - clean active proposal cache + // - update proposal status fields (status, finalized_at, approved_at) + // - add to pending execution proposal cache if approved + // - slash and unstake proposal stake if stake exists + // - fire an event fn finalize_proposal(proposal_id: T::ProposalId, decision_status: ProposalDecisionStatus) { Self::decrease_active_proposal_counter(); >::remove(&proposal_id.clone()); @@ -408,7 +409,7 @@ impl Module { )); } - /// Slashes the stake and perform unstake only in case of existing stake + // Slashes the stake and perform unstake only in case of existing stake fn slash_and_unstake( current_stake_id: Option, slash_balance: BalanceOf, @@ -425,7 +426,7 @@ impl Module { Ok(()) } - /// Calculates required slash based on finalization ProposalDecisionStatus and proposal parameters. + // Calculates required slash based on finalization ProposalDecisionStatus and proposal parameters. fn calculate_slash_balance( decision_status: &ProposalDecisionStatus, proposal_parameters: &ProposalParameters>, @@ -445,7 +446,7 @@ impl Module { } } - /// Enumerates approved proposals and checks their grace period expiration + // Enumerates approved proposals and checks their grace period expiration fn get_approved_proposal_with_expired_grace_period_ids() -> Vec { >::enumerate() .filter_map(|(proposal_id, _)| { @@ -460,13 +461,13 @@ impl Module { .collect() } - /// Increases active proposal counter. + // Increases active proposal counter. fn increase_active_proposal_counter() { let next_active_proposal_count_value = Self::active_proposal_count() + 1; ActiveProposalCount::put(next_active_proposal_count_value); } - /// Decreases active proposal counter down to zero. Decreasing below zero has no effect. + // Decreases active proposal counter down to zero. Decreasing below zero has no effect. fn decrease_active_proposal_counter() { let current_active_proposal_counter = Self::active_proposal_count(); @@ -476,11 +477,11 @@ impl Module { }; } - /// Performs all checks for the proposal creation: - /// - title, body lengths - /// - mac active proposal - /// - provided parameters: approval_threshold_percentage and slashing_threshold_percentage > 0 - /// - provided stake balance and parameters.required_stake are valid + // Performs all checks for the proposal creation: + // - title, body lengths + // - mac active proposal + // - provided parameters: approval_threshold_percentage and slashing_threshold_percentage > 0 + // - provided stake balance and parameters.required_stake are valid fn ensure_create_proposal_parameters_are_valid( parameters: &ProposalParameters>, title: &[u8], @@ -534,7 +535,7 @@ impl Module { } } -/// Simplification of the 'FinalizedProposalData' type +// Simplification of the 'FinalizedProposalData' type type FinalizedProposal = FinalizedProposalData< ::ProposalId, ::BlockNumber, diff --git a/modules/proposals/engine/src/types/mod.rs b/modules/proposals/engine/src/types/mod.rs index cd72968284..eabef233c3 100644 --- a/modules/proposals/engine/src/types/mod.rs +++ b/modules/proposals/engine/src/types/mod.rs @@ -41,10 +41,12 @@ impl ProposalStatus { }) } + /// Creates finalized proposal status with provided ProposalDecisionStatus pub fn finalized(decision_status: ProposalDecisionStatus) -> ProposalStatus { Self::finalized_with_error(decision_status, None) } + /// Creates finalized proposal status with provided ProposalDecisionStatus and error pub fn finalized_with_error( decision_status: ProposalDecisionStatus, finalization_error: Option<&str>, From ca9946eb19cd409daedd04756745db8a4a9ec647 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Mon, 24 Feb 2020 14:37:28 +0300 Subject: [PATCH 046/286] Add comments regarding stake module issue https://github.com/Joystream/substrate-runtime-joystream/issues/161 --- modules/proposals/engine/src/lib.rs | 3 +++ modules/proposals/engine/src/tests/mod.rs | 3 ++- modules/proposals/engine/src/types/stakes.rs | 25 +++++++++----------- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index e050abc461..eff1705ac9 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -17,6 +17,9 @@ // Do not delete! Cannot be uncommented by default, because of Parity decl_module! issue. //#![warn(missing_docs)] +// TODO: Test module after the https://github.com/Joystream/substrate-runtime-joystream/issues/161 +// issue will be fixed: "Fix stake module and allow slashing and unstaking in the same block." + pub use types::BalanceOf; use types::FinalizedProposalData; pub use types::VotingResults; diff --git a/modules/proposals/engine/src/tests/mod.rs b/modules/proposals/engine/src/tests/mod.rs index 419edf9fc7..89a7fc9dca 100644 --- a/modules/proposals/engine/src/tests/mod.rs +++ b/modules/proposals/engine/src/tests/mod.rs @@ -1030,7 +1030,8 @@ fn create_proposal_fais_with_invalid_stake_parameters() { .create_proposal_and_assert(Err("Stake differs from the proposal requirements")); }); } -/* TODO: restore +/* TODO: restore after the https://github.com/Joystream/substrate-runtime-joystream/issues/161 +// issue will be fixed: "Fix stake module and allow slashing and unstaking in the same block." #[test] fn finalize_expired_proposal_and_check_stake_removing_with_balance_checks_succeeds() { initial_test_ext().execute_with(|| { diff --git a/modules/proposals/engine/src/types/stakes.rs b/modules/proposals/engine/src/types/stakes.rs index 600fa78f70..c363b81497 100644 --- a/modules/proposals/engine/src/types/stakes.rs +++ b/modules/proposals/engine/src/types/stakes.rs @@ -3,8 +3,7 @@ use crate::Trait; use rstd::convert::From; use rstd::marker::PhantomData; use rstd::rc::Rc; -use runtime_primitives::traits::One; -// use runtime_primitives::traits::{OnFinalize}; +use runtime_primitives::traits::Zero; use srml_support::traits::{Currency, ExistenceRequirement, WithdrawReasons}; // Mocking dependencies for testing @@ -72,26 +71,24 @@ impl StakeHandler for DefaultStakeHandler { Ok(stake_id) } - /// Slash balance from the existing stake - fn slash(&self, stake_id: T::StakeId, slash_balance: BalanceOf) -> Result<(), &'static str> { - let _slash_id = - stake::Module::::initiate_slashing(&stake_id, slash_balance, T::BlockNumber::one()) - .map_err(WrappedError)?; - - // stake::Module::::on_finalize(>::block_number()); - - Ok(()) - } - /// Execute unstaking and removes the stake fn remove_stake(&self, stake_id: T::StakeId) -> Result<(), &'static str> { - stake::Module::::initiate_unstaking(&stake_id, Some(T::BlockNumber::one())) + stake::Module::::initiate_unstaking(&stake_id, Some(T::BlockNumber::zero())) .map_err(WrappedError)?; stake::Module::::remove_stake(&stake_id).map_err(WrappedError)?; Ok(()) } + + /// Slash balance from the existing stake + fn slash(&self, stake_id: T::StakeId, slash_balance: BalanceOf) -> Result<(), &'static str> { + let _slash_id = + stake::Module::::initiate_slashing(&stake_id, slash_balance, T::BlockNumber::zero()) + .map_err(WrappedError)?; + + Ok(()) + } } impl DefaultStakeHandler { From e6ddc04cdc587aed667ca3bccfac7817d1910705 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 25 Feb 2020 13:17:30 +0300 Subject: [PATCH 047/286] Add discussion module skeleton --- modules/proposals/discussion/Cargo.toml | 77 +++++++++++++++++++ modules/proposals/discussion/src/lib.rs | 49 ++++++++++++ .../proposals/discussion/src/tests/mock.rs | 65 ++++++++++++++++ modules/proposals/discussion/src/tests/mod.rs | 6 ++ 4 files changed, 197 insertions(+) create mode 100644 modules/proposals/discussion/Cargo.toml create mode 100644 modules/proposals/discussion/src/lib.rs create mode 100644 modules/proposals/discussion/src/tests/mock.rs create mode 100644 modules/proposals/discussion/src/tests/mod.rs diff --git a/modules/proposals/discussion/Cargo.toml b/modules/proposals/discussion/Cargo.toml new file mode 100644 index 0000000000..ead2c561ba --- /dev/null +++ b/modules/proposals/discussion/Cargo.toml @@ -0,0 +1,77 @@ +[package] +name = 'substrate-proposals-discussion-module' +version = '2.0.0' +authors = ['Joystream contributors'] +edition = '2018' + +[features] +default = ['std'] +no_std = [] +std = [ + 'codec/std', + 'rstd/std', + 'srml-support/std', + 'primitives/std', + 'runtime-primitives/std', + 'system/std', + 'timestamp/std', + 'serde', +] + + +[dependencies.num_enum] +default_features = false +version = "0.4.2" + +[dependencies.serde] +features = ['derive'] +optional = true +version = '1.0.101' + +[dependencies.codec] +default-features = false +features = ['derive'] +package = 'parity-scale-codec' +version = '1.0.0' + +[dependencies.primitives] +default_features = false +git = 'https://github.com/paritytech/substrate.git' +package = 'substrate-primitives' +rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' + +[dependencies.rstd] +default_features = false +git = 'https://github.com/paritytech/substrate.git' +package = 'sr-std' +rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' + +[dependencies.runtime-primitives] +default_features = false +git = 'https://github.com/paritytech/substrate.git' +package = 'sr-primitives' +rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' + +[dependencies.srml-support] +default_features = false +git = 'https://github.com/paritytech/substrate.git' +package = 'srml-support' +rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' + +[dependencies.system] +default_features = false +git = 'https://github.com/paritytech/substrate.git' +package = 'srml-system' +rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' + +[dependencies.timestamp] +default_features = false +git = 'https://github.com/paritytech/substrate.git' +package = 'srml-timestamp' +rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' + +[dev-dependencies.runtime-io] +default_features = false +git = 'https://github.com/paritytech/substrate.git' +package = 'sr-io' +rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' \ No newline at end of file diff --git a/modules/proposals/discussion/src/lib.rs b/modules/proposals/discussion/src/lib.rs new file mode 100644 index 0000000000..7c2bb70361 --- /dev/null +++ b/modules/proposals/discussion/src/lib.rs @@ -0,0 +1,49 @@ +//! Proposals discussion module for the Joystream platform. Version 2. +//! Contains discussion subsystem for the proposals engine. +//! +//! Supported extrinsics: +//! +//! + +// Ensure we're `no_std` when compiling for Wasm. +#![cfg_attr(not(feature = "std"), no_std)] + +// Do not delete! Cannot be uncommented by default, because of Parity decl_module! issue. +//#![warn(missing_docs)] + +#[cfg(test)] +mod tests; + +use codec::Encode; +use rstd::clone::Clone; +use rstd::prelude::*; +use rstd::vec::Vec; +use srml_support::{decl_error, decl_module, decl_storage, ensure}; +use system::RawOrigin; + +/// 'Proposal discussion' substrate module Trait +pub trait Trait: system::Trait {} + + +// Storage for the proposals discussion module +decl_storage! { + pub trait Store for Module as ProposalDiscussion { + + } +} + +decl_module! { + /// 'Proposal discussion' substrate module + pub struct Module for enum Call where origin: T::Origin { + } +} + +impl Module { + /// Create the discussion + pub fn create_discussion( + origin: RawOrigin, + title: Vec, + ) { + + } +} \ No newline at end of file diff --git a/modules/proposals/discussion/src/tests/mock.rs b/modules/proposals/discussion/src/tests/mock.rs new file mode 100644 index 0000000000..5bae0e5403 --- /dev/null +++ b/modules/proposals/discussion/src/tests/mock.rs @@ -0,0 +1,65 @@ +#![cfg(test)] + +pub use system; + +pub use primitives::{Blake2Hasher, H256}; +pub use runtime_primitives::{ + testing::{Digest, DigestItem, Header, UintAuthorityId}, + traits::{BlakeTwo256, Convert, IdentityLookup, OnFinalize}, + weights::Weight, + BuildStorage, Perbill, +}; + +use srml_support::{impl_outer_dispatch, impl_outer_origin, parameter_types}; + +impl_outer_origin! { + pub enum Origin for Test {} +} + +// Workaround for https://github.com/rust-lang/rust/issues/26925 . Remove when sorted. +#[derive(Clone, PartialEq, Eq, Debug)] +pub struct Test; +parameter_types! { + pub const BlockHashCount: u64 = 250; + pub const MaximumBlockWeight: u32 = 1024; + pub const MaximumBlockLength: u32 = 2 * 1024; + pub const AvailableBlockRatio: Perbill = Perbill::one(); + pub const MinimumPeriod: u64 = 5; + pub const StakePoolId: [u8; 8] = *b"joystake"; +} + +impl crate::Trait for Test {} + +impl system::Trait for Test { + type Origin = Origin; + type Index = u64; + type BlockNumber = u64; + type Call = (); + type Hash = H256; + type Hashing = BlakeTwo256; + type AccountId = u64; + type Lookup = IdentityLookup; + type Header = Header; + type Event = (); + type BlockHashCount = BlockHashCount; + type MaximumBlockWeight = MaximumBlockWeight; + type MaximumBlockLength = MaximumBlockLength; + type AvailableBlockRatio = AvailableBlockRatio; + type Version = (); +} + +impl timestamp::Trait for Test { + type Moment = u64; + type OnTimestampSet = (); + type MinimumPeriod = MinimumPeriod; +} + + +pub fn initial_test_ext() -> runtime_io::TestExternalities { + let t = system::GenesisConfig::default() + .build_storage::() + .unwrap(); + + t.into() +} + diff --git a/modules/proposals/discussion/src/tests/mod.rs b/modules/proposals/discussion/src/tests/mod.rs new file mode 100644 index 0000000000..347b17c9f9 --- /dev/null +++ b/modules/proposals/discussion/src/tests/mod.rs @@ -0,0 +1,6 @@ +mod mock; + +use mock::*; + +#[test] +fn create_text_proposal_codex_call_succeeds() {} \ No newline at end of file From 6cf7c87098e1213ebd5923272a1171ca7db74fc4 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 25 Feb 2020 16:43:40 +0300 Subject: [PATCH 048/286] Add create_discussion() API method - plain implementation (no ensures) - simple test --- modules/proposals/discussion/src/lib.rs | 58 +++++++++++++++---- .../proposals/discussion/src/tests/mock.rs | 10 +++- modules/proposals/discussion/src/tests/mod.rs | 12 +++- modules/proposals/discussion/src/types.rs | 19 ++++++ 4 files changed, 83 insertions(+), 16 deletions(-) create mode 100644 modules/proposals/discussion/src/types.rs diff --git a/modules/proposals/discussion/src/lib.rs b/modules/proposals/discussion/src/lib.rs index 7c2bb70361..75050c43a4 100644 --- a/modules/proposals/discussion/src/lib.rs +++ b/modules/proposals/discussion/src/lib.rs @@ -13,22 +13,38 @@ #[cfg(test)] mod tests; +mod types; -use codec::Encode; use rstd::clone::Clone; use rstd::prelude::*; use rstd::vec::Vec; -use srml_support::{decl_error, decl_module, decl_storage, ensure}; -use system::RawOrigin; +use runtime_primitives::traits::EnsureOrigin; +use srml_support::{decl_module, decl_storage, Parameter}; + +use types::Thread; + +//TODO: create_thread() ensures /// 'Proposal discussion' substrate module Trait -pub trait Trait: system::Trait {} +pub trait Trait: system::Trait { + /// Origin from which author must come. + type AuthorOrigin: EnsureOrigin; + + /// Discussion thread Id type + type ThreadId: From + Parameter + Default + Copy; + /// Type for the author id. Should be authenticated by account id. + type AuthorId: From + Parameter + Default; +} // Storage for the proposals discussion module decl_storage! { pub trait Store for Module as ProposalDiscussion { + /// Map thread identifier to corresponding thread. + pub ThreadById get(thread_by_id): map T::ThreadId => Thread; + /// Count of all threads that have been created. + pub ThreadCount get(fn thread_count): u32; } } @@ -39,11 +55,29 @@ decl_module! { } impl Module { - /// Create the discussion - pub fn create_discussion( - origin: RawOrigin, - title: Vec, - ) { - - } -} \ No newline at end of file + // Wrapper-function over system::block_number() + fn current_block() -> T::BlockNumber { + >::block_number() + } + + /// Create the discussion + pub fn create_discussion(origin: T::Origin, title: Vec) -> Result<(), &'static str> { + let account_id = T::AuthorOrigin::ensure_origin(origin)?; + let author_id = T::AuthorId::from(account_id); + + let next_thread_count_value = Self::thread_count() + 1; + let new_thread_id = next_thread_count_value; + + let new_thread = Thread { + title, + created_at: Self::current_block(), + author_id, + }; + + let thread_id = T::ThreadId::from(new_thread_id); + >::insert(thread_id, new_thread); + ThreadCount::put(next_thread_count_value); + + Ok(()) + } +} diff --git a/modules/proposals/discussion/src/tests/mock.rs b/modules/proposals/discussion/src/tests/mock.rs index 5bae0e5403..886dc11e28 100644 --- a/modules/proposals/discussion/src/tests/mock.rs +++ b/modules/proposals/discussion/src/tests/mock.rs @@ -10,7 +10,7 @@ pub use runtime_primitives::{ BuildStorage, Perbill, }; -use srml_support::{impl_outer_dispatch, impl_outer_origin, parameter_types}; +use srml_support::{impl_outer_origin, parameter_types}; impl_outer_origin! { pub enum Origin for Test {} @@ -28,7 +28,11 @@ parameter_types! { pub const StakePoolId: [u8; 8] = *b"joystake"; } -impl crate::Trait for Test {} +impl crate::Trait for Test { + type AuthorOrigin = system::EnsureSigned; + type ThreadId = u32; + type AuthorId = u64; +} impl system::Trait for Test { type Origin = Origin; @@ -54,7 +58,6 @@ impl timestamp::Trait for Test { type MinimumPeriod = MinimumPeriod; } - pub fn initial_test_ext() -> runtime_io::TestExternalities { let t = system::GenesisConfig::default() .build_storage::() @@ -63,3 +66,4 @@ pub fn initial_test_ext() -> runtime_io::TestExternalities { t.into() } +pub type Discussions = crate::Module; diff --git a/modules/proposals/discussion/src/tests/mod.rs b/modules/proposals/discussion/src/tests/mod.rs index 347b17c9f9..51c22e9ce0 100644 --- a/modules/proposals/discussion/src/tests/mod.rs +++ b/modules/proposals/discussion/src/tests/mod.rs @@ -2,5 +2,15 @@ mod mock; use mock::*; +use system::RawOrigin; + #[test] -fn create_text_proposal_codex_call_succeeds() {} \ No newline at end of file +fn create_discussion_call_succeeds() { + initial_test_ext().execute_with(|| { + let origin = RawOrigin::Signed(1); + let create_discussion_result = + Discussions::create_discussion(origin.into(), b"title".to_vec()); + + assert_eq!(create_discussion_result, Ok(())); + }); +} diff --git a/modules/proposals/discussion/src/types.rs b/modules/proposals/discussion/src/types.rs new file mode 100644 index 0000000000..fc2bec66c2 --- /dev/null +++ b/modules/proposals/discussion/src/types.rs @@ -0,0 +1,19 @@ +use rstd::prelude::*; +#[cfg(feature = "std")] +use serde::{Deserialize, Serialize}; + +use codec::{Decode, Encode}; + +/// Represents a discussion thread +#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))] +#[derive(Encode, Decode, Default, Clone, PartialEq, Eq)] +pub struct Thread { + /// Title + pub title: Vec, + + /// When thread was established. + pub created_at: BlockNumber, + + /// Author of post. + pub author_id: AuthorId, +} From 38bcd539cc07a148047b77a967e3fb1a49a7b503 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 25 Feb 2020 18:44:00 +0300 Subject: [PATCH 049/286] Add a post --- modules/proposals/discussion/src/lib.rs | 57 +++++++++++++++---- .../proposals/discussion/src/tests/mock.rs | 7 ++- modules/proposals/discussion/src/tests/mod.rs | 49 +++++++++++++++- modules/proposals/discussion/src/types.rs | 23 +++++++- 4 files changed, 120 insertions(+), 16 deletions(-) diff --git a/modules/proposals/discussion/src/lib.rs b/modules/proposals/discussion/src/lib.rs index 75050c43a4..da0b748a6e 100644 --- a/modules/proposals/discussion/src/lib.rs +++ b/modules/proposals/discussion/src/lib.rs @@ -21,36 +21,73 @@ use rstd::vec::Vec; use runtime_primitives::traits::EnsureOrigin; use srml_support::{decl_module, decl_storage, Parameter}; -use types::Thread; +use types::{Thread, Post}; //TODO: create_thread() ensures +//TODO: create_post() ensures +//TODO: select storage container for the posts (double map, inside thread)? /// 'Proposal discussion' substrate module Trait pub trait Trait: system::Trait { - /// Origin from which author must come. - type AuthorOrigin: EnsureOrigin; + /// Origin from which thread author must come. + type ThreadAuthorOrigin: EnsureOrigin; + + /// Origin from which commenter must come. + type PostAuthorOrigin: EnsureOrigin; /// Discussion thread Id type type ThreadId: From + Parameter + Default + Copy; - /// Type for the author id. Should be authenticated by account id. - type AuthorId: From + Parameter + Default; + /// Post Id type + type PostId: From + Parameter + Default + Copy; + + /// Type for the thread author id. Should be authenticated by account id. + type ThreadAuthorId: From + Parameter + Default; + + /// Type for the post author id. Should be authenticated by account id. + type PostAuthorId: From + Parameter + Default; } // Storage for the proposals discussion module decl_storage! { pub trait Store for Module as ProposalDiscussion { /// Map thread identifier to corresponding thread. - pub ThreadById get(thread_by_id): map T::ThreadId => Thread; + pub ThreadById get(thread_by_id): map T::ThreadId => + Thread; /// Count of all threads that have been created. - pub ThreadCount get(fn thread_count): u32; + pub ThreadCount get(fn thread_count): u32; + + /// Map post id to corresponding post. + pub PostById get(post_by_id): map T::PostId => + Post; + + /// Count of all posts that have been created. + pub PostCount get(fn post_count): u32; } } decl_module! { /// 'Proposal discussion' substrate module pub struct Module for enum Call where origin: T::Origin { + pub fn add_post(origin, thread_id : T::ThreadId, text : Vec) { + let account_id = T::ThreadAuthorOrigin::ensure_origin(origin)?; + let post_author_id = T::PostAuthorId::from(account_id); + + let next_post_count_value = Self::post_count() + 1; + let new_post_id = next_post_count_value; + + let new_post = Post { + text, + created_at: Self::current_block(), + author_id: post_author_id, + thread_id, + }; + + let post_id = T::PostId::from(new_post_id); + >::insert(post_id, new_post); + PostCount::put(next_post_count_value); + } } } @@ -62,8 +99,8 @@ impl Module { /// Create the discussion pub fn create_discussion(origin: T::Origin, title: Vec) -> Result<(), &'static str> { - let account_id = T::AuthorOrigin::ensure_origin(origin)?; - let author_id = T::AuthorId::from(account_id); + let account_id = T::ThreadAuthorOrigin::ensure_origin(origin)?; + let thread_author_id = T::ThreadAuthorId::from(account_id); let next_thread_count_value = Self::thread_count() + 1; let new_thread_id = next_thread_count_value; @@ -71,7 +108,7 @@ impl Module { let new_thread = Thread { title, created_at: Self::current_block(), - author_id, + author_id: thread_author_id, }; let thread_id = T::ThreadId::from(new_thread_id); diff --git a/modules/proposals/discussion/src/tests/mock.rs b/modules/proposals/discussion/src/tests/mock.rs index 886dc11e28..11e0ede949 100644 --- a/modules/proposals/discussion/src/tests/mock.rs +++ b/modules/proposals/discussion/src/tests/mock.rs @@ -29,9 +29,12 @@ parameter_types! { } impl crate::Trait for Test { - type AuthorOrigin = system::EnsureSigned; + type ThreadAuthorOrigin = system::EnsureSigned; + type PostAuthorOrigin = system::EnsureSigned; type ThreadId = u32; - type AuthorId = u64; + type PostId = u32; + type ThreadAuthorId = u64; + type PostAuthorId = u64; } impl system::Trait for Test { diff --git a/modules/proposals/discussion/src/tests/mod.rs b/modules/proposals/discussion/src/tests/mod.rs index 51c22e9ce0..4d11460d39 100644 --- a/modules/proposals/discussion/src/tests/mod.rs +++ b/modules/proposals/discussion/src/tests/mod.rs @@ -2,14 +2,61 @@ mod mock; use mock::*; +use crate::*; use system::RawOrigin; +struct DiscussionFixture { + pub title: Vec, + pub origin: RawOrigin, +} + +impl Default for DiscussionFixture { + fn default() -> Self { + DiscussionFixture{ + title: b"text".to_vec(), + origin: RawOrigin::Signed(1), + } + } +} + +impl DiscussionFixture{ + fn create_discussion_and_assert(&self, result: Result<(), &'static str>) -> Option { + let create_discussion_result = + Discussions::create_discussion(self.origin.clone().into(), self.title.clone()); + + assert_eq!(create_discussion_result, result); + + if result.is_ok() { + // last created thread id equals current thread count + let thread_id = ::get(); + + Some(thread_id) + } else { + None + } + } +} + #[test] fn create_discussion_call_succeeds() { initial_test_ext().execute_with(|| { + let discussion_fixture = DiscussionFixture::default(); + + discussion_fixture.create_discussion_and_assert(Ok(())); + }); +} + +#[test] +fn create_post_call_succeeds() { + initial_test_ext().execute_with(|| { + let discussion_fixture = DiscussionFixture::default(); + + let thread_id = discussion_fixture.create_discussion_and_assert(Ok(())).unwrap(); + + let origin = RawOrigin::Signed(1); let create_discussion_result = - Discussions::create_discussion(origin.into(), b"title".to_vec()); + Discussions::add_post(origin.into(), thread_id, b"text".to_vec()); assert_eq!(create_discussion_result, Ok(())); }); diff --git a/modules/proposals/discussion/src/types.rs b/modules/proposals/discussion/src/types.rs index fc2bec66c2..4c2c55def4 100644 --- a/modules/proposals/discussion/src/types.rs +++ b/modules/proposals/discussion/src/types.rs @@ -7,13 +7,30 @@ use codec::{Decode, Encode}; /// Represents a discussion thread #[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))] #[derive(Encode, Decode, Default, Clone, PartialEq, Eq)] -pub struct Thread { +pub struct Thread { /// Title pub title: Vec, /// When thread was established. pub created_at: BlockNumber, - /// Author of post. - pub author_id: AuthorId, + /// Author of the thread. + pub author_id: ThreadAuthorId, +} + +/// Post for the discussion thread +#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))] +#[derive(Encode, Decode, Default, Clone, PartialEq, Eq)] +pub struct Post { + /// Text + pub text: Vec, + + /// When post was added. + pub created_at: BlockNumber, //TODO rename to updated_at? + + /// Author of the post. + pub author_id: PostAuthorId, + + /// Parent thread id for this post + pub thread_id: ThreadId, } From 793b028f9d81259e3153f03046692cf128b9febb Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 25 Feb 2020 18:57:40 +0300 Subject: [PATCH 050/286] Add virtual workspace for the proposals module Add virtual workspace Cargo.toml for the proposals module with three modules: - engine - codex - discussion --- modules/proposals/Cargo.toml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 modules/proposals/Cargo.toml diff --git a/modules/proposals/Cargo.toml b/modules/proposals/Cargo.toml new file mode 100644 index 0000000000..a9ca69eb1b --- /dev/null +++ b/modules/proposals/Cargo.toml @@ -0,0 +1,6 @@ +[workspace] +members = [ + "engine", + "codex", + "discussion", +] \ No newline at end of file From fadabb1c3210fcbaca6ec862d08299508488144d Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Wed, 26 Feb 2020 12:11:53 +0300 Subject: [PATCH 051/286] Integrate discussion system with codex and engine --- modules/proposals/codex/Cargo.toml | 6 +++ modules/proposals/codex/src/lib.rs | 48 +++++++++++++++-- modules/proposals/codex/src/tests/mock.rs | 11 ++++ modules/proposals/discussion/src/lib.rs | 18 ++++--- .../proposals/discussion/src/tests/mock.rs | 2 +- modules/proposals/discussion/src/tests/mod.rs | 9 ++-- modules/proposals/engine/src/lib.rs | 18 ++++++- .../proposals/engine/src/tests/mock/mod.rs | 2 + modules/proposals/engine/src/tests/mod.rs | 10 ++++ modules/proposals/engine/src/types/mod.rs | 53 +++++++++++-------- 10 files changed, 137 insertions(+), 40 deletions(-) diff --git a/modules/proposals/codex/Cargo.toml b/modules/proposals/codex/Cargo.toml index 6331dbb982..c70d81a060 100644 --- a/modules/proposals/codex/Cargo.toml +++ b/modules/proposals/codex/Cargo.toml @@ -17,6 +17,7 @@ std = [ 'timestamp/std', 'serde', 'proposal_engine/std', + 'proposal_discussion/std', 'stake/std', 'balances/std', ] @@ -91,6 +92,11 @@ default_features = false package = 'substrate-proposals-engine-module' path = '../engine' +[dependencies.proposal_discussion] +default_features = false +package = 'substrate-proposals-discussion-module' +path = '../discussion' + [dev-dependencies.runtime-io] default_features = false git = 'https://github.com/paritytech/substrate.git' diff --git a/modules/proposals/codex/src/lib.rs b/modules/proposals/codex/src/lib.rs index 3cde240176..0fa695a9ac 100644 --- a/modules/proposals/codex/src/lib.rs +++ b/modules/proposals/codex/src/lib.rs @@ -24,9 +24,10 @@ use rstd::marker::PhantomData; use rstd::prelude::*; use rstd::vec::Vec; use srml_support::{decl_error, decl_module, decl_storage, ensure}; +use system::RawOrigin; /// 'Proposals codex' substrate module Trait -pub trait Trait: system::Trait + proposal_engine::Trait {} +pub trait Trait: system::Trait + proposal_engine::Trait + proposal_discussion::Trait {} use srml_support::traits::Currency; @@ -105,14 +106,22 @@ decl_module! { }; let proposal_code = text_proposal.encode(); + let (cloned_origin1, cloned_origin2) = Self::double_origin(origin); + + let discussion_thread_id = >::create_discussion( + cloned_origin1, + title.clone(), + )?; + >::create_proposal( - origin, + cloned_origin2, parameters, title, body, stake_balance, text_proposal.proposal_type(), - proposal_code + proposal_code, + Some(From::::from(discussion_thread_id.into())), )?; } @@ -146,15 +155,44 @@ decl_module! { }; let proposal_code = proposal.encode(); + let (cloned_origin1, cloned_origin2) = Self::double_origin(origin); + + let discussion_thread_id = >::create_discussion( + cloned_origin1, + title.clone(), + )?; + >::create_proposal( - origin, + cloned_origin2, parameters, title, body, stake_balance, proposal.proposal_type(), - proposal_code + proposal_code, + Some(From::::from(discussion_thread_id.into())), )?; } } } + +impl Module { + // Multiplies the T::Origin. + // In our current substrate version system::Origin doesn't support clone(), + // but it will be supported in latest up-to-date substrate version. + // TODO: delete when T::Origin will support the clone() + fn double_origin(origin: T::Origin) -> (T::Origin, T::Origin) { + let coerced_origin = origin.into().ok().unwrap_or(RawOrigin::None); + + let (cloned_origin1, cloned_origin2) = match coerced_origin { + RawOrigin::None => (RawOrigin::None, RawOrigin::None), + RawOrigin::Root => (RawOrigin::Root, RawOrigin::Root), + RawOrigin::Signed(account_id) => ( + RawOrigin::Signed(account_id.clone()), + RawOrigin::Signed(account_id), + ), + }; + + (cloned_origin1.into(), cloned_origin2.into()) + } +} diff --git a/modules/proposals/codex/src/tests/mock.rs b/modules/proposals/codex/src/tests/mock.rs index f02ec964d0..1c331e4323 100644 --- a/modules/proposals/codex/src/tests/mock.rs +++ b/modules/proposals/codex/src/tests/mock.rs @@ -85,6 +85,17 @@ impl proposal_engine::Trait for Test { type VoterId = u64; type StakeHandlerProvider = proposal_engine::DefaultStakeHandlerProvider; + + type DiscussionThreadId = u32; +} + +impl proposal_discussion::Trait for Test { + type ThreadAuthorOrigin = system::EnsureSigned; + type PostAuthorOrigin = system::EnsureSigned; + type ThreadId = u32; + type PostId = u32; + type ThreadAuthorId = u64; + type PostAuthorId = u64; } pub struct MockVotersParameters; diff --git a/modules/proposals/discussion/src/lib.rs b/modules/proposals/discussion/src/lib.rs index da0b748a6e..6879f314ab 100644 --- a/modules/proposals/discussion/src/lib.rs +++ b/modules/proposals/discussion/src/lib.rs @@ -21,11 +21,12 @@ use rstd::vec::Vec; use runtime_primitives::traits::EnsureOrigin; use srml_support::{decl_module, decl_storage, Parameter}; -use types::{Thread, Post}; +use types::{Post, Thread}; //TODO: create_thread() ensures //TODO: create_post() ensures //TODO: select storage container for the posts (double map, inside thread)? +//TODO: events? /// 'Proposal discussion' substrate module Trait pub trait Trait: system::Trait { @@ -36,7 +37,7 @@ pub trait Trait: system::Trait { type PostAuthorOrigin: EnsureOrigin; /// Discussion thread Id type - type ThreadId: From + Parameter + Default + Copy; + type ThreadId: From + Into + Parameter + Default + Copy; /// Post Id type type PostId: From + Parameter + Default + Copy; @@ -56,11 +57,11 @@ decl_storage! { Thread; /// Count of all threads that have been created. - pub ThreadCount get(fn thread_count): u32; - + pub ThreadCount get(fn thread_count): u32; + /// Map post id to corresponding post. pub PostById get(post_by_id): map T::PostId => - Post; + Post; /// Count of all posts that have been created. pub PostCount get(fn post_count): u32; @@ -98,7 +99,10 @@ impl Module { } /// Create the discussion - pub fn create_discussion(origin: T::Origin, title: Vec) -> Result<(), &'static str> { + pub fn create_discussion( + origin: T::Origin, + title: Vec, + ) -> Result { let account_id = T::ThreadAuthorOrigin::ensure_origin(origin)?; let thread_author_id = T::ThreadAuthorId::from(account_id); @@ -115,6 +119,6 @@ impl Module { >::insert(thread_id, new_thread); ThreadCount::put(next_thread_count_value); - Ok(()) + Ok(thread_id) } } diff --git a/modules/proposals/discussion/src/tests/mock.rs b/modules/proposals/discussion/src/tests/mock.rs index 11e0ede949..b16bc196de 100644 --- a/modules/proposals/discussion/src/tests/mock.rs +++ b/modules/proposals/discussion/src/tests/mock.rs @@ -34,7 +34,7 @@ impl crate::Trait for Test { type ThreadId = u32; type PostId = u32; type ThreadAuthorId = u64; - type PostAuthorId = u64; + type PostAuthorId = u64; } impl system::Trait for Test { diff --git a/modules/proposals/discussion/src/tests/mod.rs b/modules/proposals/discussion/src/tests/mod.rs index 4d11460d39..5093b6e9ef 100644 --- a/modules/proposals/discussion/src/tests/mod.rs +++ b/modules/proposals/discussion/src/tests/mod.rs @@ -12,14 +12,14 @@ struct DiscussionFixture { impl Default for DiscussionFixture { fn default() -> Self { - DiscussionFixture{ + DiscussionFixture { title: b"text".to_vec(), origin: RawOrigin::Signed(1), } } } -impl DiscussionFixture{ +impl DiscussionFixture { fn create_discussion_and_assert(&self, result: Result<(), &'static str>) -> Option { let create_discussion_result = Discussions::create_discussion(self.origin.clone().into(), self.title.clone()); @@ -51,8 +51,9 @@ fn create_post_call_succeeds() { initial_test_ext().execute_with(|| { let discussion_fixture = DiscussionFixture::default(); - let thread_id = discussion_fixture.create_discussion_and_assert(Ok(())).unwrap(); - + let thread_id = discussion_fixture + .create_discussion_and_assert(Ok(())) + .unwrap(); let origin = RawOrigin::Signed(1); let create_discussion_result = diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index eff1705ac9..5f5e6be108 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -84,6 +84,9 @@ pub trait Trait: system::Trait + timestamp::Trait + stake::Trait { /// Provides stake logic implementation. Can be used to mock stake logic. type StakeHandlerProvider: StakeHandlerProvider; + + /// Discussion thread Id type + type DiscussionThreadId: From + Parameter + Default + Copy; } decl_event!( @@ -119,8 +122,7 @@ decl_event!( decl_storage! { pub trait Store for Module as ProposalEngine{ /// Map proposal by its id. - pub Proposals get(fn proposals): map T::ProposalId => - Proposal, T::StakeId>; + pub Proposals get(fn proposals): map T::ProposalId => ProposalObject; /// Count of all proposals that have been created. pub ProposalCount get(fn proposal_count): u32; @@ -258,6 +260,7 @@ impl Module { stake_balance: Option>, proposal_type: u32, proposal_code: Vec, + discussion_thread_id: Option, ) -> dispatch::Result { let account_id = T::ProposalOrigin::ensure_origin(origin)?; let proposer_id = T::ProposerId::from(account_id.clone()); @@ -295,6 +298,7 @@ impl Module { voting_results: VotingResults::default(), finalized_at: None, stake_id, + discussion_thread_id, }; let proposal_id = T::ProposalId::from(new_proposal_id); @@ -545,4 +549,14 @@ type FinalizedProposal = FinalizedProposalData< ::ProposerId, types::BalanceOf, ::StakeId, + ::DiscussionThreadId, +>; + +// Simplification of the 'Proposal' type +type ProposalObject = Proposal< + ::BlockNumber, + ::ProposerId, + types::BalanceOf, + ::StakeId, + ::DiscussionThreadId, >; diff --git a/modules/proposals/engine/src/tests/mock/mod.rs b/modules/proposals/engine/src/tests/mock/mod.rs index 344b020b93..0a55a78fba 100644 --- a/modules/proposals/engine/src/tests/mock/mod.rs +++ b/modules/proposals/engine/src/tests/mock/mod.rs @@ -99,6 +99,8 @@ impl crate::Trait for Test { type VoterId = u64; type StakeHandlerProvider = stakes::TestStakeHandlerProvider; + + type DiscussionThreadId = u32; } // If changing count is required, we can upgrade the implementation as shown here: diff --git a/modules/proposals/engine/src/tests/mod.rs b/modules/proposals/engine/src/tests/mod.rs index 89a7fc9dca..53ddbe4478 100644 --- a/modules/proposals/engine/src/tests/mod.rs +++ b/modules/proposals/engine/src/tests/mod.rs @@ -135,6 +135,7 @@ impl DummyProposalFixture { self.stake_balance, self.proposal_type, self.proposal_code, + None, ), result ); @@ -346,6 +347,7 @@ fn proposal_execution_succeeds() { }, finalized_at: Some(1), stake_id: None, + discussion_thread_id: None, } ); @@ -397,6 +399,7 @@ fn proposal_execution_failed() { }, finalized_at: Some(1), stake_id: None, + discussion_thread_id: None, } ) }); @@ -583,6 +586,7 @@ fn cancel_proposal_succeeds() { voting_results: VotingResults::default(), finalized_at: Some(1), stake_id: None, + discussion_thread_id: None, } ) }); @@ -654,6 +658,7 @@ fn veto_proposal_succeeds() { voting_results: VotingResults::default(), finalized_at: Some(1), stake_id: None, + discussion_thread_id: None, } ); @@ -787,6 +792,7 @@ fn create_proposal_and_expire_it() { voting_results: VotingResults::default(), finalized_at: Some(4), stake_id: None, + discussion_thread_id: None, } ) }); @@ -836,6 +842,7 @@ fn proposal_execution_postponed_because_of_grace_period() { slashes: 0, }, stake_id: None, + discussion_thread_id: None, } ); }); @@ -881,6 +888,7 @@ fn proposal_execution_succeeds_after_the_grace_period() { slashes: 0, }, stake_id: None, + discussion_thread_id: None, }; assert_eq!(proposal, expected_proposal); @@ -982,6 +990,7 @@ fn create_dummy_proposal_succeeds_with_stake() { voting_results: VotingResults::default(), finalized_at: None, stake_id: Some(0), // valid stake_id + discussion_thread_id: None, } ) }); @@ -1228,6 +1237,7 @@ fn finalize_proposal_failed_using_stake_mocks() { finalized_at: Some(4), voting_results: VotingResults::default(), stake_id: Some(1), + discussion_thread_id: None, } ); }); diff --git a/modules/proposals/engine/src/types/mod.rs b/modules/proposals/engine/src/types/mod.rs index eabef233c3..8b2003794d 100644 --- a/modules/proposals/engine/src/types/mod.rs +++ b/modules/proposals/engine/src/types/mod.rs @@ -213,7 +213,7 @@ impl VotingResults { /// 'Proposal' contains information necessary for the proposal system functioning. #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] #[derive(Encode, Decode, Default, Clone, PartialEq, Eq, Debug)] -pub struct Proposal { +pub struct Proposal { /// Proposal type id pub proposal_type: u32, @@ -246,9 +246,13 @@ pub struct Proposal { /// Created stake id for the proposal pub stake_id: Option, + + /// Created discussion thread id for the proposal + pub discussion_thread_id: Option, } -impl Proposal +impl + Proposal where BlockNumber: Add + PartialOrd + Copy, { @@ -310,8 +314,8 @@ pub trait VotersParameters { } // Calculates quorum, votes threshold, expiration status -struct ProposalStatusResolution<'a, BlockNumber, ProposerId, Balance, StakeId> { - proposal: &'a Proposal, +struct ProposalStatusResolution<'a, BlockNumber, ProposerId, Balance, StakeId, DiscussionThreadId> { + proposal: &'a Proposal, now: BlockNumber, votes_count: u32, total_voters_count: u32, @@ -319,8 +323,8 @@ struct ProposalStatusResolution<'a, BlockNumber, ProposerId, Balance, StakeId> { slashes: u32, } -impl<'a, BlockNumber, ProposerId, Balance, StakeId> - ProposalStatusResolution<'a, BlockNumber, ProposerId, Balance, StakeId> +impl<'a, BlockNumber, ProposerId, Balance, StakeId, DiscussionThreadId> + ProposalStatusResolution<'a, BlockNumber, ProposerId, Balance, StakeId, DiscussionThreadId> where BlockNumber: Add + PartialOrd + Copy, { @@ -406,12 +410,19 @@ pub type NegativeImbalance = pub type CurrencyOf = ::Currency; /// Data container for the finalized proposal results -pub(crate) struct FinalizedProposalData { +pub(crate) struct FinalizedProposalData< + ProposalId, + BlockNumber, + ProposerId, + Balance, + StakeId, + DiscussionThreadId, +> { /// Proposal id pub proposal_id: ProposalId, /// Proposal to be finalized - pub proposal: Proposal, + pub proposal: Proposal, /// Proposal finalization status pub status: ProposalDecisionStatus, @@ -426,7 +437,7 @@ mod tests { #[test] fn proposal_voting_period_expired() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); proposal.created_at = 1; proposal.parameters.voting_period = 3; @@ -436,7 +447,7 @@ mod tests { #[test] fn proposal_voting_period_not_expired() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); proposal.created_at = 1; proposal.parameters.voting_period = 3; @@ -446,7 +457,7 @@ mod tests { #[test] fn proposal_grace_period_expired() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); proposal.approved_at = Some(1); proposal.parameters.grace_period = 3; @@ -456,7 +467,7 @@ mod tests { #[test] fn proposal_grace_period_auto_expired() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); proposal.approved_at = Some(1); proposal.parameters.grace_period = 0; @@ -466,7 +477,7 @@ mod tests { #[test] fn proposal_grace_period_not_expired() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); proposal.approved_at = Some(1); proposal.parameters.grace_period = 3; @@ -476,7 +487,7 @@ mod tests { #[test] fn proposal_grace_period_not_expired_because_of_not_approved_proposal() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); proposal.approved_at = None; proposal.parameters.grace_period = 3; @@ -486,7 +497,7 @@ mod tests { #[test] fn define_proposal_decision_status_returns_expired() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); let now = 5; proposal.created_at = 1; proposal.parameters.voting_period = 3; @@ -519,7 +530,7 @@ mod tests { #[test] fn define_proposal_decision_status_returns_approved() { let now = 2; - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); proposal.created_at = 1; proposal.parameters.voting_period = 3; proposal.parameters.approval_quorum_percentage = 60; @@ -552,7 +563,7 @@ mod tests { #[test] fn define_proposal_decision_status_returns_rejected() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); let now = 2; proposal.created_at = 1; @@ -585,7 +596,7 @@ mod tests { } #[test] fn define_proposal_decision_status_returns_slashed() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); let now = 2; proposal.created_at = 1; @@ -619,7 +630,7 @@ mod tests { #[test] fn define_proposal_decision_status_returns_none() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); let now = 2; proposal.created_at = 1; @@ -645,7 +656,7 @@ mod tests { #[test] fn define_proposal_decision_status_returns_approved_before_slashing_before_rejection() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); let now = 2; proposal.created_at = 1; @@ -684,7 +695,7 @@ fn define_proposal_decision_status_returns_approved_before_slashing_before_rejec #[test] fn define_proposal_decision_status_returns_slashed_before_rejection() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); let now = 2; proposal.created_at = 1; From 7419578ce15bf2acfd2969b512c483469c96fa7c Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Wed, 26 Feb 2020 12:15:20 +0300 Subject: [PATCH 052/286] Add comments --- modules/proposals/discussion/src/lib.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/proposals/discussion/src/lib.rs b/modules/proposals/discussion/src/lib.rs index 6879f314ab..1b502d2df7 100644 --- a/modules/proposals/discussion/src/lib.rs +++ b/modules/proposals/discussion/src/lib.rs @@ -2,7 +2,10 @@ //! Contains discussion subsystem for the proposals engine. //! //! Supported extrinsics: +//! - add_post - adds a post to existing discussion thread //! +//! Public API: +//! - create_discussion - creates a discussion //! // Ensure we're `no_std` when compiling for Wasm. From de1b9e353dc9fa5f14f60620664adf8a3692f954 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Thu, 27 Feb 2020 16:34:20 +0300 Subject: [PATCH 053/286] Add update_post() extrinsic - add update_post() extrinsic with tests - rename create_discussion() to the create_thread() --- modules/proposals/codex/src/lib.rs | 4 +- modules/proposals/discussion/src/lib.rs | 43 ++++++- modules/proposals/discussion/src/tests/mod.rs | 109 +++++++++++++++--- modules/proposals/discussion/src/types.rs | 8 +- 4 files changed, 138 insertions(+), 26 deletions(-) diff --git a/modules/proposals/codex/src/lib.rs b/modules/proposals/codex/src/lib.rs index 0fa695a9ac..31efbb65f1 100644 --- a/modules/proposals/codex/src/lib.rs +++ b/modules/proposals/codex/src/lib.rs @@ -108,7 +108,7 @@ decl_module! { let (cloned_origin1, cloned_origin2) = Self::double_origin(origin); - let discussion_thread_id = >::create_discussion( + let discussion_thread_id = >::create_thread( cloned_origin1, title.clone(), )?; @@ -157,7 +157,7 @@ decl_module! { let (cloned_origin1, cloned_origin2) = Self::double_origin(origin); - let discussion_thread_id = >::create_discussion( + let discussion_thread_id = >::create_thread( cloned_origin1, title.clone(), )?; diff --git a/modules/proposals/discussion/src/lib.rs b/modules/proposals/discussion/src/lib.rs index 1b502d2df7..973c2798b6 100644 --- a/modules/proposals/discussion/src/lib.rs +++ b/modules/proposals/discussion/src/lib.rs @@ -22,7 +22,7 @@ use rstd::clone::Clone; use rstd::prelude::*; use rstd::vec::Vec; use runtime_primitives::traits::EnsureOrigin; -use srml_support::{decl_module, decl_storage, Parameter}; +use srml_support::{decl_module, decl_storage, ensure, Parameter}; use types::{Post, Thread}; @@ -31,6 +31,12 @@ use types::{Post, Thread}; //TODO: select storage container for the posts (double map, inside thread)? //TODO: events? +// Post edition number limit. +const MAX_POST_EDITION_NUMBER: u32 = 5; + +const MSG_NOT_AUTHOR: &str = "Author should match the post creator"; +const MSG_POST_EDITION_NUMBER_EXCEEDED: &str = "Post edition limit reached."; + /// 'Proposal discussion' substrate module Trait pub trait Trait: system::Trait { /// Origin from which thread author must come. @@ -68,12 +74,17 @@ decl_storage! { /// Count of all posts that have been created. pub PostCount get(fn post_count): u32; + + /// Defines max post active edition number (edition number limit). Can be configured. + pub MaxPostEditionNumber get(max_post_edition_number) config(): u32 = MAX_POST_EDITION_NUMBER; } } decl_module! { /// 'Proposal discussion' substrate module pub struct Module for enum Call where origin: T::Origin { + + /// Adds a post with author origin check. pub fn add_post(origin, thread_id : T::ThreadId, text : Vec) { let account_id = T::ThreadAuthorOrigin::ensure_origin(origin)?; let post_author_id = T::PostAuthorId::from(account_id); @@ -84,7 +95,9 @@ decl_module! { let new_post = Post { text, created_at: Self::current_block(), + updated_at: Self::current_block(), author_id: post_author_id, + edition_number : 0, thread_id, }; @@ -92,6 +105,27 @@ decl_module! { >::insert(post_id, new_post); PostCount::put(next_post_count_value); } + + /// Updates a post with author origin check. Update attempts number is limited. + pub fn update_post(origin, post_id : T::PostId, text : Vec) { + let account_id = T::ThreadAuthorOrigin::ensure_origin(origin)?; + let post_author_id = T::PostAuthorId::from(account_id); + + let post = >::get(&post_id); + + ensure!(post.author_id == post_author_id, MSG_NOT_AUTHOR); + ensure!(post.edition_number < Self::max_post_edition_number(), + MSG_POST_EDITION_NUMBER_EXCEEDED); + + let new_post = Post { + text, + updated_at: Self::current_block(), + edition_number: post.edition_number + 1, + ..post + }; + + >::insert(post_id, new_post); + } } } @@ -101,11 +135,8 @@ impl Module { >::block_number() } - /// Create the discussion - pub fn create_discussion( - origin: T::Origin, - title: Vec, - ) -> Result { + /// Create the discussion thread + pub fn create_thread(origin: T::Origin, title: Vec) -> Result { let account_id = T::ThreadAuthorOrigin::ensure_origin(origin)?; let thread_author_id = T::ThreadAuthorId::from(account_id); diff --git a/modules/proposals/discussion/src/tests/mod.rs b/modules/proposals/discussion/src/tests/mod.rs index 5093b6e9ef..dbfefd5a29 100644 --- a/modules/proposals/discussion/src/tests/mod.rs +++ b/modules/proposals/discussion/src/tests/mod.rs @@ -5,6 +5,11 @@ use mock::*; use crate::*; use system::RawOrigin; +//TODO: create discussion content check +//TODO: add post content check +//TODO: update post content check +//TODO: update post ensures check + struct DiscussionFixture { pub title: Vec, pub origin: RawOrigin, @@ -13,27 +18,62 @@ struct DiscussionFixture { impl Default for DiscussionFixture { fn default() -> Self { DiscussionFixture { - title: b"text".to_vec(), + title: b"title".to_vec(), origin: RawOrigin::Signed(1), } } } +struct PostFixture { + pub text: Vec, + pub origin: RawOrigin, + pub thread_id: u32, + pub post_id: Option, +} + +impl PostFixture { + fn default_for_thread(thread_id: u32) -> Self { + PostFixture { + text: b"text".to_vec(), + thread_id, + origin: RawOrigin::Signed(1), + post_id: None, + } + } + + fn add_post_and_assert(&mut self, result: Result<(), &'static str>) { + let add_post_result = Discussions::add_post( + self.origin.clone().into(), + self.thread_id, + self.text.clone(), + ); + + assert_eq!(add_post_result, result); + + self.post_id = Some(::get()); + } + + fn update_post_and_assert(&mut self, result: Result<(), &'static str>) { + let add_post_result = Discussions::update_post( + self.origin.clone().into(), + self.thread_id, + self.text.clone(), + ); + + assert_eq!(add_post_result, result); + + self.post_id = Some(::get()); + } +} + impl DiscussionFixture { - fn create_discussion_and_assert(&self, result: Result<(), &'static str>) -> Option { + fn create_discussion_and_assert(&self, result: Result) -> Option { let create_discussion_result = - Discussions::create_discussion(self.origin.clone().into(), self.title.clone()); + Discussions::create_thread(self.origin.clone().into(), self.title.clone()); assert_eq!(create_discussion_result, result); - if result.is_ok() { - // last created thread id equals current thread count - let thread_id = ::get(); - - Some(thread_id) - } else { - None - } + create_discussion_result.ok() } } @@ -42,7 +82,7 @@ fn create_discussion_call_succeeds() { initial_test_ext().execute_with(|| { let discussion_fixture = DiscussionFixture::default(); - discussion_fixture.create_discussion_and_assert(Ok(())); + discussion_fixture.create_discussion_and_assert(Ok(1)); }); } @@ -52,13 +92,48 @@ fn create_post_call_succeeds() { let discussion_fixture = DiscussionFixture::default(); let thread_id = discussion_fixture - .create_discussion_and_assert(Ok(())) + .create_discussion_and_assert(Ok(1)) .unwrap(); - let origin = RawOrigin::Signed(1); - let create_discussion_result = - Discussions::add_post(origin.into(), thread_id, b"text".to_vec()); + let mut post_fixture = PostFixture::default_for_thread(thread_id); + + post_fixture.add_post_and_assert(Ok(())); + }); +} + +#[test] +fn update_post_call_succeeds() { + initial_test_ext().execute_with(|| { + let discussion_fixture = DiscussionFixture::default(); + + let thread_id = discussion_fixture + .create_discussion_and_assert(Ok(1)) + .unwrap(); + + let mut post_fixture = PostFixture::default_for_thread(thread_id); + + post_fixture.add_post_and_assert(Ok(())); + post_fixture.update_post_and_assert(Ok(())); + }); +} + +#[test] +fn update_post_call_failes_because_of_post_edition_limit() { + initial_test_ext().execute_with(|| { + let discussion_fixture = DiscussionFixture::default(); + + let thread_id = discussion_fixture + .create_discussion_and_assert(Ok(1)) + .unwrap(); + + let mut post_fixture = PostFixture::default_for_thread(thread_id); + + post_fixture.add_post_and_assert(Ok(())); + + for _ in 1..6 { + post_fixture.update_post_and_assert(Ok(())); + } - assert_eq!(create_discussion_result, Ok(())); + post_fixture.update_post_and_assert(Err("Post edition limit reached.")); }); } diff --git a/modules/proposals/discussion/src/types.rs b/modules/proposals/discussion/src/types.rs index 4c2c55def4..50a2d4f049 100644 --- a/modules/proposals/discussion/src/types.rs +++ b/modules/proposals/discussion/src/types.rs @@ -26,11 +26,17 @@ pub struct Post { pub text: Vec, /// When post was added. - pub created_at: BlockNumber, //TODO rename to updated_at? + pub created_at: BlockNumber, + + /// When post was updated last time. + pub updated_at: BlockNumber, /// Author of the post. pub author_id: PostAuthorId, /// Parent thread id for this post pub thread_id: ThreadId, + + /// Defines how many times this post was edited. Zero on creation. + pub edition_number: u32, } From 3ce4801f966effaa67bf3045fcf3f1277284008f Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Thu, 27 Feb 2020 16:43:59 +0300 Subject: [PATCH 054/286] Remove approved_at field from the Proposal --- modules/proposals/engine/src/lib.rs | 4 +- modules/proposals/engine/src/tests/mod.rs | 9 ----- modules/proposals/engine/src/types/mod.rs | 48 +++++++++++------------ 3 files changed, 25 insertions(+), 36 deletions(-) diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index eff1705ac9..2511d8ddc2 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -291,7 +291,6 @@ impl Module { proposer_id: proposer_id.clone(), proposal_type, status: ProposalStatus::Active, - approved_at: None, voting_results: VotingResults::default(), finalized_at: None, stake_id, @@ -375,7 +374,7 @@ impl Module { // Performs all actions on proposal finalization: // - clean active proposal cache - // - update proposal status fields (status, finalized_at, approved_at) + // - update proposal status fields (status, finalized_at) // - add to pending execution proposal cache if approved // - slash and unstake proposal stake if stake exists // - fire an event @@ -386,7 +385,6 @@ impl Module { let mut proposal = Self::proposals(proposal_id); if let ProposalDecisionStatus::Approved { .. } = decision_status { - proposal.approved_at = Some(Self::current_block()); >::insert(proposal_id, ()); } diff --git a/modules/proposals/engine/src/tests/mod.rs b/modules/proposals/engine/src/tests/mod.rs index 89a7fc9dca..068cd844cf 100644 --- a/modules/proposals/engine/src/tests/mod.rs +++ b/modules/proposals/engine/src/tests/mod.rs @@ -337,7 +337,6 @@ fn proposal_execution_succeeds() { status: ProposalStatus::approved(ApprovedProposalStatus::Executed), title: b"title".to_vec(), body: b"body".to_vec(), - approved_at: Some(1), voting_results: VotingResults { abstentions: 0, approvals: 4, @@ -388,7 +387,6 @@ fn proposal_execution_failed() { )), title: b"title".to_vec(), body: b"body".to_vec(), - approved_at: Some(1), voting_results: VotingResults { abstentions: 0, approvals: 4, @@ -579,7 +577,6 @@ fn cancel_proposal_succeeds() { status: ProposalStatus::finalized(ProposalDecisionStatus::Canceled), title: b"title".to_vec(), body: b"body".to_vec(), - approved_at: None, voting_results: VotingResults::default(), finalized_at: Some(1), stake_id: None, @@ -650,7 +647,6 @@ fn veto_proposal_succeeds() { status: ProposalStatus::finalized(ProposalDecisionStatus::Vetoed), title: b"title".to_vec(), body: b"body".to_vec(), - approved_at: None, voting_results: VotingResults::default(), finalized_at: Some(1), stake_id: None, @@ -783,7 +779,6 @@ fn create_proposal_and_expire_it() { status: ProposalStatus::finalized(ProposalDecisionStatus::Expired), title: b"title".to_vec(), body: b"body".to_vec(), - approved_at: None, voting_results: VotingResults::default(), finalized_at: Some(4), stake_id: None, @@ -827,7 +822,6 @@ fn proposal_execution_postponed_because_of_grace_period() { status: ProposalStatus::approved(ApprovedProposalStatus::PendingExecution), title: b"title".to_vec(), body: b"body".to_vec(), - approved_at: Some(1), finalized_at: Some(1), voting_results: VotingResults { abstentions: 0, @@ -872,7 +866,6 @@ fn proposal_execution_succeeds_after_the_grace_period() { status: ProposalStatus::approved(ApprovedProposalStatus::PendingExecution), title: b"title".to_vec(), body: b"body".to_vec(), - approved_at: Some(1), finalized_at: Some(1), voting_results: VotingResults { abstentions: 0, @@ -978,7 +971,6 @@ fn create_dummy_proposal_succeeds_with_stake() { status: ProposalStatus::Active, title: b"title".to_vec(), body: b"body".to_vec(), - approved_at: None, voting_results: VotingResults::default(), finalized_at: None, stake_id: Some(0), // valid stake_id @@ -1224,7 +1216,6 @@ fn finalize_proposal_failed_using_stake_mocks() { ), title: b"title".to_vec(), body: b"body".to_vec(), - approved_at: None, finalized_at: Some(4), voting_results: VotingResults::default(), stake_id: Some(1), diff --git a/modules/proposals/engine/src/types/mod.rs b/modules/proposals/engine/src/types/mod.rs index eabef233c3..c02195ae42 100644 --- a/modules/proposals/engine/src/types/mod.rs +++ b/modules/proposals/engine/src/types/mod.rs @@ -232,9 +232,6 @@ pub struct Proposal { /// When it was created. pub created_at: BlockNumber, - /// When it was approved. - pub approved_at: Option, - /// Current proposal status pub status: ProposalStatus, @@ -259,11 +256,11 @@ where /// Returns whether grace period expired by now. Returns false if not approved. pub fn is_grace_period_expired(&self, now: BlockNumber) -> bool { - if let Some(approved_at) = self.approved_at { - now >= approved_at + self.parameters.grace_period - } else { - false + if let Some(approved_at) = self.finalized_at { + return now >= approved_at + self.parameters.grace_period; } + + false } /// Determines the finalized proposal status using voting results tally for current proposal. @@ -424,9 +421,12 @@ pub(crate) struct FinalizedProposalData; + #[test] fn proposal_voting_period_expired() { - let mut proposal = Proposal::::default(); + let mut proposal = ProposalObject::default(); proposal.created_at = 1; proposal.parameters.voting_period = 3; @@ -436,7 +436,7 @@ mod tests { #[test] fn proposal_voting_period_not_expired() { - let mut proposal = Proposal::::default(); + let mut proposal = ProposalObject::default(); proposal.created_at = 1; proposal.parameters.voting_period = 3; @@ -446,9 +446,9 @@ mod tests { #[test] fn proposal_grace_period_expired() { - let mut proposal = Proposal::::default(); + let mut proposal = ProposalObject::default(); - proposal.approved_at = Some(1); + proposal.finalized_at = Some(1); proposal.parameters.grace_period = 3; assert!(proposal.is_grace_period_expired(4)); @@ -456,9 +456,9 @@ mod tests { #[test] fn proposal_grace_period_auto_expired() { - let mut proposal = Proposal::::default(); + let mut proposal = ProposalObject::default(); - proposal.approved_at = Some(1); + proposal.finalized_at = Some(1); proposal.parameters.grace_period = 0; assert!(proposal.is_grace_period_expired(1)); @@ -466,9 +466,9 @@ mod tests { #[test] fn proposal_grace_period_not_expired() { - let mut proposal = Proposal::::default(); + let mut proposal = ProposalObject::default(); - proposal.approved_at = Some(1); + proposal.finalized_at = Some(1); proposal.parameters.grace_period = 3; assert!(!proposal.is_grace_period_expired(3)); @@ -476,9 +476,9 @@ mod tests { #[test] fn proposal_grace_period_not_expired_because_of_not_approved_proposal() { - let mut proposal = Proposal::::default(); + let mut proposal = ProposalObject::default(); - proposal.approved_at = None; + proposal.finalized_at = None; proposal.parameters.grace_period = 3; assert!(!proposal.is_grace_period_expired(3)); @@ -486,7 +486,7 @@ mod tests { #[test] fn define_proposal_decision_status_returns_expired() { - let mut proposal = Proposal::::default(); + let mut proposal = ProposalObject::default(); let now = 5; proposal.created_at = 1; proposal.parameters.voting_period = 3; @@ -519,7 +519,7 @@ mod tests { #[test] fn define_proposal_decision_status_returns_approved() { let now = 2; - let mut proposal = Proposal::::default(); + let mut proposal = ProposalObject::default(); proposal.created_at = 1; proposal.parameters.voting_period = 3; proposal.parameters.approval_quorum_percentage = 60; @@ -552,7 +552,7 @@ mod tests { #[test] fn define_proposal_decision_status_returns_rejected() { - let mut proposal = Proposal::::default(); + let mut proposal = ProposalObject::default(); let now = 2; proposal.created_at = 1; @@ -585,7 +585,7 @@ mod tests { } #[test] fn define_proposal_decision_status_returns_slashed() { - let mut proposal = Proposal::::default(); + let mut proposal = ProposalObject::default(); let now = 2; proposal.created_at = 1; @@ -619,7 +619,7 @@ mod tests { #[test] fn define_proposal_decision_status_returns_none() { - let mut proposal = Proposal::::default(); + let mut proposal = ProposalObject::default(); let now = 2; proposal.created_at = 1; @@ -645,7 +645,7 @@ mod tests { #[test] fn define_proposal_decision_status_returns_approved_before_slashing_before_rejection() { - let mut proposal = Proposal::::default(); + let mut proposal = tests::ProposalObject::default(); let now = 2; proposal.created_at = 1; @@ -684,7 +684,7 @@ fn define_proposal_decision_status_returns_approved_before_slashing_before_rejec #[test] fn define_proposal_decision_status_returns_slashed_before_rejection() { - let mut proposal = Proposal::::default(); + let mut proposal = tests::ProposalObject::default(); let now = 2; proposal.created_at = 1; From f2746e037ab15f9b9be45ec92f455821d94fcc02 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Thu, 27 Feb 2020 17:57:07 +0300 Subject: [PATCH 055/286] Move finalized_at to the FinalizationData - move finalized_at from Proposal to the FinalizationStatus - rename FinalizationStatus to the FinalizationData - move out all proposal statuses to the separate module - fix tests --- modules/proposals/engine/src/lib.rs | 58 ++-- modules/proposals/engine/src/tests/mod.rs | 45 ++- modules/proposals/engine/src/types/mod.rs | 278 ++++++------------ .../engine/src/types/proposal_statuses.rs | 134 +++++++++ 4 files changed, 278 insertions(+), 237 deletions(-) create mode 100644 modules/proposals/engine/src/types/proposal_statuses.rs diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index 2511d8ddc2..a8504b8eed 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -24,8 +24,8 @@ pub use types::BalanceOf; use types::FinalizedProposalData; pub use types::VotingResults; pub use types::{ - ApprovedProposalStatus, FinalizationStatus, Proposal, ProposalDecisionStatus, - ProposalParameters, ProposalStatus, + ApprovedProposalStatus, FinalizationData, Proposal, ProposalDecisionStatus, ProposalParameters, + ProposalStatus, }; pub use types::{DefaultStakeHandlerProvider, StakeHandler, StakeHandlerProvider}; pub use types::{ProposalCodeDecoder, ProposalExecutable}; @@ -93,6 +93,7 @@ decl_event!( ::ProposalId, ::ProposerId, ::VoterId, + ::BlockNumber, { /// Emits on proposal creation. /// Params: @@ -104,7 +105,7 @@ decl_event!( /// Params: /// - Id of a updated proposal. /// - New proposal status - ProposalStatusUpdated(ProposalId, ProposalStatus), + ProposalStatusUpdated(ProposalId, ProposalStatus), /// Emits on voting for the proposal /// Params: @@ -292,7 +293,6 @@ impl Module { proposal_type, status: ProposalStatus::Active, voting_results: VotingResults::default(), - finalized_at: None, stake_id, }; @@ -343,32 +343,39 @@ impl Module { // Executes approved proposal code fn execute_proposal(proposal_id: T::ProposalId) { let mut proposal = Self::proposals(proposal_id); - let proposal_code = Self::proposal_codes(proposal_id); - let proposal_code_result = - T::ProposalCodeDecoder::decode_proposal(proposal.proposal_type, proposal_code); + // Execute only proposals with correct status + if let ProposalStatus::Finalized(finalized_status) = proposal.status.clone() { + let proposal_code = Self::proposal_codes(proposal_id); - let approved_proposal_status = match proposal_code_result { - Ok(proposal_code) => { - if let Err(error) = proposal_code.execute() { - ApprovedProposalStatus::failed_execution(error) - } else { - ApprovedProposalStatus::Executed + let proposal_code_result = + T::ProposalCodeDecoder::decode_proposal(proposal.proposal_type, proposal_code); + + let approved_proposal_status = match proposal_code_result { + Ok(proposal_code) => { + if let Err(error) = proposal_code.execute() { + ApprovedProposalStatus::failed_execution(error) + } else { + ApprovedProposalStatus::Executed + } } - } - Err(error) => ApprovedProposalStatus::failed_execution(error), - }; + Err(error) => ApprovedProposalStatus::failed_execution(error), + }; - let proposal_execution_status = ProposalStatus::approved(approved_proposal_status); + let proposal_execution_status = + finalized_status.create_approved_proposal_status(approved_proposal_status); - proposal.status = proposal_execution_status.clone(); - >::insert(proposal_id, proposal); + proposal.status = proposal_execution_status.clone(); + >::insert(proposal_id, proposal); - Self::deposit_event(RawEvent::ProposalStatusUpdated( - proposal_id, - proposal_execution_status, - )); + Self::deposit_event(RawEvent::ProposalStatusUpdated( + proposal_id, + proposal_execution_status, + )); + } + // Remove proposals from the 'pending execution' queue even in case of not finalized status + // to prevent eternal cycles. >::remove(&proposal_id); } @@ -397,11 +404,10 @@ impl Module { } // create finalized proposal status with error if any - let new_proposal_status = - ProposalStatus::finalized_with_error(decision_status, slash_and_unstake_result.err()); + let new_proposal_status = //TODO rename without an error + ProposalStatus::finalized_with_error(decision_status, slash_and_unstake_result.err(), Self::current_block()); proposal.status = new_proposal_status.clone(); - proposal.finalized_at = Some(Self::current_block()); >::insert(proposal_id, proposal); Self::deposit_event(RawEvent::ProposalStatusUpdated( diff --git a/modules/proposals/engine/src/tests/mod.rs b/modules/proposals/engine/src/tests/mod.rs index 068cd844cf..472fcb20ee 100644 --- a/modules/proposals/engine/src/tests/mod.rs +++ b/modules/proposals/engine/src/tests/mod.rs @@ -236,7 +236,7 @@ impl VoteGenerator { struct EventFixture; impl EventFixture { - fn assert_events(expected_raw_events: Vec>) { + fn assert_events(expected_raw_events: Vec>) { let expected_events = expected_raw_events .iter() .map(|ev| EventRecord { @@ -334,7 +334,7 @@ fn proposal_execution_succeeds() { parameters: parameters_fixture.params(), proposer_id: 1, created_at: 1, - status: ProposalStatus::approved(ApprovedProposalStatus::Executed), + status: ProposalStatus::approved(ApprovedProposalStatus::Executed, 1), title: b"title".to_vec(), body: b"body".to_vec(), voting_results: VotingResults { @@ -343,7 +343,6 @@ fn proposal_execution_succeeds() { rejections: 0, slashes: 0, }, - finalized_at: Some(1), stake_id: None, } ); @@ -382,9 +381,10 @@ fn proposal_execution_failed() { parameters: parameters_fixture.params(), proposer_id: 1, created_at: 1, - status: ProposalStatus::approved(ApprovedProposalStatus::failed_execution( - "ExecutionFailed" - )), + status: ProposalStatus::approved( + ApprovedProposalStatus::failed_execution("ExecutionFailed"), + 1 + ), title: b"title".to_vec(), body: b"body".to_vec(), voting_results: VotingResults { @@ -393,7 +393,6 @@ fn proposal_execution_failed() { rejections: 0, slashes: 0, }, - finalized_at: Some(1), stake_id: None, } ) @@ -467,7 +466,7 @@ fn rejected_voting_results_and_remove_proposal_id_from_active_succeeds() { assert_eq!( proposal.status, - ProposalStatus::finalized(ProposalDecisionStatus::Rejected), + ProposalStatus::finalized(ProposalDecisionStatus::Rejected, 1), ); assert!(!>::exists(proposal_id)); }); @@ -574,11 +573,10 @@ fn cancel_proposal_succeeds() { parameters: parameters_fixture.params(), proposer_id: 1, created_at: 1, - status: ProposalStatus::finalized(ProposalDecisionStatus::Canceled), + status: ProposalStatus::finalized(ProposalDecisionStatus::Canceled, 1), title: b"title".to_vec(), body: b"body".to_vec(), voting_results: VotingResults::default(), - finalized_at: Some(1), stake_id: None, } ) @@ -644,11 +642,10 @@ fn veto_proposal_succeeds() { parameters: parameters_fixture.params(), proposer_id: 1, created_at: 1, - status: ProposalStatus::finalized(ProposalDecisionStatus::Vetoed), + status: ProposalStatus::finalized(ProposalDecisionStatus::Vetoed, 1), title: b"title".to_vec(), body: b"body".to_vec(), voting_results: VotingResults::default(), - finalized_at: Some(1), stake_id: None, } ); @@ -713,7 +710,7 @@ fn veto_proposal_event_emitted() { RawEvent::ProposalCreated(1, 1), RawEvent::ProposalStatusUpdated( 1, - ProposalStatus::finalized(ProposalDecisionStatus::Vetoed), + ProposalStatus::finalized(ProposalDecisionStatus::Vetoed, 1), ), ]); }); @@ -732,9 +729,10 @@ fn cancel_proposal_event_emitted() { RawEvent::ProposalCreated(1, 1), RawEvent::ProposalStatusUpdated( 1, - ProposalStatus::Finalized(FinalizationStatus { + ProposalStatus::Finalized(FinalizationData { proposal_status: ProposalDecisionStatus::Canceled, finalization_error: None, + finalized_at: 1, }), ), ]); @@ -776,11 +774,10 @@ fn create_proposal_and_expire_it() { parameters: parameters_fixture.params(), proposer_id: 1, created_at: 1, - status: ProposalStatus::finalized(ProposalDecisionStatus::Expired), + status: ProposalStatus::finalized(ProposalDecisionStatus::Expired, 4), title: b"title".to_vec(), body: b"body".to_vec(), voting_results: VotingResults::default(), - finalized_at: Some(4), stake_id: None, } ) @@ -819,10 +816,9 @@ fn proposal_execution_postponed_because_of_grace_period() { parameters: parameters_fixture.params(), proposer_id: 1, created_at: 1, - status: ProposalStatus::approved(ApprovedProposalStatus::PendingExecution), + status: ProposalStatus::approved(ApprovedProposalStatus::PendingExecution, 1), title: b"title".to_vec(), body: b"body".to_vec(), - finalized_at: Some(1), voting_results: VotingResults { abstentions: 0, approvals: 4, @@ -863,10 +859,9 @@ fn proposal_execution_succeeds_after_the_grace_period() { parameters: parameters_fixture.params(), proposer_id: 1, created_at: 1, - status: ProposalStatus::approved(ApprovedProposalStatus::PendingExecution), + status: ProposalStatus::approved(ApprovedProposalStatus::PendingExecution, 1), title: b"title".to_vec(), body: b"body".to_vec(), - finalized_at: Some(1), voting_results: VotingResults { abstentions: 0, approvals: 4, @@ -882,7 +877,7 @@ fn proposal_execution_succeeds_after_the_grace_period() { proposal = >::get(proposal_id); - expected_proposal.status = ProposalStatus::approved(ApprovedProposalStatus::Executed); + expected_proposal.status = ProposalStatus::approved(ApprovedProposalStatus::Executed, 1); assert_eq!(proposal, expected_proposal); @@ -972,7 +967,6 @@ fn create_dummy_proposal_succeeds_with_stake() { title: b"title".to_vec(), body: b"body".to_vec(), voting_results: VotingResults::default(), - finalized_at: None, stake_id: Some(0), // valid stake_id } ) @@ -1161,9 +1155,10 @@ fn proposal_slashing_succeeds() { assert_eq!( proposal.status, - ProposalStatus::Finalized(FinalizationStatus { + ProposalStatus::Finalized(FinalizationData { proposal_status: ProposalDecisionStatus::Slashed, finalization_error: None, + finalized_at: 1, }), ); assert!(!>::exists(proposal_id)); @@ -1212,11 +1207,11 @@ fn finalize_proposal_failed_using_stake_mocks() { created_at: 1, status: ProposalStatus::finalized_with_error( ProposalDecisionStatus::Expired, - Some("Cannot remove stake") + Some("Cannot remove stake"), + 4, ), title: b"title".to_vec(), body: b"body".to_vec(), - finalized_at: Some(4), voting_results: VotingResults::default(), stake_id: Some(1), } diff --git a/modules/proposals/engine/src/types/mod.rs b/modules/proposals/engine/src/types/mod.rs index c02195ae42..a6c3a253a1 100644 --- a/modules/proposals/engine/src/types/mod.rs +++ b/modules/proposals/engine/src/types/mod.rs @@ -11,8 +11,12 @@ use serde::{Deserialize, Serialize}; use srml_support::dispatch; use srml_support::traits::Currency; +mod proposal_statuses; mod stakes; +pub use proposal_statuses::{ + ApprovedProposalStatus, FinalizationData, ProposalDecisionStatus, ProposalStatus, +}; pub use stakes::{DefaultStakeHandlerProvider, StakeHandler, StakeHandlerProvider}; #[cfg(test)] @@ -21,110 +25,6 @@ pub(crate) use stakes::DefaultStakeHandler; #[cfg(test)] pub(crate) use stakes::MockStakeHandler; -/// Current status of the proposal -#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] -#[derive(Encode, Decode, Clone, PartialEq, Eq, Debug)] -pub enum ProposalStatus { - /// A new proposal that is available for voting. - Active, - - /// The proposal decision was made. - Finalized(FinalizationStatus), -} - -impl ProposalStatus { - /// ProposalStatus helper, creates ExecutionFailed approved proposal status - pub fn approved(approved_status: ApprovedProposalStatus) -> ProposalStatus { - ProposalStatus::Finalized(FinalizationStatus { - proposal_status: ProposalDecisionStatus::Approved(approved_status), - finalization_error: None, - }) - } - - /// Creates finalized proposal status with provided ProposalDecisionStatus - pub fn finalized(decision_status: ProposalDecisionStatus) -> ProposalStatus { - Self::finalized_with_error(decision_status, None) - } - - /// Creates finalized proposal status with provided ProposalDecisionStatus and error - pub fn finalized_with_error( - decision_status: ProposalDecisionStatus, - finalization_error: Option<&str>, - ) -> ProposalStatus { - ProposalStatus::Finalized(FinalizationStatus { - proposal_status: decision_status, - finalization_error: finalization_error.map(|err| err.as_bytes().to_vec()), - }) - } -} - -/// Final proposal status and potential error. -#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] -#[derive(Encode, Decode, Clone, PartialEq, Eq, Debug)] -pub struct FinalizationStatus { - /// Final proposal status - pub proposal_status: ProposalDecisionStatus, - - /// Error occured during the proposal finalization - pub finalization_error: Option>, -} - -/// Status of the approved proposal. Defines execution stages. -#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] -#[derive(Encode, Decode, Clone, PartialEq, Eq, Debug)] -pub enum ApprovedProposalStatus { - /// A proposal was approved and grace period is in effect - PendingExecution, - - /// Proposal was successfully executed - Executed, - - /// Proposal was executed and failed with an error - ExecutionFailed { - /// Error message - error: Vec, - }, -} - -impl ApprovedProposalStatus { - /// ApprovedProposalStatus helper, creates ExecutionFailed approved proposal status - pub fn failed_execution(err: &str) -> ApprovedProposalStatus { - ApprovedProposalStatus::ExecutionFailed { - error: err.as_bytes().to_vec(), - } - } -} - -/// Status for the proposal with finalized decision -#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] -#[derive(Encode, Decode, Clone, PartialEq, Eq, Debug)] -pub enum ProposalDecisionStatus { - /// Proposal was withdrawn by its proposer. - Canceled, - - /// Proposal was vetoed by root. - Vetoed, - - /// A proposal was rejected - Rejected, - - /// A proposal was rejected ans its stake should be slashed - Slashed, - - /// Not enough votes and voting period expired. - Expired, - - /// To clear the quorum requirement, the percentage of council members with revealed votes - /// must be no less than the quorum value for the given proposal type. - Approved(ApprovedProposalStatus), -} - -impl Default for ProposalStatus { - fn default() -> Self { - ProposalStatus::Active - } -} - /// Vote kind for the proposal. Sum of all votes defines proposal status. #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] #[derive(Encode, Decode, Clone, PartialEq, Eq, Debug)] @@ -233,14 +133,11 @@ pub struct Proposal { pub created_at: BlockNumber, /// Current proposal status - pub status: ProposalStatus, + pub status: ProposalStatus, /// Curring voting result for the proposal pub voting_results: VotingResults, - /// Proposal finalization block number - pub finalized_at: Option, - /// Created stake id for the proposal pub stake_id: Option, } @@ -254,10 +151,14 @@ where now >= self.created_at + self.parameters.voting_period } - /// Returns whether grace period expired by now. Returns false if not approved. + /// Returns whether grace period expired by now. + /// Grace period can be expired only if proposal is finalized with Approved status. + /// Returns false otherwise. pub fn is_grace_period_expired(&self, now: BlockNumber) -> bool { - if let Some(approved_at) = self.finalized_at { - return now >= approved_at + self.parameters.grace_period; + if let ProposalStatus::Finalized(finalized_status) = self.status.clone() { + if let ProposalDecisionStatus::Approved(_) = finalized_status.proposal_status { + return now >= finalized_status.finalized_at + self.parameters.grace_period; + } } false @@ -422,7 +323,7 @@ mod tests { use crate::*; // Alias introduced for simplicity of changing Proposal exact types. - pub type ProposalObject = Proposal; + type ProposalObject = Proposal; #[test] fn proposal_voting_period_expired() { @@ -448,8 +349,11 @@ mod tests { fn proposal_grace_period_expired() { let mut proposal = ProposalObject::default(); - proposal.finalized_at = Some(1); proposal.parameters.grace_period = 3; + proposal.status = ProposalStatus::finalized( + ProposalDecisionStatus::Approved(ApprovedProposalStatus::PendingExecution), + 0, + ); assert!(proposal.is_grace_period_expired(4)); } @@ -458,8 +362,11 @@ mod tests { fn proposal_grace_period_auto_expired() { let mut proposal = ProposalObject::default(); - proposal.finalized_at = Some(1); proposal.parameters.grace_period = 0; + proposal.status = ProposalStatus::finalized( + ProposalDecisionStatus::Approved(ApprovedProposalStatus::PendingExecution), + 0, + ); assert!(proposal.is_grace_period_expired(1)); } @@ -468,7 +375,6 @@ mod tests { fn proposal_grace_period_not_expired() { let mut proposal = ProposalObject::default(); - proposal.finalized_at = Some(1); proposal.parameters.grace_period = 3; assert!(!proposal.is_grace_period_expired(3)); @@ -478,7 +384,6 @@ mod tests { fn proposal_grace_period_not_expired_because_of_not_approved_proposal() { let mut proposal = ProposalObject::default(); - proposal.finalized_at = None; proposal.parameters.grace_period = 3; assert!(!proposal.is_grace_period_expired(3)); @@ -583,6 +488,7 @@ mod tests { Some(ProposalDecisionStatus::Rejected) ); } + #[test] fn define_proposal_decision_status_returns_slashed() { let mut proposal = ProposalObject::default(); @@ -641,80 +547,80 @@ mod tests { let expected_proposal_status = proposal.define_proposal_decision_status(5, now); assert_eq!(expected_proposal_status, None); } -} -#[test] -fn define_proposal_decision_status_returns_approved_before_slashing_before_rejection() { - let mut proposal = tests::ProposalObject::default(); - let now = 2; - - proposal.created_at = 1; - proposal.parameters.voting_period = 3; - proposal.parameters.approval_quorum_percentage = 50; - proposal.parameters.approval_threshold_percentage = 30; - proposal.parameters.slashing_quorum_percentage = 50; - proposal.parameters.slashing_threshold_percentage = 30; - - proposal.voting_results.add_vote(VoteKind::Approve); - proposal.voting_results.add_vote(VoteKind::Approve); - proposal.voting_results.add_vote(VoteKind::Reject); - proposal.voting_results.add_vote(VoteKind::Reject); - proposal.voting_results.add_vote(VoteKind::Slash); - proposal.voting_results.add_vote(VoteKind::Slash); - - assert_eq!( - proposal.voting_results, - VotingResults { - abstentions: 0, - approvals: 2, - rejections: 2, - slashes: 2, - } - ); + #[test] + fn define_proposal_decision_status_returns_approved_before_slashing_before_rejection() { + let mut proposal = ProposalObject::default(); + let now = 2; - let expected_proposal_status = proposal.define_proposal_decision_status(6, now); + proposal.created_at = 1; + proposal.parameters.voting_period = 3; + proposal.parameters.approval_quorum_percentage = 50; + proposal.parameters.approval_threshold_percentage = 30; + proposal.parameters.slashing_quorum_percentage = 50; + proposal.parameters.slashing_threshold_percentage = 30; - assert_eq!( - expected_proposal_status, - Some(ProposalDecisionStatus::Approved( - ApprovedProposalStatus::PendingExecution - )) - ); -} + proposal.voting_results.add_vote(VoteKind::Approve); + proposal.voting_results.add_vote(VoteKind::Approve); + proposal.voting_results.add_vote(VoteKind::Reject); + proposal.voting_results.add_vote(VoteKind::Reject); + proposal.voting_results.add_vote(VoteKind::Slash); + proposal.voting_results.add_vote(VoteKind::Slash); -#[test] -fn define_proposal_decision_status_returns_slashed_before_rejection() { - let mut proposal = tests::ProposalObject::default(); - let now = 2; - - proposal.created_at = 1; - proposal.parameters.voting_period = 3; - proposal.parameters.approval_quorum_percentage = 50; - proposal.parameters.approval_threshold_percentage = 30; - proposal.parameters.slashing_quorum_percentage = 50; - proposal.parameters.slashing_threshold_percentage = 30; - - proposal.voting_results.add_vote(VoteKind::Abstain); - proposal.voting_results.add_vote(VoteKind::Approve); - proposal.voting_results.add_vote(VoteKind::Reject); - proposal.voting_results.add_vote(VoteKind::Reject); - proposal.voting_results.add_vote(VoteKind::Slash); - proposal.voting_results.add_vote(VoteKind::Slash); - - assert_eq!( - proposal.voting_results, - VotingResults { - abstentions: 1, - approvals: 1, - rejections: 2, - slashes: 2, - } - ); + assert_eq!( + proposal.voting_results, + VotingResults { + abstentions: 0, + approvals: 2, + rejections: 2, + slashes: 2, + } + ); + + let expected_proposal_status = proposal.define_proposal_decision_status(6, now); + + assert_eq!( + expected_proposal_status, + Some(ProposalDecisionStatus::Approved( + ApprovedProposalStatus::PendingExecution + )) + ); + } - let expected_proposal_status = proposal.define_proposal_decision_status(6, now); + #[test] + fn define_proposal_decision_status_returns_slashed_before_rejection() { + let mut proposal = ProposalObject::default(); + let now = 2; - assert_eq!( - expected_proposal_status, - Some(ProposalDecisionStatus::Slashed) - ); + proposal.created_at = 1; + proposal.parameters.voting_period = 3; + proposal.parameters.approval_quorum_percentage = 50; + proposal.parameters.approval_threshold_percentage = 30; + proposal.parameters.slashing_quorum_percentage = 50; + proposal.parameters.slashing_threshold_percentage = 30; + + proposal.voting_results.add_vote(VoteKind::Abstain); + proposal.voting_results.add_vote(VoteKind::Approve); + proposal.voting_results.add_vote(VoteKind::Reject); + proposal.voting_results.add_vote(VoteKind::Reject); + proposal.voting_results.add_vote(VoteKind::Slash); + proposal.voting_results.add_vote(VoteKind::Slash); + + assert_eq!( + proposal.voting_results, + VotingResults { + abstentions: 1, + approvals: 1, + rejections: 2, + slashes: 2, + } + ); + + let expected_proposal_status = proposal.define_proposal_decision_status(6, now); + + assert_eq!( + expected_proposal_status, + Some(ProposalDecisionStatus::Slashed) + ); + } } diff --git a/modules/proposals/engine/src/types/proposal_statuses.rs b/modules/proposals/engine/src/types/proposal_statuses.rs new file mode 100644 index 0000000000..f9100a48cc --- /dev/null +++ b/modules/proposals/engine/src/types/proposal_statuses.rs @@ -0,0 +1,134 @@ +use codec::{Decode, Encode}; +use rstd::prelude::*; + +#[cfg(feature = "std")] +use serde::{Deserialize, Serialize}; + +/// Current status of the proposal +#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive(Encode, Decode, Clone, PartialEq, Eq, Debug)] +pub enum ProposalStatus { + /// A new proposal that is available for voting. + Active, + + /// The proposal decision was made. + Finalized(FinalizationData), +} + +impl Default for ProposalStatus { + fn default() -> Self { + ProposalStatus::Active + } +} + +impl ProposalStatus { + /// Creates finalized proposal status with provided ProposalDecisionStatus + pub fn finalized( + decision_status: ProposalDecisionStatus, + now: BlockNumber, + ) -> ProposalStatus { + Self::finalized_with_error(decision_status, None, now) + } + + /// Creates finalized proposal status with provided ProposalDecisionStatus and error + pub fn finalized_with_error( + decision_status: ProposalDecisionStatus, + finalization_error: Option<&str>, + now: BlockNumber, + ) -> ProposalStatus { + ProposalStatus::Finalized(FinalizationData { + proposal_status: decision_status, + finalization_error: finalization_error.map(|err| err.as_bytes().to_vec()), + finalized_at: now, + }) + } + + /// Creates finalized and approved proposal status with provided ApprovedProposalStatus + pub fn approved( + approved_status: ApprovedProposalStatus, + now: BlockNumber, + ) -> ProposalStatus { + ProposalStatus::Finalized(FinalizationData { + proposal_status: ProposalDecisionStatus::Approved(approved_status), + finalization_error: None, + finalized_at: now, + }) + } +} + +/// Final proposal status and potential error. +#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive(Encode, Decode, Clone, PartialEq, Eq, Debug)] +pub struct FinalizationData { + /// Final proposal status + pub proposal_status: ProposalDecisionStatus, + + /// Proposal finalization block number + pub finalized_at: BlockNumber, + + /// Error occured during the proposal finalization + pub finalization_error: Option>, +} + +impl FinalizationData { + /// FinalizationData helper, creates ApprovedProposalStatus + pub fn create_approved_proposal_status( + self, + approved_status: ApprovedProposalStatus, + ) -> ProposalStatus { + ProposalStatus::Finalized(FinalizationData { + proposal_status: ProposalDecisionStatus::Approved(approved_status), + ..self + }) + } +} + +/// Status of the approved proposal. Defines execution stages. +#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive(Encode, Decode, Clone, PartialEq, Eq, Debug)] +pub enum ApprovedProposalStatus { + /// A proposal was approved and grace period is in effect + PendingExecution, + + /// Proposal was successfully executed + Executed, + + /// Proposal was executed and failed with an error + ExecutionFailed { + /// Error message + error: Vec, + }, +} + +impl ApprovedProposalStatus { + /// ApprovedProposalStatus helper, creates ExecutionFailed approved proposal status + pub fn failed_execution(err: &str) -> ApprovedProposalStatus { + ApprovedProposalStatus::ExecutionFailed { + error: err.as_bytes().to_vec(), + } + } +} + +/// Status for the proposal with finalized decision +#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive(Encode, Decode, Clone, PartialEq, Eq, Debug)] +pub enum ProposalDecisionStatus { + /// Proposal was withdrawn by its proposer. + Canceled, + + /// Proposal was vetoed by root. + Vetoed, + + /// A proposal was rejected + Rejected, + + /// A proposal was rejected ans its stake should be slashed + Slashed, + + /// Not enough votes and voting period expired. + Expired, + + /// To clear the quorum requirement, the percentage of council members with revealed votes + /// must be no less than the quorum value for the given proposal type. + Approved(ApprovedProposalStatus), +} From bcf3c659bd6d4d274495a19831bc3bce5723719a Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Thu, 27 Feb 2020 18:31:45 +0300 Subject: [PATCH 056/286] Move proposal parameters to the separate module --- modules/proposals/codex/src/lib.rs | 20 ++------------ .../proposals/codex/src/proposal_types/mod.rs | 2 ++ .../codex/src/proposal_types/parameters.rs | 27 +++++++++++++++++++ 3 files changed, 31 insertions(+), 18 deletions(-) create mode 100644 modules/proposals/codex/src/proposal_types/parameters.rs diff --git a/modules/proposals/codex/src/lib.rs b/modules/proposals/codex/src/lib.rs index 3cde240176..03b9237ff3 100644 --- a/modules/proposals/codex/src/lib.rs +++ b/modules/proposals/codex/src/lib.rs @@ -84,15 +84,7 @@ decl_module! { text: Vec, stake_balance: Option>, ) { - let parameters = crate::ProposalParameters { - voting_period: T::BlockNumber::from(50000u32), - grace_period: T::BlockNumber::from(10000u32), - approval_quorum_percentage: 40, - approval_threshold_percentage: 51, - slashing_quorum_percentage: 80, - slashing_threshold_percentage: 80, - required_stake: Some(>::from(500u32)) - }; + let parameters = proposal_types::parameters::text_proposal::(); ensure!(!text.is_empty(), Error::TextProposalIsEmpty); ensure!(text.len() as u32 <= Self::text_max_len(), @@ -124,15 +116,7 @@ decl_module! { wasm: Vec, stake_balance: Option>, ) { - let parameters = crate::ProposalParameters { - voting_period: T::BlockNumber::from(50000u32), - grace_period: T::BlockNumber::from(10000u32), - approval_quorum_percentage: 80, - approval_threshold_percentage: 80, - slashing_quorum_percentage: 80, - slashing_threshold_percentage: 80, - required_stake: Some(>::from(50000u32)) - }; + let parameters = proposal_types::parameters::upgrade_runtime::(); ensure!(!wasm.is_empty(), Error::RuntimeProposalIsEmpty); ensure!(wasm.len() as u32 <= Self::wasm_max_len(), diff --git a/modules/proposals/codex/src/proposal_types/mod.rs b/modules/proposals/codex/src/proposal_types/mod.rs index 3553713b8b..ed08cabf9d 100644 --- a/modules/proposals/codex/src/proposal_types/mod.rs +++ b/modules/proposals/codex/src/proposal_types/mod.rs @@ -7,6 +7,7 @@ use crate::{ProposalCodeDecoder, ProposalExecutable}; mod runtime_upgrade; mod text_proposal; +pub mod parameters; pub use runtime_upgrade::RuntimeUpgradeProposalExecutable; pub use text_proposal::TextProposalExecutable; @@ -50,3 +51,4 @@ impl ProposalCodeDecoder for ProposalType { .compose_executable::(proposal_code) } } + diff --git a/modules/proposals/codex/src/proposal_types/parameters.rs b/modules/proposals/codex/src/proposal_types/parameters.rs new file mode 100644 index 0000000000..6c5ff4906f --- /dev/null +++ b/modules/proposals/codex/src/proposal_types/parameters.rs @@ -0,0 +1,27 @@ +use crate::{BalanceOf, ProposalParameters}; + + +// Proposal parameters for the upgrade runtime proposal +pub(crate) fn upgrade_runtime() -> ProposalParameters> { + ProposalParameters { + voting_period: T::BlockNumber::from(50000u32), + grace_period: T::BlockNumber::from(10000u32), + approval_quorum_percentage: 80, + approval_threshold_percentage: 80, + slashing_quorum_percentage: 80, + slashing_threshold_percentage: 80, + required_stake: Some(>::from(50000u32)) + } +} +// Proposal parameters for the text proposal +pub(crate) fn text_proposal() -> ProposalParameters> { + ProposalParameters { + voting_period: T::BlockNumber::from(50000u32), + grace_period: T::BlockNumber::from(10000u32), + approval_quorum_percentage: 40, + approval_threshold_percentage: 51, + slashing_quorum_percentage: 80, + slashing_threshold_percentage: 80, + required_stake: Some(>::from(500u32)) + } +} \ No newline at end of file From 4cf9e98335e9303c4ec5bdd3807e717d096b53e0 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Thu, 27 Feb 2020 18:53:36 +0300 Subject: [PATCH 057/286] Add proposal status comments. --- modules/proposals/engine/src/lib.rs | 7 +++++-- modules/proposals/engine/src/types/mod.rs | 6 ++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index a8504b8eed..57687028f7 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -318,18 +318,21 @@ impl Module { // Enumerates through active proposals. Tally Voting results. // Returns proposals with finalized status and id fn get_finalized_proposals() -> Vec> { - // enumerate active proposals id and gather finalization data + // Enumerate active proposals id and gather finalization data. + // Skip proposals with unfinished voting. >::enumerate() .filter_map(|(proposal_id, _)| { // load current proposal let proposal = Self::proposals(proposal_id); + // Calculates votes, takes in account voting period expiration. + // If voting process is in progress, then decision status is None. let decision_status = proposal.define_proposal_decision_status( T::TotalVotersCounter::total_voters_count(), Self::current_block(), ); - // map to FinalizedProposalData or None + // map to FinalizedProposalData if decision for the proposal is made or return None decision_status.map(|status| FinalizedProposalData { proposal_id, proposal, diff --git a/modules/proposals/engine/src/types/mod.rs b/modules/proposals/engine/src/types/mod.rs index a6c3a253a1..086f8f7686 100644 --- a/modules/proposals/engine/src/types/mod.rs +++ b/modules/proposals/engine/src/types/mod.rs @@ -165,8 +165,10 @@ where } /// Determines the finalized proposal status using voting results tally for current proposal. - /// Parameters: current time, total voters number involved (council size) - /// Returns whether the proposal has finalized status + /// Calculates votes, takes in account voting period expiration. + /// If voting process is in progress, then decision status is None. + /// Parameters: current time, total voters number involved (council size). + /// Returns the proposal finalized status if any. pub fn define_proposal_decision_status( &self, total_voters_count: u32, From 2351fd0c1be22b8e1bc9fb548b1864eb18076bab Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Thu, 27 Feb 2020 19:54:59 +0300 Subject: [PATCH 058/286] Refactor stakes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - change StakeHandler trait and its default implementation to simple ‘stake module’ proxy - introduce ProposalStakeManager to combine calls from the StakeHandler into the simple workflow --- modules/proposals/engine/src/lib.rs | 9 +- modules/proposals/engine/src/tests/mod.rs | 24 +++- modules/proposals/engine/src/types/mod.rs | 1 + modules/proposals/engine/src/types/stakes.rs | 110 ++++++++++++++----- 4 files changed, 109 insertions(+), 35 deletions(-) diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index 57687028f7..3a231478d7 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -22,6 +22,7 @@ pub use types::BalanceOf; use types::FinalizedProposalData; +use types::ProposalStakeManager; pub use types::VotingResults; pub use types::{ ApprovedProposalStatus, FinalizationData, Proposal, ProposalDecisionStatus, ProposalParameters, @@ -279,9 +280,7 @@ impl Module { // Check stake_balance for value and create stake if value exists, else take None // If create_stake() returns error - return error from extrinsic let stake_id = stake_balance - .map(|stake_amount| { - T::StakeHandlerProvider::stakes().create_stake(stake_amount, account_id) - }) + .map(|stake_amount| ProposalStakeManager::::create_stake(stake_amount, account_id)) .transpose()?; let new_proposal = Proposal { @@ -427,10 +426,10 @@ impl Module { // only if stake exists if let Some(stake_id) = current_stake_id { if !slash_balance.is_zero() { - T::StakeHandlerProvider::stakes().slash(stake_id, slash_balance)?; + ProposalStakeManager::::slash(stake_id, slash_balance)?; } - T::StakeHandlerProvider::stakes().remove_stake(stake_id)?; + ProposalStakeManager::::remove_stake(stake_id)?; } Ok(()) diff --git a/modules/proposals/engine/src/tests/mod.rs b/modules/proposals/engine/src/tests/mod.rs index 472fcb20ee..66d2a0e1d8 100644 --- a/modules/proposals/engine/src/tests/mod.rs +++ b/modules/proposals/engine/src/tests/mod.rs @@ -1093,15 +1093,23 @@ fn finalize_expired_proposal_and_check_stake_removing_with_balance_checks_succee } */ #[test] -fn finalize_proposal_using_stake_mocks() { +fn finalize_proposal_using_stake_mocks_succeeds() { handle_mock(|| { initial_test_ext().execute_with(|| { let mock = { let mut mock = crate::types::MockStakeHandler::::new(); - mock.expect_create_stake().times(1).returning(|_, _| Ok(1)); + mock.expect_create_stake().times(1).returning(|| Ok(1)); + + mock.expect_make_stake_imbalance() + .times(1) + .returning(|_, _| Ok(crate::types::NegativeImbalance::::new(200))); + + mock.expect_stake().times(1).returning(|_, _| Ok(())); mock.expect_remove_stake().times(1).returning(|_| Ok(())); + mock.expect_unstake().times(1).returning(|_| Ok(())); + mock.expect_slash().times(1).returning(|_, _| Ok(())); Rc::new(mock) @@ -1166,17 +1174,25 @@ fn proposal_slashing_succeeds() { } #[test] -fn finalize_proposal_failed_using_stake_mocks() { +fn finalize_proposal_using_stake_mocks_failed() { handle_mock(|| { initial_test_ext().execute_with(|| { let mock = { let mut mock = crate::types::MockStakeHandler::::new(); - mock.expect_create_stake().times(1).returning(|_, _| Ok(1)); + mock.expect_create_stake().times(1).returning(|| Ok(1)); mock.expect_remove_stake() .times(1) .returning(|_| Err("Cannot remove stake")); + mock.expect_make_stake_imbalance() + .times(1) + .returning(|_, _| Ok(crate::types::NegativeImbalance::::new(200))); + + mock.expect_stake().times(1).returning(|_, _| Ok(())); + + mock.expect_unstake().times(1).returning(|_| Ok(())); + mock.expect_slash().times(1).returning(|_, _| Ok(())); Rc::new(mock) diff --git a/modules/proposals/engine/src/types/mod.rs b/modules/proposals/engine/src/types/mod.rs index 086f8f7686..3e2d72211f 100644 --- a/modules/proposals/engine/src/types/mod.rs +++ b/modules/proposals/engine/src/types/mod.rs @@ -17,6 +17,7 @@ mod stakes; pub use proposal_statuses::{ ApprovedProposalStatus, FinalizationData, ProposalDecisionStatus, ProposalStatus, }; +pub(crate) use stakes::ProposalStakeManager; pub use stakes::{DefaultStakeHandlerProvider, StakeHandler, StakeHandlerProvider}; #[cfg(test)] diff --git a/modules/proposals/engine/src/types/stakes.rs b/modules/proposals/engine/src/types/stakes.rs index c363b81497..5d4a5509df 100644 --- a/modules/proposals/engine/src/types/stakes.rs +++ b/modules/proposals/engine/src/types/stakes.rs @@ -31,21 +31,33 @@ impl StakeHandlerProvider for DefaultStakeHandlerProvider { } /// Stake logic handler. -#[cfg_attr(test, automock)] // attributes creates mocks in tesing environment +#[cfg_attr(test, automock)] // attributes creates mocks in testing environment pub trait StakeHandler { - /// Creates a stake using stake balance and source account. - /// Returns created stake id or an error. - fn create_stake( + /// Creates a stake. Returns created stake id or an error. + fn create_stake(&self) -> Result; + + /// Stake the imbalance + fn stake( &self, - stake_balance: BalanceOf, - source_account_id: T::AccountId, - ) -> Result; + stake_id: &T::StakeId, + stake_imbalance: NegativeImbalance, + ) -> Result<(), &'static str>; - /// Execute unstaking and removes stake + /// Removes stake fn remove_stake(&self, stake_id: T::StakeId) -> Result<(), &'static str>; + /// Execute unstaking + fn unstake(&self, stake_id: T::StakeId) -> Result<(), &'static str>; + /// Slash balance from the existing stake fn slash(&self, stake_id: T::StakeId, slash_balance: BalanceOf) -> Result<(), &'static str>; + + /// Withdraw some balance from the source account and create stake imbalance + fn make_stake_imbalance( + &self, + balance: BalanceOf, + source_account_id: &T::AccountId, + ) -> Result, &'static str>; } /// Default implementation of the stake logic. Uses actual stake module. @@ -55,45 +67,53 @@ pub(crate) struct DefaultStakeHandler { } impl StakeHandler for DefaultStakeHandler { - /// Creates a stake using stake balance and source account. - /// Returns created stake id or an error. - fn create_stake( + /// Creates a stake. Returns created stake id or an error. + fn create_stake(&self) -> Result<::StakeId, &'static str> { + Ok(stake::Module::::create_stake()) + } + + /// Stake the imbalance + fn stake( &self, - stake_balance: BalanceOf, - source_account_id: T::AccountId, - ) -> Result { - let stake_id = stake::Module::::create_stake(); + stake_id: &::StakeId, + stake_imbalance: NegativeImbalance, + ) -> Result<(), &'static str> { + stake::Module::::stake(&stake_id, stake_imbalance).map_err(WrappedError)?; - let stake_imbalance = Self::make_stake_imbalance(stake_balance, &source_account_id)?; + Ok(()) + } - stake::Module::::stake(&stake_id, stake_imbalance).map_err(WrappedError)?; + /// Removes stake + fn remove_stake(&self, stake_id: ::StakeId) -> Result<(), &'static str> { + stake::Module::::remove_stake(&stake_id).map_err(WrappedError)?; - Ok(stake_id) + Ok(()) } - /// Execute unstaking and removes the stake - fn remove_stake(&self, stake_id: T::StakeId) -> Result<(), &'static str> { + /// Execute unstaking + fn unstake(&self, stake_id: ::StakeId) -> Result<(), &'static str> { stake::Module::::initiate_unstaking(&stake_id, Some(T::BlockNumber::zero())) .map_err(WrappedError)?; - stake::Module::::remove_stake(&stake_id).map_err(WrappedError)?; - Ok(()) } /// Slash balance from the existing stake - fn slash(&self, stake_id: T::StakeId, slash_balance: BalanceOf) -> Result<(), &'static str> { + fn slash( + &self, + stake_id: ::StakeId, + slash_balance: BalanceOf, + ) -> Result<(), &'static str> { let _slash_id = stake::Module::::initiate_slashing(&stake_id, slash_balance, T::BlockNumber::zero()) .map_err(WrappedError)?; Ok(()) } -} -impl DefaultStakeHandler { - // Withdraw some balance from the source account and create stake imbalance + /// Withdraw some balance from the source account and create stake imbalance fn make_stake_imbalance( + &self, balance: BalanceOf, source_account_id: &T::AccountId, ) -> Result, &'static str> { @@ -106,6 +126,44 @@ impl DefaultStakeHandler { } } +/// Proposal implementation of the stake logic. +/// 'marker' responsible for the 'Trait' binding. +pub(crate) struct ProposalStakeManager { + pub marker: PhantomData, +} + +impl ProposalStakeManager { + /// Creates a stake using stake balance and source account. + /// Returns created stake id or an error. + pub fn create_stake( + stake_balance: BalanceOf, + source_account_id: T::AccountId, + ) -> Result { + let stake_id = T::StakeHandlerProvider::stakes().create_stake()?; + + let stake_imbalance = T::StakeHandlerProvider::stakes() + .make_stake_imbalance(stake_balance, &source_account_id)?; + + T::StakeHandlerProvider::stakes().stake(&stake_id, stake_imbalance)?; + + Ok(stake_id) + } + + /// Execute unstaking and removes the stake + pub fn remove_stake(stake_id: T::StakeId) -> Result<(), &'static str> { + T::StakeHandlerProvider::stakes().unstake(stake_id)?; + + T::StakeHandlerProvider::stakes().remove_stake(stake_id)?; + + Ok(()) + } + + /// Slash balance from the existing stake + pub fn slash(stake_id: T::StakeId, slash_balance: BalanceOf) -> Result<(), &'static str> { + T::StakeHandlerProvider::stakes().slash(stake_id, slash_balance) + } +} + // 'New type' pattern for the error // https://doc.rust-lang.org/book/ch19-03-advanced-traits.html#using-the-newtype-pattern-to-implement-external-traits-on-external-types struct WrappedError(E); From 64d270ac90dc0c72d37fbf1b395eda24d95a69c2 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 28 Feb 2020 12:10:12 +0300 Subject: [PATCH 059/286] Change config() parameters to the Get<> parameters MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - rename proposals.body to the ‘description’ - change config() parameters to the Get<> parameters --- modules/proposals/engine/src/lib.rs | 61 ++++++++----------- .../proposals/engine/src/tests/mock/mod.rs | 18 ++++++ .../engine/src/tests/mock/proposals.rs | 2 +- modules/proposals/engine/src/tests/mod.rs | 30 ++++----- modules/proposals/engine/src/types/mod.rs | 4 +- 5 files changed, 61 insertions(+), 54 deletions(-) diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index 3a231478d7..f8d76130b6 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -19,6 +19,7 @@ // TODO: Test module after the https://github.com/Joystream/substrate-runtime-joystream/issues/161 // issue will be fixed: "Fix stake module and allow slashing and unstaking in the same block." +// TODO: Test cancellation, rejection fees pub use types::BalanceOf; use types::FinalizedProposalData; @@ -44,19 +45,9 @@ use runtime_primitives::traits::{EnsureOrigin, Zero}; use srml_support::{ decl_event, decl_module, decl_storage, dispatch, ensure, Parameter, StorageDoubleMap, }; +use srml_support::traits::Get; use system::ensure_root; -// Max allowed proposal title length. Can be used if config value is not filled. -const DEFAULT_TITLE_MAX_LEN: u32 = 100; -// Max allowed proposal body length. Can be used if config value is not filled. -const DEFAULT_BODY_MAX_LEN: u32 = 10_000; -// Max simultaneous active proposals number. -const MAX_ACTIVE_PROPOSALS_NUMBER: u32 = 100; -// Default proposal cancellation fee to prevent spamming. -const DEFAULT_CANCELLATION_FEE: u32 = 5; -// Default proposal rejection fee to prevent spamming. -const DEFAULT_REJECTION_FEE: u32 = 17; - /// Proposals engine trait. pub trait Trait: system::Trait + timestamp::Trait + stake::Trait { /// Engine event type. @@ -85,6 +76,21 @@ pub trait Trait: system::Trait + timestamp::Trait + stake::Trait { /// Provides stake logic implementation. Can be used to mock stake logic. type StakeHandlerProvider: StakeHandlerProvider; + + /// The fee is applied when cancel the proposal. A fee would be slashed (burned). + type CancellationFee: Get>; + + /// The fee is applied when the proposal gets rejected. A fee would be slashed (burned). + type RejectionFee: Get>; + + /// Defines max allowed proposal title length. + type TitleMaxLength: Get; + + /// Defines max allowed proposal description length. + type DescriptionMaxLength: Get; + + /// Defines max simultaneous active proposals number. + type MaxActiveProposalLimit: Get; } decl_event!( @@ -142,23 +148,6 @@ decl_storage! { /// Double map for preventing duplicate votes. Should be cleaned after usage. pub VoteExistsByProposalByVoter get(fn vote_by_proposal_by_voter): double_map T::ProposalId, twox_256(T::VoterId) => VoteKind; - - /// Defines max allowed proposal title length. Can be configured. - pub TitleMaxLen get(title_max_len) config(): u32 = DEFAULT_TITLE_MAX_LEN; - - /// Defines max allowed proposal body length. Can be configured. - pub BodyMaxLen get(body_max_len) config(): u32 = DEFAULT_BODY_MAX_LEN; - - /// Defines max simultaneous active proposals number. Can be configured. - pub MaxActiveProposals get(max_active_proposals) config(): u32 = MAX_ACTIVE_PROPOSALS_NUMBER; - - /// A fee to be slashed (burn) in case a proposer decides to cancel a proposal. - pub CancellationFee get(cancellation_fee) config(): BalanceOf = - BalanceOf::::from(DEFAULT_CANCELLATION_FEE); - - /// A fee to be slashed (burn) in case a proposal was rejected. - pub RejectionFee get(rejection_fee) config(): BalanceOf = - BalanceOf::::from(DEFAULT_REJECTION_FEE); } } @@ -256,7 +245,7 @@ impl Module { origin: T::Origin, parameters: ProposalParameters>, title: Vec, - body: Vec, + description: Vec, stake_balance: Option>, proposal_type: u32, proposal_code: Vec, @@ -267,7 +256,7 @@ impl Module { Self::ensure_create_proposal_parameters_are_valid( ¶meters, &title, - &body, + &description, stake_balance, )?; @@ -287,7 +276,7 @@ impl Module { created_at: Self::current_block(), parameters, title, - body, + description, proposer_id: proposer_id.clone(), proposal_type, status: ProposalStatus::Active, @@ -442,12 +431,12 @@ impl Module { ) -> types::BalanceOf { match decision_status { ProposalDecisionStatus::Rejected | ProposalDecisionStatus::Expired => { - Self::rejection_fee() + T::RejectionFee::get() } ProposalDecisionStatus::Approved { .. } | ProposalDecisionStatus::Vetoed => { BalanceOf::::zero() } - ProposalDecisionStatus::Canceled => Self::cancellation_fee(), + ProposalDecisionStatus::Canceled => T::CancellationFee::get(), ProposalDecisionStatus::Slashed => proposal_parameters .required_stake .clone() @@ -499,18 +488,18 @@ impl Module { ) -> dispatch::Result { ensure!(!title.is_empty(), errors::MSG_EMPTY_TITLE_PROVIDED); ensure!( - title.len() as u32 <= Self::title_max_len(), + title.len() as u32 <= T::TitleMaxLength::get(), errors::MSG_TOO_LONG_TITLE ); ensure!(!body.is_empty(), errors::MSG_EMPTY_BODY_PROVIDED); ensure!( - body.len() as u32 <= Self::body_max_len(), + body.len() as u32 <= T::DescriptionMaxLength::get(), errors::MSG_TOO_LONG_BODY ); ensure!( - (Self::active_proposal_count()) < Self::max_active_proposals(), + (Self::active_proposal_count()) < T::MaxActiveProposalLimit::get(), errors::MSG_MAX_ACTIVE_PROPOSAL_NUMBER_EXCEEDED ); diff --git a/modules/proposals/engine/src/tests/mock/mod.rs b/modules/proposals/engine/src/tests/mock/mod.rs index 344b020b93..1f9ba495aa 100644 --- a/modules/proposals/engine/src/tests/mock/mod.rs +++ b/modules/proposals/engine/src/tests/mock/mod.rs @@ -81,6 +81,14 @@ impl stake::Trait for Test { type SlashId = u64; } +parameter_types! { + pub const CancellationFee: u64 = 5; + pub const RejectionFee: u64 = 3; + pub const TitleMaxLength: u32 = 100; + pub const DescriptionMaxLength: u32 = 10000; + pub const MaxActiveProposalLimit: u32 = 100; +} + impl crate::Trait for Test { type Event = TestEvent; @@ -99,6 +107,16 @@ impl crate::Trait for Test { type VoterId = u64; type StakeHandlerProvider = stakes::TestStakeHandlerProvider; + + type CancellationFee = CancellationFee; + + type RejectionFee = RejectionFee; + + type TitleMaxLength = TitleMaxLength; + + type DescriptionMaxLength = DescriptionMaxLength; + + type MaxActiveProposalLimit = MaxActiveProposalLimit; } // If changing count is required, we can upgrade the implementation as shown here: diff --git a/modules/proposals/engine/src/tests/mock/proposals.rs b/modules/proposals/engine/src/tests/mock/proposals.rs index 92f64b4261..4a71933b18 100644 --- a/modules/proposals/engine/src/tests/mock/proposals.rs +++ b/modules/proposals/engine/src/tests/mock/proposals.rs @@ -51,7 +51,7 @@ impl ProposalCodeDecoder for ProposalType { #[derive(Encode, Decode, Clone, PartialEq, Eq, Debug, Default)] pub struct DummyExecutable { pub title: Vec, - pub body: Vec, + pub description: Vec, } impl DummyExecutable { diff --git a/modules/proposals/engine/src/tests/mod.rs b/modules/proposals/engine/src/tests/mod.rs index 66d2a0e1d8..73e61458c4 100644 --- a/modules/proposals/engine/src/tests/mod.rs +++ b/modules/proposals/engine/src/tests/mod.rs @@ -62,7 +62,7 @@ struct DummyProposalFixture { proposal_type: u32, proposal_code: Vec, title: Vec, - body: Vec, + description: Vec, stake_balance: Option>, } @@ -70,7 +70,7 @@ impl Default for DummyProposalFixture { fn default() -> Self { let dummy_proposal = DummyExecutable { title: b"title".to_vec(), - body: b"body".to_vec(), + description: b"description".to_vec(), }; DummyProposalFixture { @@ -87,17 +87,17 @@ impl Default for DummyProposalFixture { proposal_type: dummy_proposal.proposal_type(), proposal_code: dummy_proposal.encode(), title: dummy_proposal.title, - body: dummy_proposal.body, + description: dummy_proposal.description, stake_balance: None, } } } impl DummyProposalFixture { - fn with_title_and_body(self, title: Vec, body: Vec) -> Self { + fn with_title_and_body(self, title: Vec, description: Vec) -> Self { DummyProposalFixture { title, - body, + description, ..self } } @@ -131,7 +131,7 @@ impl DummyProposalFixture { self.origin.into(), self.parameters, self.title, - self.body, + self.description, self.stake_balance, self.proposal_type, self.proposal_code, @@ -336,7 +336,7 @@ fn proposal_execution_succeeds() { created_at: 1, status: ProposalStatus::approved(ApprovedProposalStatus::Executed, 1), title: b"title".to_vec(), - body: b"body".to_vec(), + description: b"description".to_vec(), voting_results: VotingResults { abstentions: 0, approvals: 4, @@ -386,7 +386,7 @@ fn proposal_execution_failed() { 1 ), title: b"title".to_vec(), - body: b"body".to_vec(), + description: b"description".to_vec(), voting_results: VotingResults { abstentions: 0, approvals: 4, @@ -575,7 +575,7 @@ fn cancel_proposal_succeeds() { created_at: 1, status: ProposalStatus::finalized(ProposalDecisionStatus::Canceled, 1), title: b"title".to_vec(), - body: b"body".to_vec(), + description: b"description".to_vec(), voting_results: VotingResults::default(), stake_id: None, } @@ -644,7 +644,7 @@ fn veto_proposal_succeeds() { created_at: 1, status: ProposalStatus::finalized(ProposalDecisionStatus::Vetoed, 1), title: b"title".to_vec(), - body: b"body".to_vec(), + description: b"description".to_vec(), voting_results: VotingResults::default(), stake_id: None, } @@ -776,7 +776,7 @@ fn create_proposal_and_expire_it() { created_at: 1, status: ProposalStatus::finalized(ProposalDecisionStatus::Expired, 4), title: b"title".to_vec(), - body: b"body".to_vec(), + description: b"description".to_vec(), voting_results: VotingResults::default(), stake_id: None, } @@ -818,7 +818,7 @@ fn proposal_execution_postponed_because_of_grace_period() { created_at: 1, status: ProposalStatus::approved(ApprovedProposalStatus::PendingExecution, 1), title: b"title".to_vec(), - body: b"body".to_vec(), + description: b"description".to_vec(), voting_results: VotingResults { abstentions: 0, approvals: 4, @@ -861,7 +861,7 @@ fn proposal_execution_succeeds_after_the_grace_period() { created_at: 1, status: ProposalStatus::approved(ApprovedProposalStatus::PendingExecution, 1), title: b"title".to_vec(), - body: b"body".to_vec(), + description: b"description".to_vec(), voting_results: VotingResults { abstentions: 0, approvals: 4, @@ -965,7 +965,7 @@ fn create_dummy_proposal_succeeds_with_stake() { created_at: 1, status: ProposalStatus::Active, title: b"title".to_vec(), - body: b"body".to_vec(), + description: b"description".to_vec(), voting_results: VotingResults::default(), stake_id: Some(0), // valid stake_id } @@ -1227,7 +1227,7 @@ fn finalize_proposal_using_stake_mocks_failed() { 4, ), title: b"title".to_vec(), - body: b"body".to_vec(), + description: b"description".to_vec(), voting_results: VotingResults::default(), stake_id: Some(1), } diff --git a/modules/proposals/engine/src/types/mod.rs b/modules/proposals/engine/src/types/mod.rs index 3e2d72211f..18724ceb8c 100644 --- a/modules/proposals/engine/src/types/mod.rs +++ b/modules/proposals/engine/src/types/mod.rs @@ -124,11 +124,11 @@ pub struct Proposal { /// Identifier of member proposing. pub proposer_id: ProposerId, - /// Proposal title + /// Proposal description pub title: Vec, /// Proposal body - pub body: Vec, + pub description: Vec, /// When it was created. pub created_at: BlockNumber, From a3ab113fc91a62c533463d5e0a2ca25c888bfad1 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 28 Feb 2020 12:49:12 +0300 Subject: [PATCH 060/286] Change config() params to Get<> in the codex MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - change config() params to Get<> - rename ‘body’ to the ‘description’ in proposal types and methods --- modules/proposals/codex/src/lib.rs | 39 ++++++++----------- .../src/proposal_types/runtime_upgrade.rs | 4 +- .../codex/src/proposal_types/text_proposal.rs | 6 +-- modules/proposals/codex/src/tests/mock.rs | 28 ++++++++++++- modules/proposals/engine/src/lib.rs | 2 +- 5 files changed, 50 insertions(+), 29 deletions(-) diff --git a/modules/proposals/codex/src/lib.rs b/modules/proposals/codex/src/lib.rs index 03b9237ff3..8b09488dce 100644 --- a/modules/proposals/codex/src/lib.rs +++ b/modules/proposals/codex/src/lib.rs @@ -26,9 +26,15 @@ use rstd::vec::Vec; use srml_support::{decl_error, decl_module, decl_storage, ensure}; /// 'Proposals codex' substrate module Trait -pub trait Trait: system::Trait + proposal_engine::Trait {} +pub trait Trait: system::Trait + proposal_engine::Trait { + /// Defines max allowed text proposal length. + type TextProposalMaxLength: Get; -use srml_support::traits::Currency; + /// Defines max wasm code length of the runtime upgrade proposal. + type RuntimeUpgradeWasmProposalMaxLength: Get; + +} +use srml_support::traits::{Currency, Get}; /// Balance alias pub type BalanceOf = @@ -38,11 +44,6 @@ pub type BalanceOf = pub type NegativeImbalance = <::Currency as Currency<::AccountId>>::NegativeImbalance; -// Defines max allowed text proposal text length. Can be override in the config. -const DEFAULT_TEXT_PROPOSAL_MAX_LEN: u32 = 20_000; -// Defines max allowed text proposal text length. Can be override in the config. -const DEFAULT_RUNTIME_PROPOSAL_WASM_MAX_LEN: u32 = 20_000; - decl_error! { pub enum Error { /// The size of the provided text for text proposal exceeded the limit @@ -61,13 +62,7 @@ decl_error! { // Storage for the proposals codex module decl_storage! { - pub trait Store for Module as ProposalCodex{ - /// Defines max allowed text proposal text length. - pub TextProposalMaxLen get(text_max_len) config(): u32 = DEFAULT_TEXT_PROPOSAL_MAX_LEN; - - /// Defines max allowed runtime upgrade proposal wasm code length. - pub RuntimeUpgradeMaxLen get(wasm_max_len) config(): u32 = DEFAULT_RUNTIME_PROPOSAL_WASM_MAX_LEN; - } + pub trait Store for Module as ProposalCodex{} } decl_module! { @@ -80,19 +75,19 @@ decl_module! { pub fn create_text_proposal( origin, title: Vec, - body: Vec, + description: Vec, text: Vec, stake_balance: Option>, ) { let parameters = proposal_types::parameters::text_proposal::(); ensure!(!text.is_empty(), Error::TextProposalIsEmpty); - ensure!(text.len() as u32 <= Self::text_max_len(), + ensure!(text.len() as u32 <= T::TextProposalMaxLength::get(), Error::TextProposalSizeExceeded); let text_proposal = TextProposalExecutable{ title: title.clone(), - body: body.clone(), + description: description.clone(), text, }; let proposal_code = text_proposal.encode(); @@ -101,7 +96,7 @@ decl_module! { origin, parameters, title, - body, + description, stake_balance, text_proposal.proposal_type(), proposal_code @@ -112,19 +107,19 @@ decl_module! { pub fn create_runtime_upgrade_proposal( origin, title: Vec, - body: Vec, + description: Vec, wasm: Vec, stake_balance: Option>, ) { let parameters = proposal_types::parameters::upgrade_runtime::(); ensure!(!wasm.is_empty(), Error::RuntimeProposalIsEmpty); - ensure!(wasm.len() as u32 <= Self::wasm_max_len(), + ensure!(wasm.len() as u32 <= T::RuntimeUpgradeWasmProposalMaxLength::get(), Error::RuntimeProposalSizeExceeded); let proposal = RuntimeUpgradeProposalExecutable{ title: title.clone(), - body: body.clone(), + description: description.clone(), wasm, marker : PhantomData:: }; @@ -134,7 +129,7 @@ decl_module! { origin, parameters, title, - body, + description, stake_balance, proposal.proposal_type(), proposal_code diff --git a/modules/proposals/codex/src/proposal_types/runtime_upgrade.rs b/modules/proposals/codex/src/proposal_types/runtime_upgrade.rs index 3112a3786f..107b558d56 100644 --- a/modules/proposals/codex/src/proposal_types/runtime_upgrade.rs +++ b/modules/proposals/codex/src/proposal_types/runtime_upgrade.rs @@ -13,8 +13,8 @@ pub struct RuntimeUpgradeProposalExecutable { /// Proposal title pub title: Vec, - /// Proposal body (description) - pub body: Vec, + /// Proposal description + pub description: Vec, /// Text proposal main text pub wasm: Vec, diff --git a/modules/proposals/codex/src/proposal_types/text_proposal.rs b/modules/proposals/codex/src/proposal_types/text_proposal.rs index ed38150d91..c663ce2a59 100644 --- a/modules/proposals/codex/src/proposal_types/text_proposal.rs +++ b/modules/proposals/codex/src/proposal_types/text_proposal.rs @@ -12,8 +12,8 @@ pub struct TextProposalExecutable { /// Text proposal title pub title: Vec, - /// Text proposal body (description) - pub body: Vec, + /// Text proposal description + pub description: Vec, /// Text proposal main text pub text: Vec, @@ -31,7 +31,7 @@ impl ProposalExecutable for TextProposalExecutable { print("Proposal: "); print(from_utf8(self.title.as_slice()).unwrap()); print("Description:"); - print(from_utf8(self.body.as_slice()).unwrap()); + print(from_utf8(self.description.as_slice()).unwrap()); Ok(()) } diff --git a/modules/proposals/codex/src/tests/mock.rs b/modules/proposals/codex/src/tests/mock.rs index f02ec964d0..1951939d5a 100644 --- a/modules/proposals/codex/src/tests/mock.rs +++ b/modules/proposals/codex/src/tests/mock.rs @@ -67,6 +67,14 @@ impl stake::Trait for Test { type SlashId = u64; } +parameter_types! { + pub const CancellationFee: u64 = 5; + pub const RejectionFee: u64 = 3; + pub const TitleMaxLength: u32 = 100; + pub const DescriptionMaxLength: u32 = 10000; + pub const MaxActiveProposalLimit: u32 = 100; +} + impl proposal_engine::Trait for Test { type Event = (); @@ -85,6 +93,16 @@ impl proposal_engine::Trait for Test { type VoterId = u64; type StakeHandlerProvider = proposal_engine::DefaultStakeHandlerProvider; + + type CancellationFee = CancellationFee; + + type RejectionFee = RejectionFee; + + type TitleMaxLength = TitleMaxLength; + + type DescriptionMaxLength = DescriptionMaxLength; + + type MaxActiveProposalLimit = MaxActiveProposalLimit; } pub struct MockVotersParameters; @@ -94,7 +112,15 @@ impl VotersParameters for MockVotersParameters { } } -impl crate::Trait for Test {} +parameter_types! { + pub const TextProposalMaxLength: u32 = 20_000; + pub const RuntimeUpgradeWasmProposalMaxLength: u32 = 20_000; +} + +impl crate::Trait for Test { + type TextProposalMaxLength = TextProposalMaxLength; + type RuntimeUpgradeWasmProposalMaxLength = RuntimeUpgradeWasmProposalMaxLength; +} impl system::Trait for Test { type Origin = Origin; diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index f8d76130b6..9486056a45 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -42,10 +42,10 @@ mod tests; use rstd::prelude::*; use runtime_primitives::traits::{EnsureOrigin, Zero}; +use srml_support::traits::Get; use srml_support::{ decl_event, decl_module, decl_storage, dispatch, ensure, Parameter, StorageDoubleMap, }; -use srml_support::traits::Get; use system::ensure_root; /// Proposals engine trait. From b2b81f609a718177d8c0f3fce69bd87ab4d65d05 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 28 Feb 2020 12:49:35 +0300 Subject: [PATCH 061/286] Apply cargo fmt --- modules/proposals/codex/src/lib.rs | 1 - .../proposals/codex/src/proposal_types/mod.rs | 3 +- .../codex/src/proposal_types/parameters.rs | 42 +++++++++---------- 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/modules/proposals/codex/src/lib.rs b/modules/proposals/codex/src/lib.rs index 8b09488dce..404bab6c5c 100644 --- a/modules/proposals/codex/src/lib.rs +++ b/modules/proposals/codex/src/lib.rs @@ -32,7 +32,6 @@ pub trait Trait: system::Trait + proposal_engine::Trait { /// Defines max wasm code length of the runtime upgrade proposal. type RuntimeUpgradeWasmProposalMaxLength: Get; - } use srml_support::traits::{Currency, Get}; diff --git a/modules/proposals/codex/src/proposal_types/mod.rs b/modules/proposals/codex/src/proposal_types/mod.rs index ed08cabf9d..b089fcb9b7 100644 --- a/modules/proposals/codex/src/proposal_types/mod.rs +++ b/modules/proposals/codex/src/proposal_types/mod.rs @@ -5,9 +5,9 @@ use rstd::prelude::*; use crate::{ProposalCodeDecoder, ProposalExecutable}; +pub mod parameters; mod runtime_upgrade; mod text_proposal; -pub mod parameters; pub use runtime_upgrade::RuntimeUpgradeProposalExecutable; pub use text_proposal::TextProposalExecutable; @@ -51,4 +51,3 @@ impl ProposalCodeDecoder for ProposalType { .compose_executable::(proposal_code) } } - diff --git a/modules/proposals/codex/src/proposal_types/parameters.rs b/modules/proposals/codex/src/proposal_types/parameters.rs index 6c5ff4906f..5f9db050a3 100644 --- a/modules/proposals/codex/src/proposal_types/parameters.rs +++ b/modules/proposals/codex/src/proposal_types/parameters.rs @@ -1,27 +1,27 @@ use crate::{BalanceOf, ProposalParameters}; - // Proposal parameters for the upgrade runtime proposal -pub(crate) fn upgrade_runtime() -> ProposalParameters> { - ProposalParameters { - voting_period: T::BlockNumber::from(50000u32), - grace_period: T::BlockNumber::from(10000u32), - approval_quorum_percentage: 80, - approval_threshold_percentage: 80, - slashing_quorum_percentage: 80, - slashing_threshold_percentage: 80, - required_stake: Some(>::from(50000u32)) - } +pub(crate) fn upgrade_runtime() -> ProposalParameters> +{ + ProposalParameters { + voting_period: T::BlockNumber::from(50000u32), + grace_period: T::BlockNumber::from(10000u32), + approval_quorum_percentage: 80, + approval_threshold_percentage: 80, + slashing_quorum_percentage: 80, + slashing_threshold_percentage: 80, + required_stake: Some(>::from(50000u32)), + } } // Proposal parameters for the text proposal pub(crate) fn text_proposal() -> ProposalParameters> { - ProposalParameters { - voting_period: T::BlockNumber::from(50000u32), - grace_period: T::BlockNumber::from(10000u32), - approval_quorum_percentage: 40, - approval_threshold_percentage: 51, - slashing_quorum_percentage: 80, - slashing_threshold_percentage: 80, - required_stake: Some(>::from(500u32)) - } -} \ No newline at end of file + ProposalParameters { + voting_period: T::BlockNumber::from(50000u32), + grace_period: T::BlockNumber::from(10000u32), + approval_quorum_percentage: 40, + approval_threshold_percentage: 51, + slashing_quorum_percentage: 80, + slashing_threshold_percentage: 80, + required_stake: Some(>::from(500u32)), + } +} From 9e44370a4721b0240c6dfc2b7e87d63a9fbb60af Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 28 Feb 2020 13:54:21 +0300 Subject: [PATCH 062/286] Change MaxPostEditionNumber from config() to Get<> - change MaxPostEditionNumber from config() to Get<> parameter in the discussion proposal module --- modules/proposals/discussion/src/lib.rs | 14 ++++++-------- modules/proposals/discussion/src/tests/mock.rs | 5 +++++ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/modules/proposals/discussion/src/lib.rs b/modules/proposals/discussion/src/lib.rs index 973c2798b6..409585149f 100644 --- a/modules/proposals/discussion/src/lib.rs +++ b/modules/proposals/discussion/src/lib.rs @@ -25,14 +25,12 @@ use runtime_primitives::traits::EnsureOrigin; use srml_support::{decl_module, decl_storage, ensure, Parameter}; use types::{Post, Thread}; +use srml_support::traits::Get; //TODO: create_thread() ensures //TODO: create_post() ensures -//TODO: select storage container for the posts (double map, inside thread)? -//TODO: events? +//TODO: create events -// Post edition number limit. -const MAX_POST_EDITION_NUMBER: u32 = 5; const MSG_NOT_AUTHOR: &str = "Author should match the post creator"; const MSG_POST_EDITION_NUMBER_EXCEEDED: &str = "Post edition limit reached."; @@ -56,6 +54,9 @@ pub trait Trait: system::Trait { /// Type for the post author id. Should be authenticated by account id. type PostAuthorId: From + Parameter + Default; + + /// Defines post edition number limit. + type MaxPostEditionNumber: Get; } // Storage for the proposals discussion module @@ -74,9 +75,6 @@ decl_storage! { /// Count of all posts that have been created. pub PostCount get(fn post_count): u32; - - /// Defines max post active edition number (edition number limit). Can be configured. - pub MaxPostEditionNumber get(max_post_edition_number) config(): u32 = MAX_POST_EDITION_NUMBER; } } @@ -114,7 +112,7 @@ decl_module! { let post = >::get(&post_id); ensure!(post.author_id == post_author_id, MSG_NOT_AUTHOR); - ensure!(post.edition_number < Self::max_post_edition_number(), + ensure!(post.edition_number < T::MaxPostEditionNumber::get(), MSG_POST_EDITION_NUMBER_EXCEEDED); let new_post = Post { diff --git a/modules/proposals/discussion/src/tests/mock.rs b/modules/proposals/discussion/src/tests/mock.rs index b16bc196de..dfe1f9cd6b 100644 --- a/modules/proposals/discussion/src/tests/mock.rs +++ b/modules/proposals/discussion/src/tests/mock.rs @@ -28,6 +28,10 @@ parameter_types! { pub const StakePoolId: [u8; 8] = *b"joystake"; } +parameter_types! { + pub const MaxPostEditionNumber: u32 = 5; +} + impl crate::Trait for Test { type ThreadAuthorOrigin = system::EnsureSigned; type PostAuthorOrigin = system::EnsureSigned; @@ -35,6 +39,7 @@ impl crate::Trait for Test { type PostId = u32; type ThreadAuthorId = u64; type PostAuthorId = u64; + type MaxPostEditionNumber = MaxPostEditionNumber; } impl system::Trait for Test { From 79daae21b85ea550ea2ae23e604c6388b67f2a5f Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 28 Feb 2020 14:02:21 +0300 Subject: [PATCH 063/286] Migrate posts from map to double map in discussion --- modules/proposals/discussion/src/lib.rs | 21 +++++++++++-------- modules/proposals/discussion/src/tests/mod.rs | 1 + 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/modules/proposals/discussion/src/lib.rs b/modules/proposals/discussion/src/lib.rs index 409585149f..bacf6e64e3 100644 --- a/modules/proposals/discussion/src/lib.rs +++ b/modules/proposals/discussion/src/lib.rs @@ -27,9 +27,12 @@ use srml_support::{decl_module, decl_storage, ensure, Parameter}; use types::{Post, Thread}; use srml_support::traits::Get; -//TODO: create_thread() ensures -//TODO: create_post() ensures -//TODO: create events +// TODO: create_thread() ensures +// TODO: create_post() ensures +// TODO: create events +// TODO: test thread content +// TODO: test post content +// TODO: move errors to decl_error macro const MSG_NOT_AUTHOR: &str = "Author should match the post creator"; @@ -69,8 +72,8 @@ decl_storage! { /// Count of all threads that have been created. pub ThreadCount get(fn thread_count): u32; - /// Map post id to corresponding post. - pub PostById get(post_by_id): map T::PostId => + /// Map thread id and post id to corresponding post. + pub PostThreadIdByPostId: double_map T::ThreadId, twox_128(T::PostId) => Post; /// Count of all posts that have been created. @@ -100,16 +103,16 @@ decl_module! { }; let post_id = T::PostId::from(new_post_id); - >::insert(post_id, new_post); + >::insert(thread_id, post_id, new_post); PostCount::put(next_post_count_value); } /// Updates a post with author origin check. Update attempts number is limited. - pub fn update_post(origin, post_id : T::PostId, text : Vec) { + pub fn update_post(origin, thread_id: T::ThreadId, post_id : T::PostId, text : Vec) { let account_id = T::ThreadAuthorOrigin::ensure_origin(origin)?; let post_author_id = T::PostAuthorId::from(account_id); - let post = >::get(&post_id); + let post = >::get(&thread_id, &post_id); ensure!(post.author_id == post_author_id, MSG_NOT_AUTHOR); ensure!(post.edition_number < T::MaxPostEditionNumber::get(), @@ -122,7 +125,7 @@ decl_module! { ..post }; - >::insert(post_id, new_post); + >::insert(thread_id, post_id, new_post); } } } diff --git a/modules/proposals/discussion/src/tests/mod.rs b/modules/proposals/discussion/src/tests/mod.rs index dbfefd5a29..a589c342c8 100644 --- a/modules/proposals/discussion/src/tests/mod.rs +++ b/modules/proposals/discussion/src/tests/mod.rs @@ -57,6 +57,7 @@ impl PostFixture { let add_post_result = Discussions::update_post( self.origin.clone().into(), self.thread_id, + self.post_id.unwrap(), self.text.clone(), ); From 541369a797f81bb2c8b0ae2104c0fadf418c7caa Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 28 Feb 2020 17:34:26 +0300 Subject: [PATCH 064/286] Move discussion dependency from the engine to the codex --- modules/proposals/codex/src/lib.rs | 14 ++- modules/proposals/codex/src/tests/mock.rs | 5 +- modules/proposals/codex/src/tests/mod.rs | 9 ++ modules/proposals/discussion/src/lib.rs | 3 +- modules/proposals/engine/src/lib.rs | 11 +- .../proposals/engine/src/tests/mock/mod.rs | 2 - modules/proposals/engine/src/tests/mod.rs | 101 +++++++----------- modules/proposals/engine/src/types/mod.rs | 53 ++++----- 8 files changed, 88 insertions(+), 110 deletions(-) diff --git a/modules/proposals/codex/src/lib.rs b/modules/proposals/codex/src/lib.rs index 31efbb65f1..1ddb632202 100644 --- a/modules/proposals/codex/src/lib.rs +++ b/modules/proposals/codex/src/lib.rs @@ -68,6 +68,10 @@ decl_storage! { /// Defines max allowed runtime upgrade proposal wasm code length. pub RuntimeUpgradeMaxLen get(wasm_max_len) config(): u32 = DEFAULT_RUNTIME_PROPOSAL_WASM_MAX_LEN; + + /// Map proposal id to its discussion thread id + pub ThreadIdByProposalId get(fn thread_id_by_proposal_id): + map T::ProposalId => T::ThreadId; } } @@ -113,7 +117,7 @@ decl_module! { title.clone(), )?; - >::create_proposal( + let proposal_id = >::create_proposal( cloned_origin2, parameters, title, @@ -121,8 +125,9 @@ decl_module! { stake_balance, text_proposal.proposal_type(), proposal_code, - Some(From::::from(discussion_thread_id.into())), )?; + + >::insert(proposal_id, discussion_thread_id); } /// Create runtime upgrade proposal type. On approval prints its content. @@ -162,7 +167,7 @@ decl_module! { title.clone(), )?; - >::create_proposal( + let proposal_id = >::create_proposal( cloned_origin2, parameters, title, @@ -170,8 +175,9 @@ decl_module! { stake_balance, proposal.proposal_type(), proposal_code, - Some(From::::from(discussion_thread_id.into())), )?; + + >::insert(proposal_id, discussion_thread_id); } } } diff --git a/modules/proposals/codex/src/tests/mock.rs b/modules/proposals/codex/src/tests/mock.rs index 1c331e4323..fefbd9499e 100644 --- a/modules/proposals/codex/src/tests/mock.rs +++ b/modules/proposals/codex/src/tests/mock.rs @@ -85,8 +85,10 @@ impl proposal_engine::Trait for Test { type VoterId = u64; type StakeHandlerProvider = proposal_engine::DefaultStakeHandlerProvider; +} - type DiscussionThreadId = u32; +parameter_types! { + pub const MaxPostEditionNumber: u32 = 5; } impl proposal_discussion::Trait for Test { @@ -96,6 +98,7 @@ impl proposal_discussion::Trait for Test { type PostId = u32; type ThreadAuthorId = u64; type PostAuthorId = u64; + type MaxPostEditionNumber = MaxPostEditionNumber; } pub struct MockVotersParameters; diff --git a/modules/proposals/codex/src/tests/mod.rs b/modules/proposals/codex/src/tests/mod.rs index a12ad4debd..6253fc6ad0 100644 --- a/modules/proposals/codex/src/tests/mod.rs +++ b/modules/proposals/codex/src/tests/mod.rs @@ -1,6 +1,7 @@ mod mock; use srml_support::traits::Currency; +use srml_support::StorageMap; use system::RawOrigin; use crate::{BalanceOf, Error}; @@ -25,6 +26,10 @@ fn create_text_proposal_codex_call_succeeds() { ), Ok(()) ); + + // a discussion was created + let thread_id = >::get(1); + assert_eq!(thread_id, 1); }); } @@ -197,5 +202,9 @@ fn create_runtime_upgrade_proposal_codex_call_succeeds() { ), Ok(()) ); + + // a discussion was created + let thread_id = >::get(1); + assert_eq!(thread_id, 1); }); } diff --git a/modules/proposals/discussion/src/lib.rs b/modules/proposals/discussion/src/lib.rs index bacf6e64e3..44e6888188 100644 --- a/modules/proposals/discussion/src/lib.rs +++ b/modules/proposals/discussion/src/lib.rs @@ -24,8 +24,8 @@ use rstd::vec::Vec; use runtime_primitives::traits::EnsureOrigin; use srml_support::{decl_module, decl_storage, ensure, Parameter}; -use types::{Post, Thread}; use srml_support::traits::Get; +use types::{Post, Thread}; // TODO: create_thread() ensures // TODO: create_post() ensures @@ -34,7 +34,6 @@ use srml_support::traits::Get; // TODO: test post content // TODO: move errors to decl_error macro - const MSG_NOT_AUTHOR: &str = "Author should match the post creator"; const MSG_POST_EDITION_NUMBER_EXCEEDED: &str = "Post edition limit reached."; diff --git a/modules/proposals/engine/src/lib.rs b/modules/proposals/engine/src/lib.rs index 5f5e6be108..b4b7be08fd 100644 --- a/modules/proposals/engine/src/lib.rs +++ b/modules/proposals/engine/src/lib.rs @@ -84,9 +84,6 @@ pub trait Trait: system::Trait + timestamp::Trait + stake::Trait { /// Provides stake logic implementation. Can be used to mock stake logic. type StakeHandlerProvider: StakeHandlerProvider; - - /// Discussion thread Id type - type DiscussionThreadId: From + Parameter + Default + Copy; } decl_event!( @@ -260,8 +257,7 @@ impl Module { stake_balance: Option>, proposal_type: u32, proposal_code: Vec, - discussion_thread_id: Option, - ) -> dispatch::Result { + ) -> Result { let account_id = T::ProposalOrigin::ensure_origin(origin)?; let proposer_id = T::ProposerId::from(account_id.clone()); @@ -298,7 +294,6 @@ impl Module { voting_results: VotingResults::default(), finalized_at: None, stake_id, - discussion_thread_id, }; let proposal_id = T::ProposalId::from(new_proposal_id); @@ -310,7 +305,7 @@ impl Module { Self::deposit_event(RawEvent::ProposalCreated(proposer_id, proposal_id)); - Ok(()) + Ok(proposal_id) } } @@ -549,7 +544,6 @@ type FinalizedProposal = FinalizedProposalData< ::ProposerId, types::BalanceOf, ::StakeId, - ::DiscussionThreadId, >; // Simplification of the 'Proposal' type @@ -558,5 +552,4 @@ type ProposalObject = Proposal< ::ProposerId, types::BalanceOf, ::StakeId, - ::DiscussionThreadId, >; diff --git a/modules/proposals/engine/src/tests/mock/mod.rs b/modules/proposals/engine/src/tests/mock/mod.rs index 0a55a78fba..344b020b93 100644 --- a/modules/proposals/engine/src/tests/mock/mod.rs +++ b/modules/proposals/engine/src/tests/mock/mod.rs @@ -99,8 +99,6 @@ impl crate::Trait for Test { type VoterId = u64; type StakeHandlerProvider = stakes::TestStakeHandlerProvider; - - type DiscussionThreadId = u32; } // If changing count is required, we can upgrade the implementation as shown here: diff --git a/modules/proposals/engine/src/tests/mod.rs b/modules/proposals/engine/src/tests/mod.rs index 53ddbe4478..aa6a44bcc5 100644 --- a/modules/proposals/engine/src/tests/mod.rs +++ b/modules/proposals/engine/src/tests/mod.rs @@ -125,29 +125,19 @@ impl DummyProposalFixture { } } - fn create_proposal_and_assert(self, result: dispatch::Result) -> Option { - assert_eq!( - ProposalsEngine::create_proposal( - self.origin.into(), - self.parameters, - self.title, - self.body, - self.stake_balance, - self.proposal_type, - self.proposal_code, - None, - ), - result + fn create_proposal_and_assert(self, result: Result) -> Option { + let proposal_id_result = ProposalsEngine::create_proposal( + self.origin.into(), + self.parameters, + self.title, + self.body, + self.stake_balance, + self.proposal_type, + self.proposal_code, ); + assert_eq!(proposal_id_result, result); - if result.is_ok() { - // last created proposal id equals current proposal count - let proposal_id = ::get(); - - Some(proposal_id) - } else { - None - } + proposal_id_result.ok() } } @@ -273,7 +263,7 @@ fn create_dummy_proposal_succeeds() { initial_test_ext().execute_with(|| { let dummy_proposal = DummyProposalFixture::default(); - dummy_proposal.create_proposal_and_assert(Ok(())); + dummy_proposal.create_proposal_and_assert(Ok(1)); }); } @@ -290,7 +280,7 @@ fn create_dummy_proposal_fails_with_insufficient_rights() { fn vote_succeeds() { initial_test_ext().execute_with(|| { let dummy_proposal = DummyProposalFixture::default(); - let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); let mut vote_generator = VoteGenerator::new(proposal_id); vote_generator.vote_and_assert_ok(VoteKind::Approve); @@ -313,7 +303,7 @@ fn proposal_execution_succeeds() { let parameters_fixture = ProposalParametersFixture::default(); let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters_fixture.params()); - let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); // internal active proposal counter check assert_eq!(::get(), 1); @@ -347,7 +337,6 @@ fn proposal_execution_succeeds() { }, finalized_at: Some(1), stake_id: None, - discussion_thread_id: None, } ); @@ -366,7 +355,7 @@ fn proposal_execution_failed() { .with_parameters(parameters_fixture.params()) .with_proposal_type_and_code(faulty_proposal.proposal_type(), faulty_proposal.encode()); - let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); let mut vote_generator = VoteGenerator::new(proposal_id); vote_generator.vote_and_assert_ok(VoteKind::Approve); @@ -399,7 +388,6 @@ fn proposal_execution_failed() { }, finalized_at: Some(1), stake_id: None, - discussion_thread_id: None, } ) }); @@ -418,7 +406,7 @@ fn voting_results_calculation_succeeds() { required_stake: None, }; let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters); - let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); let mut vote_generator = VoteGenerator::new(proposal_id); vote_generator.vote_and_assert_ok(VoteKind::Approve); @@ -446,7 +434,7 @@ fn voting_results_calculation_succeeds() { fn rejected_voting_results_and_remove_proposal_id_from_active_succeeds() { initial_test_ext().execute_with(|| { let dummy_proposal = DummyProposalFixture::default(); - let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); let mut vote_generator = VoteGenerator::new(proposal_id); vote_generator.vote_and_assert_ok(VoteKind::Reject); @@ -505,7 +493,7 @@ fn create_proposal_fails_with_invalid_body_or_title() { fn vote_fails_with_expired_voting_period() { initial_test_ext().execute_with(|| { let dummy_proposal = DummyProposalFixture::default(); - let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); run_to_block_and_finalize(6); @@ -518,7 +506,7 @@ fn vote_fails_with_expired_voting_period() { fn vote_fails_with_not_active_proposal() { initial_test_ext().execute_with(|| { let dummy_proposal = DummyProposalFixture::default(); - let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); let mut vote_generator = VoteGenerator::new(proposal_id); vote_generator.vote_and_assert_ok(VoteKind::Reject); @@ -546,7 +534,7 @@ fn vote_fails_with_absent_proposal() { fn vote_fails_on_double_voting() { initial_test_ext().execute_with(|| { let dummy_proposal = DummyProposalFixture::default(); - let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); let mut vote_generator = VoteGenerator::new(proposal_id); vote_generator.auto_increment_voter_id = false; @@ -565,7 +553,7 @@ fn cancel_proposal_succeeds() { let parameters_fixture = ProposalParametersFixture::default(); let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters_fixture.params()); - let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); let cancel_proposal = CancelProposalFixture::new(proposal_id); cancel_proposal.cancel_and_assert(Ok(())); @@ -586,7 +574,6 @@ fn cancel_proposal_succeeds() { voting_results: VotingResults::default(), finalized_at: Some(1), stake_id: None, - discussion_thread_id: None, } ) }); @@ -596,7 +583,7 @@ fn cancel_proposal_succeeds() { fn cancel_proposal_fails_with_not_active_proposal() { initial_test_ext().execute_with(|| { let dummy_proposal = DummyProposalFixture::default(); - let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); run_to_block_and_finalize(6); @@ -617,7 +604,7 @@ fn cancel_proposal_fails_with_not_existing_proposal() { fn cancel_proposal_fails_with_insufficient_rights() { initial_test_ext().execute_with(|| { let dummy_proposal = DummyProposalFixture::default(); - let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); let cancel_proposal = CancelProposalFixture::new(proposal_id).with_origin(RawOrigin::Signed(2)); @@ -634,7 +621,7 @@ fn veto_proposal_succeeds() { let parameters_fixture = ProposalParametersFixture::default(); let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters_fixture.params()); - let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); // internal active proposal counter check assert_eq!(::get(), 1); @@ -658,7 +645,6 @@ fn veto_proposal_succeeds() { voting_results: VotingResults::default(), finalized_at: Some(1), stake_id: None, - discussion_thread_id: None, } ); @@ -671,7 +657,7 @@ fn veto_proposal_succeeds() { fn veto_proposal_fails_with_not_active_proposal() { initial_test_ext().execute_with(|| { let dummy_proposal = DummyProposalFixture::default(); - let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); run_to_block_and_finalize(6); @@ -692,7 +678,7 @@ fn veto_proposal_fails_with_not_existing_proposal() { fn veto_proposal_fails_with_insufficient_rights() { initial_test_ext().execute_with(|| { let dummy_proposal = DummyProposalFixture::default(); - let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); let veto_proposal = VetoProposalFixture::new(proposal_id).with_origin(RawOrigin::Signed(2)); veto_proposal.veto_and_assert(Err("RequireRootOrigin")); @@ -703,7 +689,7 @@ fn veto_proposal_fails_with_insufficient_rights() { fn create_proposal_event_emitted() { initial_test_ext().execute_with(|| { let dummy_proposal = DummyProposalFixture::default(); - dummy_proposal.create_proposal_and_assert(Ok(())); + dummy_proposal.create_proposal_and_assert(Ok(1)); EventFixture::assert_events(vec![RawEvent::ProposalCreated(1, 1)]); }); @@ -713,7 +699,7 @@ fn create_proposal_event_emitted() { fn veto_proposal_event_emitted() { initial_test_ext().execute_with(|| { let dummy_proposal = DummyProposalFixture::default(); - let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); let veto_proposal = VetoProposalFixture::new(proposal_id); veto_proposal.veto_and_assert(Ok(())); @@ -732,7 +718,7 @@ fn veto_proposal_event_emitted() { fn cancel_proposal_event_emitted() { initial_test_ext().execute_with(|| { let dummy_proposal = DummyProposalFixture::default(); - let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); let cancel_proposal = CancelProposalFixture::new(proposal_id); cancel_proposal.cancel_and_assert(Ok(())); @@ -754,7 +740,7 @@ fn cancel_proposal_event_emitted() { fn vote_proposal_event_emitted() { initial_test_ext().execute_with(|| { let dummy_proposal = DummyProposalFixture::default(); - let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); let mut vote_generator = VoteGenerator::new(proposal_id); vote_generator.vote_and_assert_ok(VoteKind::Approve); @@ -772,7 +758,7 @@ fn create_proposal_and_expire_it() { let parameters_fixture = ProposalParametersFixture::default(); let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters_fixture.params()); - let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); run_to_block_and_finalize(8); @@ -792,7 +778,6 @@ fn create_proposal_and_expire_it() { voting_results: VotingResults::default(), finalized_at: Some(4), stake_id: None, - discussion_thread_id: None, } ) }); @@ -805,7 +790,7 @@ fn proposal_execution_postponed_because_of_grace_period() { let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters_fixture.params()); - let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); let mut vote_generator = VoteGenerator::new(proposal_id); vote_generator.vote_and_assert_ok(VoteKind::Approve); @@ -842,7 +827,6 @@ fn proposal_execution_postponed_because_of_grace_period() { slashes: 0, }, stake_id: None, - discussion_thread_id: None, } ); }); @@ -854,7 +838,7 @@ fn proposal_execution_succeeds_after_the_grace_period() { let parameters_fixture = ProposalParametersFixture::default().with_grace_period(1); let dummy_proposal = DummyProposalFixture::default().with_parameters(parameters_fixture.params()); - let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); let mut vote_generator = VoteGenerator::new(proposal_id); vote_generator.vote_and_assert_ok(VoteKind::Approve); @@ -888,7 +872,6 @@ fn proposal_execution_succeeds_after_the_grace_period() { slashes: 0, }, stake_id: None, - discussion_thread_id: None, }; assert_eq!(proposal, expected_proposal); @@ -911,11 +894,11 @@ fn proposal_execution_succeeds_after_the_grace_period() { #[test] fn create_proposal_fails_on_exceeding_max_active_proposals_count() { initial_test_ext().execute_with(|| { - for idx in 0..100 { + for idx in 1..101 { let dummy_proposal = DummyProposalFixture::default(); - dummy_proposal.create_proposal_and_assert(Ok(())); + dummy_proposal.create_proposal_and_assert(Ok(idx)); // internal active proposal counter check - assert_eq!(::get(), idx + 1); + assert_eq!(::get(), idx); } let dummy_proposal = DummyProposalFixture::default(); @@ -929,7 +912,7 @@ fn create_proposal_fails_on_exceeding_max_active_proposals_count() { fn voting_internal_cache_exists_after_proposal_finalization() { initial_test_ext().execute_with(|| { let dummy_proposal = DummyProposalFixture::default(); - dummy_proposal.create_proposal_and_assert(Ok(())); + dummy_proposal.create_proposal_and_assert(Ok(1)); // last created proposal id equals current proposal count let proposal_id = ::get(); @@ -972,7 +955,7 @@ fn create_dummy_proposal_succeeds_with_stake() { let _imbalance = ::Currency::deposit_creating(&account_id, 500); - let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); let proposal = >::get(proposal_id); @@ -990,7 +973,6 @@ fn create_dummy_proposal_succeeds_with_stake() { voting_results: VotingResults::default(), finalized_at: None, stake_id: Some(0), // valid stake_id - discussion_thread_id: None, } ) }); @@ -1141,7 +1123,7 @@ fn finalize_proposal_using_stake_mocks() { .with_origin(RawOrigin::Signed(account_id)) .with_stake(stake_amount); - let _proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); + let _proposal_id = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); run_to_block_and_finalize(5); }); @@ -1152,7 +1134,7 @@ fn finalize_proposal_using_stake_mocks() { fn proposal_slashing_succeeds() { initial_test_ext().execute_with(|| { let dummy_proposal = DummyProposalFixture::default(); - let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); let mut vote_generator = VoteGenerator::new(proposal_id); vote_generator.vote_and_assert_ok(VoteKind::Reject); @@ -1215,7 +1197,7 @@ fn finalize_proposal_failed_using_stake_mocks() { .with_origin(RawOrigin::Signed(account_id)) .with_stake(stake_amount); - let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); run_to_block_and_finalize(5); @@ -1237,7 +1219,6 @@ fn finalize_proposal_failed_using_stake_mocks() { finalized_at: Some(4), voting_results: VotingResults::default(), stake_id: Some(1), - discussion_thread_id: None, } ); }); diff --git a/modules/proposals/engine/src/types/mod.rs b/modules/proposals/engine/src/types/mod.rs index 8b2003794d..eabef233c3 100644 --- a/modules/proposals/engine/src/types/mod.rs +++ b/modules/proposals/engine/src/types/mod.rs @@ -213,7 +213,7 @@ impl VotingResults { /// 'Proposal' contains information necessary for the proposal system functioning. #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] #[derive(Encode, Decode, Default, Clone, PartialEq, Eq, Debug)] -pub struct Proposal { +pub struct Proposal { /// Proposal type id pub proposal_type: u32, @@ -246,13 +246,9 @@ pub struct Proposal, - - /// Created discussion thread id for the proposal - pub discussion_thread_id: Option, } -impl - Proposal +impl Proposal where BlockNumber: Add + PartialOrd + Copy, { @@ -314,8 +310,8 @@ pub trait VotersParameters { } // Calculates quorum, votes threshold, expiration status -struct ProposalStatusResolution<'a, BlockNumber, ProposerId, Balance, StakeId, DiscussionThreadId> { - proposal: &'a Proposal, +struct ProposalStatusResolution<'a, BlockNumber, ProposerId, Balance, StakeId> { + proposal: &'a Proposal, now: BlockNumber, votes_count: u32, total_voters_count: u32, @@ -323,8 +319,8 @@ struct ProposalStatusResolution<'a, BlockNumber, ProposerId, Balance, StakeId, D slashes: u32, } -impl<'a, BlockNumber, ProposerId, Balance, StakeId, DiscussionThreadId> - ProposalStatusResolution<'a, BlockNumber, ProposerId, Balance, StakeId, DiscussionThreadId> +impl<'a, BlockNumber, ProposerId, Balance, StakeId> + ProposalStatusResolution<'a, BlockNumber, ProposerId, Balance, StakeId> where BlockNumber: Add + PartialOrd + Copy, { @@ -410,19 +406,12 @@ pub type NegativeImbalance = pub type CurrencyOf = ::Currency; /// Data container for the finalized proposal results -pub(crate) struct FinalizedProposalData< - ProposalId, - BlockNumber, - ProposerId, - Balance, - StakeId, - DiscussionThreadId, -> { +pub(crate) struct FinalizedProposalData { /// Proposal id pub proposal_id: ProposalId, /// Proposal to be finalized - pub proposal: Proposal, + pub proposal: Proposal, /// Proposal finalization status pub status: ProposalDecisionStatus, @@ -437,7 +426,7 @@ mod tests { #[test] fn proposal_voting_period_expired() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); proposal.created_at = 1; proposal.parameters.voting_period = 3; @@ -447,7 +436,7 @@ mod tests { #[test] fn proposal_voting_period_not_expired() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); proposal.created_at = 1; proposal.parameters.voting_period = 3; @@ -457,7 +446,7 @@ mod tests { #[test] fn proposal_grace_period_expired() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); proposal.approved_at = Some(1); proposal.parameters.grace_period = 3; @@ -467,7 +456,7 @@ mod tests { #[test] fn proposal_grace_period_auto_expired() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); proposal.approved_at = Some(1); proposal.parameters.grace_period = 0; @@ -477,7 +466,7 @@ mod tests { #[test] fn proposal_grace_period_not_expired() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); proposal.approved_at = Some(1); proposal.parameters.grace_period = 3; @@ -487,7 +476,7 @@ mod tests { #[test] fn proposal_grace_period_not_expired_because_of_not_approved_proposal() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); proposal.approved_at = None; proposal.parameters.grace_period = 3; @@ -497,7 +486,7 @@ mod tests { #[test] fn define_proposal_decision_status_returns_expired() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); let now = 5; proposal.created_at = 1; proposal.parameters.voting_period = 3; @@ -530,7 +519,7 @@ mod tests { #[test] fn define_proposal_decision_status_returns_approved() { let now = 2; - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); proposal.created_at = 1; proposal.parameters.voting_period = 3; proposal.parameters.approval_quorum_percentage = 60; @@ -563,7 +552,7 @@ mod tests { #[test] fn define_proposal_decision_status_returns_rejected() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); let now = 2; proposal.created_at = 1; @@ -596,7 +585,7 @@ mod tests { } #[test] fn define_proposal_decision_status_returns_slashed() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); let now = 2; proposal.created_at = 1; @@ -630,7 +619,7 @@ mod tests { #[test] fn define_proposal_decision_status_returns_none() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); let now = 2; proposal.created_at = 1; @@ -656,7 +645,7 @@ mod tests { #[test] fn define_proposal_decision_status_returns_approved_before_slashing_before_rejection() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); let now = 2; proposal.created_at = 1; @@ -695,7 +684,7 @@ fn define_proposal_decision_status_returns_approved_before_slashing_before_rejec #[test] fn define_proposal_decision_status_returns_slashed_before_rejection() { - let mut proposal = Proposal::::default(); + let mut proposal = Proposal::::default(); let now = 2; proposal.created_at = 1; From d378788ebdc98b835d47ae6d3f3ae64767f4955c Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 28 Feb 2020 17:56:37 +0300 Subject: [PATCH 065/286] Add tests for thread and post content in discussions --- modules/proposals/discussion/src/lib.rs | 2 - modules/proposals/discussion/src/tests/mod.rs | 74 ++++++++++++++++++- 2 files changed, 70 insertions(+), 6 deletions(-) diff --git a/modules/proposals/discussion/src/lib.rs b/modules/proposals/discussion/src/lib.rs index 44e6888188..8baa39fe2e 100644 --- a/modules/proposals/discussion/src/lib.rs +++ b/modules/proposals/discussion/src/lib.rs @@ -30,8 +30,6 @@ use types::{Post, Thread}; // TODO: create_thread() ensures // TODO: create_post() ensures // TODO: create events -// TODO: test thread content -// TODO: test post content // TODO: move errors to decl_error macro const MSG_NOT_AUTHOR: &str = "Author should match the post creator"; diff --git a/modules/proposals/discussion/src/tests/mod.rs b/modules/proposals/discussion/src/tests/mod.rs index a589c342c8..d144b54b05 100644 --- a/modules/proposals/discussion/src/tests/mod.rs +++ b/modules/proposals/discussion/src/tests/mod.rs @@ -10,6 +10,30 @@ use system::RawOrigin; //TODO: update post content check //TODO: update post ensures check +struct TestPostEntry { + pub post_id: u32, + pub text: Vec, + pub edition_number: u32, +} + +fn assert_thread_content(thread_id: u32, post_entries: Vec) { + assert!(>::exists(thread_id)); + + for post_entry in post_entries { + let actual_post = >::get(thread_id, post_entry.post_id); + let expected_post = Post { + text: post_entry.text, + created_at: 1, + updated_at: 1, + author_id: 1, + thread_id, + edition_number: post_entry.edition_number, + }; + + assert_eq!(actual_post, expected_post); + } +} + struct DiscussionFixture { pub title: Vec, pub origin: RawOrigin, @@ -41,7 +65,7 @@ impl PostFixture { } } - fn add_post_and_assert(&mut self, result: Result<(), &'static str>) { + fn add_post_and_assert(&mut self, result: Result<(), &'static str>) -> Option { let add_post_result = Discussions::add_post( self.origin.clone().into(), self.thread_id, @@ -51,19 +75,27 @@ impl PostFixture { assert_eq!(add_post_result, result); self.post_id = Some(::get()); + + self.post_id } - fn update_post_and_assert(&mut self, result: Result<(), &'static str>) { + fn update_post_with_text_and_assert( + &mut self, + new_text: Vec, + result: Result<(), &'static str>, + ) { let add_post_result = Discussions::update_post( self.origin.clone().into(), self.thread_id, self.post_id.unwrap(), - self.text.clone(), + new_text, ); assert_eq!(add_post_result, result); + } - self.post_id = Some(::get()); + fn update_post_and_assert(&mut self, result: Result<(), &'static str>) { + self.update_post_with_text_and_assert(self.text.clone(), result); } } @@ -138,3 +170,37 @@ fn update_post_call_failes_because_of_post_edition_limit() { post_fixture.update_post_and_assert(Err("Post edition limit reached.")); }); } + +#[test] +fn thread_content_check_succeeded() { + initial_test_ext().execute_with(|| { + let discussion_fixture = DiscussionFixture::default(); + + let thread_id = discussion_fixture + .create_discussion_and_assert(Ok(1)) + .unwrap(); + + let mut post_fixture1 = PostFixture::default_for_thread(thread_id); + let post_id1 = post_fixture1.add_post_and_assert(Ok(())).unwrap(); + + let mut post_fixture2 = PostFixture::default_for_thread(thread_id); + let post_id2 = post_fixture2.add_post_and_assert(Ok(())).unwrap(); + post_fixture1.update_post_with_text_and_assert(b"new_text".to_vec(), Ok(())); + + assert_thread_content( + thread_id, + vec![ + TestPostEntry { + post_id: post_id1, + text: b"new_text".to_vec(), + edition_number: 1, + }, + TestPostEntry { + post_id: post_id2, + text: b"text".to_vec(), + edition_number: 0, + }, + ], + ); + }); +} From 3af739aa25d327e17d570b54326c830938a7f854 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 28 Feb 2020 18:19:10 +0300 Subject: [PATCH 066/286] Add create_thread() title ensure_*() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - add ‘title is empty’ check - add ‘title is too big’ check --- modules/proposals/codex/src/tests/mock.rs | 2 + modules/proposals/discussion/src/lib.rs | 13 ++++- .../proposals/discussion/src/tests/mock.rs | 2 + modules/proposals/discussion/src/tests/mod.rs | 47 +++++++++++++++---- 4 files changed, 55 insertions(+), 9 deletions(-) diff --git a/modules/proposals/codex/src/tests/mock.rs b/modules/proposals/codex/src/tests/mock.rs index fefbd9499e..1cb21dbc43 100644 --- a/modules/proposals/codex/src/tests/mock.rs +++ b/modules/proposals/codex/src/tests/mock.rs @@ -89,6 +89,7 @@ impl proposal_engine::Trait for Test { parameter_types! { pub const MaxPostEditionNumber: u32 = 5; + pub const ThreadTitleLengthLimit: u32 = 200; } impl proposal_discussion::Trait for Test { @@ -99,6 +100,7 @@ impl proposal_discussion::Trait for Test { type ThreadAuthorId = u64; type PostAuthorId = u64; type MaxPostEditionNumber = MaxPostEditionNumber; + type ThreadTitleLengthLimit = ThreadTitleLengthLimit; } pub struct MockVotersParameters; diff --git a/modules/proposals/discussion/src/lib.rs b/modules/proposals/discussion/src/lib.rs index 8baa39fe2e..2b874602ea 100644 --- a/modules/proposals/discussion/src/lib.rs +++ b/modules/proposals/discussion/src/lib.rs @@ -34,6 +34,8 @@ use types::{Post, Thread}; const MSG_NOT_AUTHOR: &str = "Author should match the post creator"; const MSG_POST_EDITION_NUMBER_EXCEEDED: &str = "Post edition limit reached."; +pub const MSG_EMPTY_TITLE_PROVIDED: &str = "Proposal cannot have an empty title"; +pub const MSG_TOO_LONG_TITLE: &str = "Title is too long"; /// 'Proposal discussion' substrate module Trait pub trait Trait: system::Trait { @@ -57,6 +59,9 @@ pub trait Trait: system::Trait { /// Defines post edition number limit. type MaxPostEditionNumber: Get; + + // Defines thread title length limit. + type ThreadTitleLengthLimit: Get; } // Storage for the proposals discussion module @@ -108,7 +113,7 @@ decl_module! { pub fn update_post(origin, thread_id: T::ThreadId, post_id : T::PostId, text : Vec) { let account_id = T::ThreadAuthorOrigin::ensure_origin(origin)?; let post_author_id = T::PostAuthorId::from(account_id); - + // thread not exist ensure!, post ! let post = >::get(&thread_id, &post_id); ensure!(post.author_id == post_author_id, MSG_NOT_AUTHOR); @@ -138,6 +143,12 @@ impl Module { let account_id = T::ThreadAuthorOrigin::ensure_origin(origin)?; let thread_author_id = T::ThreadAuthorId::from(account_id); + ensure!(!title.is_empty(), MSG_EMPTY_TITLE_PROVIDED); + ensure!( + title.len() as u32 <= T::ThreadTitleLengthLimit::get(), + MSG_TOO_LONG_TITLE + ); + let next_thread_count_value = Self::thread_count() + 1; let new_thread_id = next_thread_count_value; diff --git a/modules/proposals/discussion/src/tests/mock.rs b/modules/proposals/discussion/src/tests/mock.rs index dfe1f9cd6b..18122c4a28 100644 --- a/modules/proposals/discussion/src/tests/mock.rs +++ b/modules/proposals/discussion/src/tests/mock.rs @@ -30,6 +30,7 @@ parameter_types! { parameter_types! { pub const MaxPostEditionNumber: u32 = 5; + pub const ThreadTitleLengthLimit: u32 = 200; } impl crate::Trait for Test { @@ -40,6 +41,7 @@ impl crate::Trait for Test { type ThreadAuthorId = u64; type PostAuthorId = u64; type MaxPostEditionNumber = MaxPostEditionNumber; + type ThreadTitleLengthLimit = ThreadTitleLengthLimit; } impl system::Trait for Test { diff --git a/modules/proposals/discussion/src/tests/mod.rs b/modules/proposals/discussion/src/tests/mod.rs index d144b54b05..b741d74dbb 100644 --- a/modules/proposals/discussion/src/tests/mod.rs +++ b/modules/proposals/discussion/src/tests/mod.rs @@ -5,9 +5,6 @@ use mock::*; use crate::*; use system::RawOrigin; -//TODO: create discussion content check -//TODO: add post content check -//TODO: update post content check //TODO: update post ensures check struct TestPostEntry { @@ -16,17 +13,31 @@ struct TestPostEntry { pub edition_number: u32, } -fn assert_thread_content(thread_id: u32, post_entries: Vec) { - assert!(>::exists(thread_id)); +struct TestThreadEntry { + pub thread_id: u32, + pub title: Vec, +} + +fn assert_thread_content(thread_entry: TestThreadEntry, post_entries: Vec) { + assert!(>::exists(thread_entry.thread_id)); + + let actual_thread = >::get(thread_entry.thread_id); + let expected_thread = Thread { + title: thread_entry.title, + created_at: 1, + author_id: 1, + }; + assert_eq!(actual_thread, expected_thread); for post_entry in post_entries { - let actual_post = >::get(thread_id, post_entry.post_id); + let actual_post = + >::get(thread_entry.thread_id, post_entry.post_id); let expected_post = Post { text: post_entry.text, created_at: 1, updated_at: 1, author_id: 1, - thread_id, + thread_id: thread_entry.thread_id, edition_number: post_entry.edition_number, }; @@ -48,6 +59,12 @@ impl Default for DiscussionFixture { } } +impl DiscussionFixture { + fn with_title(self, title: Vec) -> Self { + DiscussionFixture { title, ..self } + } +} + struct PostFixture { pub text: Vec, pub origin: RawOrigin, @@ -188,7 +205,10 @@ fn thread_content_check_succeeded() { post_fixture1.update_post_with_text_and_assert(b"new_text".to_vec(), Ok(())); assert_thread_content( - thread_id, + TestThreadEntry { + thread_id, + title: b"title".to_vec(), + }, vec![ TestPostEntry { post_id: post_id1, @@ -204,3 +224,14 @@ fn thread_content_check_succeeded() { ); }); } + +#[test] +fn create_discussion_call_with_bad_title_failed() { + initial_test_ext().execute_with(|| { + let mut discussion_fixture = DiscussionFixture::default().with_title(Vec::new()); + discussion_fixture.create_discussion_and_assert(Err(crate::MSG_EMPTY_TITLE_PROVIDED)); + + discussion_fixture = DiscussionFixture::default().with_title([0; 201].to_vec()); + discussion_fixture.create_discussion_and_assert(Err(crate::MSG_TOO_LONG_TITLE)); + }); +} From 49e3eea39542297f0fad305ac3369db5aff119c3 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 28 Feb 2020 18:51:42 +0300 Subject: [PATCH 067/286] Add checks for discussion module extrinsics Add ensure_* for: - add_post - update_post --- modules/proposals/codex/src/tests/mock.rs | 2 + modules/proposals/discussion/src/lib.rs | 44 ++++-- .../proposals/discussion/src/tests/mock.rs | 2 + modules/proposals/discussion/src/tests/mod.rs | 127 +++++++++++++++++- 4 files changed, 163 insertions(+), 12 deletions(-) diff --git a/modules/proposals/codex/src/tests/mock.rs b/modules/proposals/codex/src/tests/mock.rs index 1cb21dbc43..c7f8de0bb4 100644 --- a/modules/proposals/codex/src/tests/mock.rs +++ b/modules/proposals/codex/src/tests/mock.rs @@ -90,6 +90,7 @@ impl proposal_engine::Trait for Test { parameter_types! { pub const MaxPostEditionNumber: u32 = 5; pub const ThreadTitleLengthLimit: u32 = 200; + pub const PostLengthLimit: u32 = 2000; } impl proposal_discussion::Trait for Test { @@ -101,6 +102,7 @@ impl proposal_discussion::Trait for Test { type PostAuthorId = u64; type MaxPostEditionNumber = MaxPostEditionNumber; type ThreadTitleLengthLimit = ThreadTitleLengthLimit; + type PostLengthLimit = PostLengthLimit; } pub struct MockVotersParameters; diff --git a/modules/proposals/discussion/src/lib.rs b/modules/proposals/discussion/src/lib.rs index 2b874602ea..e043c77c2b 100644 --- a/modules/proposals/discussion/src/lib.rs +++ b/modules/proposals/discussion/src/lib.rs @@ -27,15 +27,17 @@ use srml_support::{decl_module, decl_storage, ensure, Parameter}; use srml_support::traits::Get; use types::{Post, Thread}; -// TODO: create_thread() ensures -// TODO: create_post() ensures // TODO: create events // TODO: move errors to decl_error macro -const MSG_NOT_AUTHOR: &str = "Author should match the post creator"; -const MSG_POST_EDITION_NUMBER_EXCEEDED: &str = "Post edition limit reached."; -pub const MSG_EMPTY_TITLE_PROVIDED: &str = "Proposal cannot have an empty title"; -pub const MSG_TOO_LONG_TITLE: &str = "Title is too long"; +pub(crate) const MSG_NOT_AUTHOR: &str = "Author should match the post creator"; +pub(crate) const MSG_POST_EDITION_NUMBER_EXCEEDED: &str = "Post edition limit reached."; +pub(crate) const MSG_EMPTY_TITLE_PROVIDED: &str = "Discussion cannot have an empty title"; +pub(crate) const MSG_TOO_LONG_TITLE: &str = "Title is too long"; +pub(crate) const MSG_THREAD_DOESNT_EXIST: &str = "Thread doesn't exist"; +pub(crate) const MSG_POST_DOESNT_EXIST: &str = "Post doesn't exist"; +pub(crate) const MSG_EMPTY_POST_PROVIDED: &str = "Post cannot be empty"; +pub(crate) const MSG_TOO_LONG_POST: &str = "Post is too long"; /// 'Proposal discussion' substrate module Trait pub trait Trait: system::Trait { @@ -60,8 +62,11 @@ pub trait Trait: system::Trait { /// Defines post edition number limit. type MaxPostEditionNumber: Get; - // Defines thread title length limit. + /// Defines thread title length limit. type ThreadTitleLengthLimit: Get; + + /// Defines post length limit. + type PostLengthLimit: Get; } // Storage for the proposals discussion module @@ -92,6 +97,16 @@ decl_module! { let account_id = T::ThreadAuthorOrigin::ensure_origin(origin)?; let post_author_id = T::PostAuthorId::from(account_id); + ensure!(>::exists(thread_id), MSG_THREAD_DOESNT_EXIST); + + ensure!(!text.is_empty(), MSG_EMPTY_POST_PROVIDED); + ensure!( + text.len() as u32 <= T::PostLengthLimit::get(), + MSG_TOO_LONG_POST + ); + + // mutation + let next_post_count_value = Self::post_count() + 1; let new_post_id = next_post_count_value; @@ -113,7 +128,16 @@ decl_module! { pub fn update_post(origin, thread_id: T::ThreadId, post_id : T::PostId, text : Vec) { let account_id = T::ThreadAuthorOrigin::ensure_origin(origin)?; let post_author_id = T::PostAuthorId::from(account_id); - // thread not exist ensure!, post ! + + ensure!(>::exists(thread_id), MSG_THREAD_DOESNT_EXIST); + ensure!(>::exists(thread_id, post_id), MSG_POST_DOESNT_EXIST); + + ensure!(!text.is_empty(), MSG_EMPTY_POST_PROVIDED); + ensure!( + text.len() as u32 <= T::PostLengthLimit::get(), + MSG_TOO_LONG_POST + ); + let post = >::get(&thread_id, &post_id); ensure!(post.author_id == post_author_id, MSG_NOT_AUTHOR); @@ -127,6 +151,8 @@ decl_module! { ..post }; + // mutation + >::insert(thread_id, post_id, new_post); } } @@ -158,6 +184,8 @@ impl Module { author_id: thread_author_id, }; + // mutation + let thread_id = T::ThreadId::from(new_thread_id); >::insert(thread_id, new_thread); ThreadCount::put(next_thread_count_value); diff --git a/modules/proposals/discussion/src/tests/mock.rs b/modules/proposals/discussion/src/tests/mock.rs index 18122c4a28..6b9980510f 100644 --- a/modules/proposals/discussion/src/tests/mock.rs +++ b/modules/proposals/discussion/src/tests/mock.rs @@ -31,6 +31,7 @@ parameter_types! { parameter_types! { pub const MaxPostEditionNumber: u32 = 5; pub const ThreadTitleLengthLimit: u32 = 200; + pub const PostLengthLimit: u32 = 2000; } impl crate::Trait for Test { @@ -42,6 +43,7 @@ impl crate::Trait for Test { type PostAuthorId = u64; type MaxPostEditionNumber = MaxPostEditionNumber; type ThreadTitleLengthLimit = ThreadTitleLengthLimit; + type PostLengthLimit = PostLengthLimit; } impl system::Trait for Test { diff --git a/modules/proposals/discussion/src/tests/mod.rs b/modules/proposals/discussion/src/tests/mod.rs index b741d74dbb..c9b72701fc 100644 --- a/modules/proposals/discussion/src/tests/mod.rs +++ b/modules/proposals/discussion/src/tests/mod.rs @@ -5,8 +5,6 @@ use mock::*; use crate::*; use system::RawOrigin; -//TODO: update post ensures check - struct TestPostEntry { pub post_id: u32, pub text: Vec, @@ -82,6 +80,25 @@ impl PostFixture { } } + fn with_text(self, text: Vec) -> Self { + PostFixture { text, ..self } + } + + fn with_origin(self, origin: RawOrigin) -> Self { + PostFixture { origin, ..self } + } + + fn change_thread_id(self, thread_id: u32) -> Self { + PostFixture { thread_id, ..self } + } + + fn change_post_id(self, post_id: u32) -> Self { + PostFixture { + post_id: Some(post_id), + ..self + } + } + fn add_post_and_assert(&mut self, result: Result<(), &'static str>) -> Option { let add_post_result = Discussions::add_post( self.origin.clone().into(), @@ -91,7 +108,9 @@ impl PostFixture { assert_eq!(add_post_result, result); - self.post_id = Some(::get()); + if result.is_ok() { + self.post_id = Some(::get()); + } self.post_id } @@ -184,7 +203,26 @@ fn update_post_call_failes_because_of_post_edition_limit() { post_fixture.update_post_and_assert(Ok(())); } - post_fixture.update_post_and_assert(Err("Post edition limit reached.")); + post_fixture.update_post_and_assert(Err(MSG_POST_EDITION_NUMBER_EXCEEDED)); + }); +} + +#[test] +fn update_post_call_failes_because_of_the_wrong_author() { + initial_test_ext().execute_with(|| { + let discussion_fixture = DiscussionFixture::default(); + + let thread_id = discussion_fixture + .create_discussion_and_assert(Ok(1)) + .unwrap(); + + let mut post_fixture = PostFixture::default_for_thread(thread_id); + + post_fixture.add_post_and_assert(Ok(())); + + post_fixture = post_fixture.with_origin(RawOrigin::Signed(2)); + + post_fixture.update_post_and_assert(Err(MSG_NOT_AUTHOR)); }); } @@ -235,3 +273,84 @@ fn create_discussion_call_with_bad_title_failed() { discussion_fixture.create_discussion_and_assert(Err(crate::MSG_TOO_LONG_TITLE)); }); } + +#[test] +fn add_post_call_with_invalid_thread_failed() { + initial_test_ext().execute_with(|| { + let discussion_fixture = DiscussionFixture::default(); + discussion_fixture + .create_discussion_and_assert(Ok(1)) + .unwrap(); + + let mut post_fixture = PostFixture::default_for_thread(2); + post_fixture.add_post_and_assert(Err(MSG_THREAD_DOESNT_EXIST)); + }); +} + +#[test] +fn update_post_call_with_invalid_post_failed() { + initial_test_ext().execute_with(|| { + let discussion_fixture = DiscussionFixture::default(); + let thread_id = discussion_fixture + .create_discussion_and_assert(Ok(1)) + .unwrap(); + + let mut post_fixture1 = PostFixture::default_for_thread(thread_id); + post_fixture1.add_post_and_assert(Ok(())).unwrap(); + + let mut post_fixture2 = post_fixture1.change_post_id(2); + post_fixture2.update_post_and_assert(Err(MSG_POST_DOESNT_EXIST)); + }); +} + +#[test] +fn update_post_call_with_invalid_thread_failed() { + initial_test_ext().execute_with(|| { + let discussion_fixture = DiscussionFixture::default(); + let thread_id = discussion_fixture + .create_discussion_and_assert(Ok(1)) + .unwrap(); + + let mut post_fixture1 = PostFixture::default_for_thread(thread_id); + post_fixture1.add_post_and_assert(Ok(())).unwrap(); + + let mut post_fixture2 = post_fixture1.change_thread_id(2); + post_fixture2.update_post_and_assert(Err(MSG_THREAD_DOESNT_EXIST)); + }); +} + +#[test] +fn add_post_call_with_invalid_text_failed() { + initial_test_ext().execute_with(|| { + let discussion_fixture = DiscussionFixture::default(); + let thread_id = discussion_fixture + .create_discussion_and_assert(Ok(1)) + .unwrap(); + + let mut post_fixture1 = PostFixture::default_for_thread(thread_id).with_text(Vec::new()); + post_fixture1.add_post_and_assert(Err(MSG_EMPTY_POST_PROVIDED)); + + let mut post_fixture2 = + PostFixture::default_for_thread(thread_id).with_text([0; 2001].to_vec()); + post_fixture2.add_post_and_assert(Err(MSG_TOO_LONG_POST)); + }); +} + +#[test] +fn update_post_call_with_invalid_text_failed() { + initial_test_ext().execute_with(|| { + let discussion_fixture = DiscussionFixture::default(); + let thread_id = discussion_fixture + .create_discussion_and_assert(Ok(1)) + .unwrap(); + + let mut post_fixture1 = PostFixture::default_for_thread(thread_id); + post_fixture1.add_post_and_assert(Ok(())); + + let mut post_fixture2 = post_fixture1.with_text(Vec::new()); + post_fixture2.update_post_and_assert(Err(MSG_EMPTY_POST_PROVIDED)); + + let mut post_fixture3 = post_fixture2.with_text([0; 2001].to_vec()); + post_fixture3.update_post_and_assert(Err(MSG_TOO_LONG_POST)); + }); +} From c0a74cce5406d7a7d823e1871f45e2b8a6351071 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 3 Mar 2020 16:39:36 +0300 Subject: [PATCH 068/286] Add antispam-gate for the thread creation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add ‘max number of threads by same author in a row’ limit --- modules/proposals/codex/src/tests/mock.rs | 2 ++ modules/proposals/discussion/src/lib.rs | 32 ++++++++++++++++++- .../proposals/discussion/src/tests/mock.rs | 2 ++ modules/proposals/discussion/src/tests/mod.rs | 15 +++++++++ modules/proposals/discussion/src/types.rs | 29 +++++++++++++++++ 5 files changed, 79 insertions(+), 1 deletion(-) diff --git a/modules/proposals/codex/src/tests/mock.rs b/modules/proposals/codex/src/tests/mock.rs index abe8d7dbcb..310a22cd60 100644 --- a/modules/proposals/codex/src/tests/mock.rs +++ b/modules/proposals/codex/src/tests/mock.rs @@ -107,6 +107,7 @@ impl proposal_engine::Trait for Test { parameter_types! { pub const MaxPostEditionNumber: u32 = 5; + pub const MaxThreadInARowNumber: u32 = 3; pub const ThreadTitleLengthLimit: u32 = 200; pub const PostLengthLimit: u32 = 2000; } @@ -121,6 +122,7 @@ impl proposal_discussion::Trait for Test { type MaxPostEditionNumber = MaxPostEditionNumber; type ThreadTitleLengthLimit = ThreadTitleLengthLimit; type PostLengthLimit = PostLengthLimit; + type MaxThreadInARowNumber = MaxThreadInARowNumber; } pub struct MockVotersParameters; diff --git a/modules/proposals/discussion/src/lib.rs b/modules/proposals/discussion/src/lib.rs index e043c77c2b..d0608a900a 100644 --- a/modules/proposals/discussion/src/lib.rs +++ b/modules/proposals/discussion/src/lib.rs @@ -25,7 +25,7 @@ use runtime_primitives::traits::EnsureOrigin; use srml_support::{decl_module, decl_storage, ensure, Parameter}; use srml_support::traits::Get; -use types::{Post, Thread}; +use types::{Post, Thread, ThreadCounter}; // TODO: create events // TODO: move errors to decl_error macro @@ -38,6 +38,8 @@ pub(crate) const MSG_THREAD_DOESNT_EXIST: &str = "Thread doesn't exist"; pub(crate) const MSG_POST_DOESNT_EXIST: &str = "Post doesn't exist"; pub(crate) const MSG_EMPTY_POST_PROVIDED: &str = "Post cannot be empty"; pub(crate) const MSG_TOO_LONG_POST: &str = "Post is too long"; +pub(crate) const MSG_MAX_THREAD_IN_A_ROW_LIMIT_EXCEEDED: &str = + "Max number of threads by same author in a row limit exceeded"; /// 'Proposal discussion' substrate module Trait pub trait Trait: system::Trait { @@ -67,6 +69,9 @@ pub trait Trait: system::Trait { /// Defines post length limit. type PostLengthLimit: Get; + + /// Defines max thread by same author in a row number limit. + type MaxThreadInARowNumber: Get; } // Storage for the proposals discussion module @@ -85,6 +90,10 @@ decl_storage! { /// Count of all posts that have been created. pub PostCount get(fn post_count): u32; + + /// Last author thread counter (part of the antispam mechanism) + pub LastThreadAuthorCounter get(fn last_thread_author_counter): + Option>; } } @@ -175,6 +184,14 @@ impl Module { MSG_TOO_LONG_TITLE ); + // get new 'threads in a row' counter for the author + let current_thread_counter = Self::get_updated_thread_counter(thread_author_id.clone()); + + ensure!( + current_thread_counter.counter as u32 <= T::MaxThreadInARowNumber::get(), + MSG_MAX_THREAD_IN_A_ROW_LIMIT_EXCEEDED + ); + let next_thread_count_value = Self::thread_count() + 1; let new_thread_id = next_thread_count_value; @@ -189,7 +206,20 @@ impl Module { let thread_id = T::ThreadId::from(new_thread_id); >::insert(thread_id, new_thread); ThreadCount::put(next_thread_count_value); + >::put(current_thread_counter); Ok(thread_id) } + + // returns incremented thread counter if last thread author equals with provided parameter + fn get_updated_thread_counter( + author_id: T::ThreadAuthorId, + ) -> ThreadCounter { + if let Some(last_thread_author_counter) = Self::last_thread_author_counter() { + if last_thread_author_counter.author_id == author_id { + return last_thread_author_counter.increment(); + } + } + ThreadCounter::new(author_id) + } } diff --git a/modules/proposals/discussion/src/tests/mock.rs b/modules/proposals/discussion/src/tests/mock.rs index 6b9980510f..def36d8125 100644 --- a/modules/proposals/discussion/src/tests/mock.rs +++ b/modules/proposals/discussion/src/tests/mock.rs @@ -30,6 +30,7 @@ parameter_types! { parameter_types! { pub const MaxPostEditionNumber: u32 = 5; + pub const MaxThreadInARowNumber: u32 = 3; pub const ThreadTitleLengthLimit: u32 = 200; pub const PostLengthLimit: u32 = 2000; } @@ -44,6 +45,7 @@ impl crate::Trait for Test { type MaxPostEditionNumber = MaxPostEditionNumber; type ThreadTitleLengthLimit = ThreadTitleLengthLimit; type PostLengthLimit = PostLengthLimit; + type MaxThreadInARowNumber = MaxThreadInARowNumber; } impl system::Trait for Test { diff --git a/modules/proposals/discussion/src/tests/mod.rs b/modules/proposals/discussion/src/tests/mod.rs index c9b72701fc..96e14826f3 100644 --- a/modules/proposals/discussion/src/tests/mod.rs +++ b/modules/proposals/discussion/src/tests/mod.rs @@ -354,3 +354,18 @@ fn update_post_call_with_invalid_text_failed() { post_fixture3.update_post_and_assert(Err(MSG_TOO_LONG_POST)); }); } + +#[test] +fn add_discussion_thread_fails_because_of_max_thread_by_same_author_in_a_row_limit_exceeded() { + initial_test_ext().execute_with(|| { + let discussion_fixture = DiscussionFixture::default(); + for idx in 1..=3 { + discussion_fixture + .create_discussion_and_assert(Ok(idx)) + .unwrap(); + } + + discussion_fixture + .create_discussion_and_assert(Err(MSG_MAX_THREAD_IN_A_ROW_LIMIT_EXCEEDED)); + }); +} diff --git a/modules/proposals/discussion/src/types.rs b/modules/proposals/discussion/src/types.rs index 50a2d4f049..187a93d309 100644 --- a/modules/proposals/discussion/src/types.rs +++ b/modules/proposals/discussion/src/types.rs @@ -40,3 +40,32 @@ pub struct Post { /// Defines how many times this post was edited. Zero on creation. pub edition_number: u32, } + +/// Post for the discussion thread +#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))] +#[derive(Encode, Decode, Default, Clone, Copy, PartialEq, Eq)] +pub struct ThreadCounter { + /// Author of the threads. + pub author_id: ThreadAuthorId, + + /// ThreadCount + pub counter: u32, +} + +impl ThreadCounter { + /// Increments existing counter + pub fn increment(&self) -> Self { + ThreadCounter { + counter: self.counter + 1, + author_id: self.author_id.clone(), + } + } + + /// Creates new counter by author_id. Counter instantiated with 1. + pub fn new(author_id: ThreadAuthorId) -> Self { + ThreadCounter { + author_id, + counter: 1, + } + } +} From e59ff2fc1c22c11311c9c2e972b05741c780a433 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 3 Mar 2020 16:46:48 +0300 Subject: [PATCH 069/286] Update comments --- modules/proposals/discussion/src/lib.rs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/proposals/discussion/src/lib.rs b/modules/proposals/discussion/src/lib.rs index d0608a900a..02cbf7e3be 100644 --- a/modules/proposals/discussion/src/lib.rs +++ b/modules/proposals/discussion/src/lib.rs @@ -3,6 +3,7 @@ //! //! Supported extrinsics: //! - add_post - adds a post to existing discussion thread +//! - update_post - updates existing post //! //! Public API: //! - create_discussion - creates a discussion @@ -28,7 +29,7 @@ use srml_support::traits::Get; use types::{Post, Thread, ThreadCounter}; // TODO: create events -// TODO: move errors to decl_error macro +// TODO: move errors to decl_error macro (after substrate version upgrade) pub(crate) const MSG_NOT_AUTHOR: &str = "Author should match the post creator"; pub(crate) const MSG_POST_EDITION_NUMBER_EXCEEDED: &str = "Post edition limit reached."; @@ -173,7 +174,8 @@ impl Module { >::block_number() } - /// Create the discussion thread + /// Create the discussion thread. Cannot add more threads than 'predefined limit = MaxThreadInARowNumber' + /// times in a row by the same author. pub fn create_thread(origin: T::Origin, title: Vec) -> Result { let account_id = T::ThreadAuthorOrigin::ensure_origin(origin)?; let thread_author_id = T::ThreadAuthorId::from(account_id); @@ -215,11 +217,15 @@ impl Module { fn get_updated_thread_counter( author_id: T::ThreadAuthorId, ) -> ThreadCounter { + // if thread counter exists if let Some(last_thread_author_counter) = Self::last_thread_author_counter() { + // if last(previous) author is the same as current author if last_thread_author_counter.author_id == author_id { return last_thread_author_counter.increment(); } } + + // else return new counter (set with 1 thread number) ThreadCounter::new(author_id) } } From 2e7478dfbdb62ff41e887906f54bc9d7bbcc274a Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 3 Mar 2020 17:08:41 +0300 Subject: [PATCH 070/286] Add ActorOriginValidator trait - add ActorOriginValidator trait - update create_thread() with ThreadAuthorOriginValidator --- modules/proposals/discussion/src/lib.rs | 20 +++++++--- .../proposals/discussion/src/tests/mock.rs | 9 ++++- modules/proposals/discussion/src/tests/mod.rs | 39 +++++++++++++------ modules/proposals/discussion/src/types.rs | 6 +++ 4 files changed, 56 insertions(+), 18 deletions(-) diff --git a/modules/proposals/discussion/src/lib.rs b/modules/proposals/discussion/src/lib.rs index 02cbf7e3be..dd4c220dcf 100644 --- a/modules/proposals/discussion/src/lib.rs +++ b/modules/proposals/discussion/src/lib.rs @@ -26,6 +26,7 @@ use runtime_primitives::traits::EnsureOrigin; use srml_support::{decl_module, decl_storage, ensure, Parameter}; use srml_support::traits::Get; +use types::ActorOriginValidator; use types::{Post, Thread, ThreadCounter}; // TODO: create events @@ -41,11 +42,12 @@ pub(crate) const MSG_EMPTY_POST_PROVIDED: &str = "Post cannot be empty"; pub(crate) const MSG_TOO_LONG_POST: &str = "Post is too long"; pub(crate) const MSG_MAX_THREAD_IN_A_ROW_LIMIT_EXCEEDED: &str = "Max number of threads by same author in a row limit exceeded"; +pub(crate) const MSG_INVALID_AUTHOR_ORIGIN: &str = "Invalid origin and thread_author_id"; /// 'Proposal discussion' substrate module Trait pub trait Trait: system::Trait { /// Origin from which thread author must come. - type ThreadAuthorOrigin: EnsureOrigin; + type ThreadAuthorOriginValidator: ActorOriginValidator; /// Origin from which commenter must come. type PostAuthorOrigin: EnsureOrigin; @@ -104,7 +106,7 @@ decl_module! { /// Adds a post with author origin check. pub fn add_post(origin, thread_id : T::ThreadId, text : Vec) { - let account_id = T::ThreadAuthorOrigin::ensure_origin(origin)?; + let account_id = T::PostAuthorOrigin::ensure_origin(origin)?; let post_author_id = T::PostAuthorId::from(account_id); ensure!(>::exists(thread_id), MSG_THREAD_DOESNT_EXIST); @@ -136,7 +138,7 @@ decl_module! { /// Updates a post with author origin check. Update attempts number is limited. pub fn update_post(origin, thread_id: T::ThreadId, post_id : T::PostId, text : Vec) { - let account_id = T::ThreadAuthorOrigin::ensure_origin(origin)?; + let account_id = T::PostAuthorOrigin::ensure_origin(origin)?; let post_author_id = T::PostAuthorId::from(account_id); ensure!(>::exists(thread_id), MSG_THREAD_DOESNT_EXIST); @@ -176,9 +178,15 @@ impl Module { /// Create the discussion thread. Cannot add more threads than 'predefined limit = MaxThreadInARowNumber' /// times in a row by the same author. - pub fn create_thread(origin: T::Origin, title: Vec) -> Result { - let account_id = T::ThreadAuthorOrigin::ensure_origin(origin)?; - let thread_author_id = T::ThreadAuthorId::from(account_id); + pub fn create_thread( + origin: T::Origin, + thread_author_id: T::ThreadAuthorId, + title: Vec, + ) -> Result { + ensure!( + T::ThreadAuthorOriginValidator::validate_actor_origin(origin, thread_author_id.clone()), + MSG_INVALID_AUTHOR_ORIGIN + ); ensure!(!title.is_empty(), MSG_EMPTY_TITLE_PROVIDED); ensure!( diff --git a/modules/proposals/discussion/src/tests/mock.rs b/modules/proposals/discussion/src/tests/mock.rs index def36d8125..ce8c319bbd 100644 --- a/modules/proposals/discussion/src/tests/mock.rs +++ b/modules/proposals/discussion/src/tests/mock.rs @@ -10,6 +10,7 @@ pub use runtime_primitives::{ BuildStorage, Perbill, }; +use crate::{ActorOriginValidator}; use srml_support::{impl_outer_origin, parameter_types}; impl_outer_origin! { @@ -36,7 +37,7 @@ parameter_types! { } impl crate::Trait for Test { - type ThreadAuthorOrigin = system::EnsureSigned; + type ThreadAuthorOriginValidator = (); type PostAuthorOrigin = system::EnsureSigned; type ThreadId = u32; type PostId = u32; @@ -48,6 +49,12 @@ impl crate::Trait for Test { type MaxThreadInARowNumber = MaxThreadInARowNumber; } +impl ActorOriginValidator for () { + fn validate_actor_origin(_: Origin, actor_id: u64) -> bool { + actor_id == 1 + } +} + impl system::Trait for Test { type Origin = Origin; type Index = u64; diff --git a/modules/proposals/discussion/src/tests/mod.rs b/modules/proposals/discussion/src/tests/mod.rs index 96e14826f3..30a27ad26b 100644 --- a/modules/proposals/discussion/src/tests/mod.rs +++ b/modules/proposals/discussion/src/tests/mod.rs @@ -46,6 +46,7 @@ fn assert_thread_content(thread_entry: TestThreadEntry, post_entries: Vec, pub origin: RawOrigin, + pub author_id: u64, } impl Default for DiscussionFixture { @@ -53,6 +54,7 @@ impl Default for DiscussionFixture { DiscussionFixture { title: b"title".to_vec(), origin: RawOrigin::Signed(1), + author_id: 1, } } } @@ -61,6 +63,22 @@ impl DiscussionFixture { fn with_title(self, title: Vec) -> Self { DiscussionFixture { title, ..self } } + + fn with_author(self, author_id: u64) -> Self { + DiscussionFixture { author_id, ..self } + } + + fn create_discussion_and_assert(&self, result: Result) -> Option { + let create_discussion_result = Discussions::create_thread( + self.origin.clone().into(), + self.author_id, + self.title.clone(), + ); + + assert_eq!(create_discussion_result, result); + + create_discussion_result.ok() + } } struct PostFixture { @@ -135,17 +153,6 @@ impl PostFixture { } } -impl DiscussionFixture { - fn create_discussion_and_assert(&self, result: Result) -> Option { - let create_discussion_result = - Discussions::create_thread(self.origin.clone().into(), self.title.clone()); - - assert_eq!(create_discussion_result, result); - - create_discussion_result.ok() - } -} - #[test] fn create_discussion_call_succeeds() { initial_test_ext().execute_with(|| { @@ -369,3 +376,13 @@ fn add_discussion_thread_fails_because_of_max_thread_by_same_author_in_a_row_lim .create_discussion_and_assert(Err(MSG_MAX_THREAD_IN_A_ROW_LIMIT_EXCEEDED)); }); } + +#[test] +fn add_discussion_thread_fails_because_of_invalid_author_origin() { + initial_test_ext().execute_with(|| { + let discussion_fixture = DiscussionFixture::default().with_author(2); + + discussion_fixture + .create_discussion_and_assert(Err(MSG_INVALID_AUTHOR_ORIGIN)); + }); +} diff --git a/modules/proposals/discussion/src/types.rs b/modules/proposals/discussion/src/types.rs index 187a93d309..d9aa1c7a25 100644 --- a/modules/proposals/discussion/src/types.rs +++ b/modules/proposals/discussion/src/types.rs @@ -69,3 +69,9 @@ impl ThreadCounter { } } } + +/// Abstract validator for the origin(account_id) and actor_id (eg.: thread author id). +pub trait ActorOriginValidator { + /// Check for valid combination of origin and actor_id + fn validate_actor_origin(origin: Origin, actor_id: ActorId) -> bool; +} From 0d9dba2014eb9589ae3d17e7da9307197760b8ec Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 3 Mar 2020 18:31:15 +0300 Subject: [PATCH 071/286] =?UTF-8?q?Introduce=20=E2=80=98PostAuthorOriginVa?= =?UTF-8?q?lidator=E2=80=99=20associated=20type?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - upgrade add_post() and update_post() with PostAuthorOriginValidator --- modules/proposals/discussion/src/lib.rs | 46 +++++++++++++------ .../proposals/discussion/src/tests/mock.rs | 10 ++-- modules/proposals/discussion/src/tests/mod.rs | 17 +++++-- 3 files changed, 52 insertions(+), 21 deletions(-) diff --git a/modules/proposals/discussion/src/lib.rs b/modules/proposals/discussion/src/lib.rs index dd4c220dcf..60eb9d2711 100644 --- a/modules/proposals/discussion/src/lib.rs +++ b/modules/proposals/discussion/src/lib.rs @@ -22,7 +22,6 @@ mod types; use rstd::clone::Clone; use rstd::prelude::*; use rstd::vec::Vec; -use runtime_primitives::traits::EnsureOrigin; use srml_support::{decl_module, decl_storage, ensure, Parameter}; use srml_support::traits::Get; @@ -42,15 +41,18 @@ pub(crate) const MSG_EMPTY_POST_PROVIDED: &str = "Post cannot be empty"; pub(crate) const MSG_TOO_LONG_POST: &str = "Post is too long"; pub(crate) const MSG_MAX_THREAD_IN_A_ROW_LIMIT_EXCEEDED: &str = "Max number of threads by same author in a row limit exceeded"; -pub(crate) const MSG_INVALID_AUTHOR_ORIGIN: &str = "Invalid origin and thread_author_id"; +pub(crate) const MSG_INVALID_THREAD_AUTHOR_ORIGIN: &str = + "Invalid combination of the origin and thread_author_id"; +pub(crate) const MSG_INVALID_POST_AUTHOR_ORIGIN: &str = + "Invalid combination of the origin and post_author_id"; /// 'Proposal discussion' substrate module Trait pub trait Trait: system::Trait { - /// Origin from which thread author must come. + /// Validates thread author id and origin combination type ThreadAuthorOriginValidator: ActorOriginValidator; - /// Origin from which commenter must come. - type PostAuthorOrigin: EnsureOrigin; + /// Validates post author id and origin combination + type PostAuthorOriginValidator: ActorOriginValidator; /// Discussion thread Id type type ThreadId: From + Into + Parameter + Default + Copy; @@ -104,11 +106,17 @@ decl_module! { /// 'Proposal discussion' substrate module pub struct Module for enum Call where origin: T::Origin { - /// Adds a post with author origin check. - pub fn add_post(origin, thread_id : T::ThreadId, text : Vec) { - let account_id = T::PostAuthorOrigin::ensure_origin(origin)?; - let post_author_id = T::PostAuthorId::from(account_id); - + /// Adds a post with author origin check. + pub fn add_post( + origin, + post_author_id: T::PostAuthorId, + thread_id : T::ThreadId, + text : Vec + ) { + ensure!( + T::PostAuthorOriginValidator::validate_actor_origin(origin, post_author_id.clone()), + MSG_INVALID_POST_AUTHOR_ORIGIN + ); ensure!(>::exists(thread_id), MSG_THREAD_DOESNT_EXIST); ensure!(!text.is_empty(), MSG_EMPTY_POST_PROVIDED); @@ -136,10 +144,18 @@ decl_module! { PostCount::put(next_post_count_value); } - /// Updates a post with author origin check. Update attempts number is limited. - pub fn update_post(origin, thread_id: T::ThreadId, post_id : T::PostId, text : Vec) { - let account_id = T::PostAuthorOrigin::ensure_origin(origin)?; - let post_author_id = T::PostAuthorId::from(account_id); + /// Updates a post with author origin check. Update attempts number is limited. + pub fn update_post( + origin, + post_author_id: T::PostAuthorId, + thread_id: T::ThreadId, + post_id : T::PostId, + text : Vec + ){ + ensure!( + T::PostAuthorOriginValidator::validate_actor_origin(origin, post_author_id.clone()), + MSG_INVALID_POST_AUTHOR_ORIGIN + ); ensure!(>::exists(thread_id), MSG_THREAD_DOESNT_EXIST); ensure!(>::exists(thread_id, post_id), MSG_POST_DOESNT_EXIST); @@ -185,7 +201,7 @@ impl Module { ) -> Result { ensure!( T::ThreadAuthorOriginValidator::validate_actor_origin(origin, thread_author_id.clone()), - MSG_INVALID_AUTHOR_ORIGIN + MSG_INVALID_THREAD_AUTHOR_ORIGIN ); ensure!(!title.is_empty(), MSG_EMPTY_TITLE_PROVIDED); diff --git a/modules/proposals/discussion/src/tests/mock.rs b/modules/proposals/discussion/src/tests/mock.rs index ce8c319bbd..c65c6f1b16 100644 --- a/modules/proposals/discussion/src/tests/mock.rs +++ b/modules/proposals/discussion/src/tests/mock.rs @@ -10,7 +10,7 @@ pub use runtime_primitives::{ BuildStorage, Perbill, }; -use crate::{ActorOriginValidator}; +use crate::ActorOriginValidator; use srml_support::{impl_outer_origin, parameter_types}; impl_outer_origin! { @@ -38,7 +38,7 @@ parameter_types! { impl crate::Trait for Test { type ThreadAuthorOriginValidator = (); - type PostAuthorOrigin = system::EnsureSigned; + type PostAuthorOriginValidator = (); type ThreadId = u32; type PostId = u32; type ThreadAuthorId = u64; @@ -50,7 +50,11 @@ impl crate::Trait for Test { } impl ActorOriginValidator for () { - fn validate_actor_origin(_: Origin, actor_id: u64) -> bool { + fn validate_actor_origin(origin: Origin, actor_id: u64) -> bool { + if system::ensure_none(origin).is_ok() { + return true; + } + actor_id == 1 } } diff --git a/modules/proposals/discussion/src/tests/mod.rs b/modules/proposals/discussion/src/tests/mod.rs index 30a27ad26b..889707a267 100644 --- a/modules/proposals/discussion/src/tests/mod.rs +++ b/modules/proposals/discussion/src/tests/mod.rs @@ -86,12 +86,14 @@ struct PostFixture { pub origin: RawOrigin, pub thread_id: u32, pub post_id: Option, + pub author_id: u64, } impl PostFixture { fn default_for_thread(thread_id: u32) -> Self { PostFixture { text: b"text".to_vec(), + author_id: 1, thread_id, origin: RawOrigin::Signed(1), post_id: None, @@ -106,6 +108,10 @@ impl PostFixture { PostFixture { origin, ..self } } + fn with_author(self, author_id: u64) -> Self { + PostFixture { author_id, ..self } + } + fn change_thread_id(self, thread_id: u32) -> Self { PostFixture { thread_id, ..self } } @@ -120,6 +126,7 @@ impl PostFixture { fn add_post_and_assert(&mut self, result: Result<(), &'static str>) -> Option { let add_post_result = Discussions::add_post( self.origin.clone().into(), + self.author_id, self.thread_id, self.text.clone(), ); @@ -140,6 +147,7 @@ impl PostFixture { ) { let add_post_result = Discussions::update_post( self.origin.clone().into(), + self.author_id, self.thread_id, self.post_id.unwrap(), new_text, @@ -227,7 +235,11 @@ fn update_post_call_failes_because_of_the_wrong_author() { post_fixture.add_post_and_assert(Ok(())); - post_fixture = post_fixture.with_origin(RawOrigin::Signed(2)); + post_fixture = post_fixture.with_author(2); + + post_fixture.update_post_and_assert(Err(MSG_INVALID_POST_AUTHOR_ORIGIN)); + + post_fixture = post_fixture.with_origin(RawOrigin::None).with_author(2); post_fixture.update_post_and_assert(Err(MSG_NOT_AUTHOR)); }); @@ -382,7 +394,6 @@ fn add_discussion_thread_fails_because_of_invalid_author_origin() { initial_test_ext().execute_with(|| { let discussion_fixture = DiscussionFixture::default().with_author(2); - discussion_fixture - .create_discussion_and_assert(Err(MSG_INVALID_AUTHOR_ORIGIN)); + discussion_fixture.create_discussion_and_assert(Err(MSG_INVALID_THREAD_AUTHOR_ORIGIN)); }); } From 0ab9cd9d182a9f7adb7a9134bf4093b33d5826b0 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 3 Mar 2020 19:21:48 +0300 Subject: [PATCH 072/286] Add events to the discussion module - add ThreadCreated, PostCreated, PostUpdated events - add tests - move error messages to the separate module --- modules/proposals/discussion/src/errors.rs | 14 ++++ modules/proposals/discussion/src/lib.rs | 79 +++++++++++-------- .../proposals/discussion/src/tests/mock.rs | 16 +++- modules/proposals/discussion/src/tests/mod.rs | 28 ++++++- 4 files changed, 101 insertions(+), 36 deletions(-) create mode 100644 modules/proposals/discussion/src/errors.rs diff --git a/modules/proposals/discussion/src/errors.rs b/modules/proposals/discussion/src/errors.rs new file mode 100644 index 0000000000..c73fb37064 --- /dev/null +++ b/modules/proposals/discussion/src/errors.rs @@ -0,0 +1,14 @@ +pub(crate) const MSG_NOT_AUTHOR: &str = "Author should match the post creator"; +pub(crate) const MSG_POST_EDITION_NUMBER_EXCEEDED: &str = "Post edition limit reached."; +pub(crate) const MSG_EMPTY_TITLE_PROVIDED: &str = "Discussion cannot have an empty title"; +pub(crate) const MSG_TOO_LONG_TITLE: &str = "Title is too long"; +pub(crate) const MSG_THREAD_DOESNT_EXIST: &str = "Thread doesn't exist"; +pub(crate) const MSG_POST_DOESNT_EXIST: &str = "Post doesn't exist"; +pub(crate) const MSG_EMPTY_POST_PROVIDED: &str = "Post cannot be empty"; +pub(crate) const MSG_TOO_LONG_POST: &str = "Post is too long"; +pub(crate) const MSG_MAX_THREAD_IN_A_ROW_LIMIT_EXCEEDED: &str = + "Max number of threads by same author in a row limit exceeded"; +pub(crate) const MSG_INVALID_THREAD_AUTHOR_ORIGIN: &str = + "Invalid combination of the origin and thread_author_id"; +pub(crate) const MSG_INVALID_POST_AUTHOR_ORIGIN: &str = + "Invalid combination of the origin and post_author_id"; \ No newline at end of file diff --git a/modules/proposals/discussion/src/lib.rs b/modules/proposals/discussion/src/lib.rs index 60eb9d2711..185c15969a 100644 --- a/modules/proposals/discussion/src/lib.rs +++ b/modules/proposals/discussion/src/lib.rs @@ -18,11 +18,12 @@ #[cfg(test)] mod tests; mod types; +mod errors; use rstd::clone::Clone; use rstd::prelude::*; use rstd::vec::Vec; -use srml_support::{decl_module, decl_storage, ensure, Parameter}; +use srml_support::{decl_module, decl_event, decl_storage, ensure, Parameter}; use srml_support::traits::Get; use types::ActorOriginValidator; @@ -31,23 +32,31 @@ use types::{Post, Thread, ThreadCounter}; // TODO: create events // TODO: move errors to decl_error macro (after substrate version upgrade) -pub(crate) const MSG_NOT_AUTHOR: &str = "Author should match the post creator"; -pub(crate) const MSG_POST_EDITION_NUMBER_EXCEEDED: &str = "Post edition limit reached."; -pub(crate) const MSG_EMPTY_TITLE_PROVIDED: &str = "Discussion cannot have an empty title"; -pub(crate) const MSG_TOO_LONG_TITLE: &str = "Title is too long"; -pub(crate) const MSG_THREAD_DOESNT_EXIST: &str = "Thread doesn't exist"; -pub(crate) const MSG_POST_DOESNT_EXIST: &str = "Post doesn't exist"; -pub(crate) const MSG_EMPTY_POST_PROVIDED: &str = "Post cannot be empty"; -pub(crate) const MSG_TOO_LONG_POST: &str = "Post is too long"; -pub(crate) const MSG_MAX_THREAD_IN_A_ROW_LIMIT_EXCEEDED: &str = - "Max number of threads by same author in a row limit exceeded"; -pub(crate) const MSG_INVALID_THREAD_AUTHOR_ORIGIN: &str = - "Invalid combination of the origin and thread_author_id"; -pub(crate) const MSG_INVALID_POST_AUTHOR_ORIGIN: &str = - "Invalid combination of the origin and post_author_id"; +decl_event!( + /// Proposals engine events + pub enum Event + where + ::ThreadId, + ::ThreadAuthorId, + ::PostId, + ::PostAuthorId, + { + /// Emits on thread creation. + ThreadCreated(ThreadId, ThreadAuthorId), + + /// Emits on post creation. + PostCreated(PostId, PostAuthorId), + + /// Emits on post update. + PostUpdated(PostId, PostAuthorId), + } +); /// 'Proposal discussion' substrate module Trait pub trait Trait: system::Trait { + /// Engine event type. + type Event: From> + Into<::Event>; + /// Validates thread author id and origin combination type ThreadAuthorOriginValidator: ActorOriginValidator; @@ -106,6 +115,9 @@ decl_module! { /// 'Proposal discussion' substrate module pub struct Module for enum Call where origin: T::Origin { + /// Emits an event. Default substrate implementation. + fn deposit_event() = default; + /// Adds a post with author origin check. pub fn add_post( origin, @@ -115,14 +127,14 @@ decl_module! { ) { ensure!( T::PostAuthorOriginValidator::validate_actor_origin(origin, post_author_id.clone()), - MSG_INVALID_POST_AUTHOR_ORIGIN + errors::MSG_INVALID_POST_AUTHOR_ORIGIN ); - ensure!(>::exists(thread_id), MSG_THREAD_DOESNT_EXIST); + ensure!(>::exists(thread_id), errors::MSG_THREAD_DOESNT_EXIST); - ensure!(!text.is_empty(), MSG_EMPTY_POST_PROVIDED); + ensure!(!text.is_empty(), errors::MSG_EMPTY_POST_PROVIDED); ensure!( text.len() as u32 <= T::PostLengthLimit::get(), - MSG_TOO_LONG_POST + errors::MSG_TOO_LONG_POST ); // mutation @@ -134,7 +146,7 @@ decl_module! { text, created_at: Self::current_block(), updated_at: Self::current_block(), - author_id: post_author_id, + author_id: post_author_id.clone(), edition_number : 0, thread_id, }; @@ -142,6 +154,7 @@ decl_module! { let post_id = T::PostId::from(new_post_id); >::insert(thread_id, post_id, new_post); PostCount::put(next_post_count_value); + Self::deposit_event(RawEvent::PostCreated(post_id, post_author_id)); } /// Updates a post with author origin check. Update attempts number is limited. @@ -154,23 +167,23 @@ decl_module! { ){ ensure!( T::PostAuthorOriginValidator::validate_actor_origin(origin, post_author_id.clone()), - MSG_INVALID_POST_AUTHOR_ORIGIN + errors::MSG_INVALID_POST_AUTHOR_ORIGIN ); - ensure!(>::exists(thread_id), MSG_THREAD_DOESNT_EXIST); - ensure!(>::exists(thread_id, post_id), MSG_POST_DOESNT_EXIST); + ensure!(>::exists(thread_id), errors::MSG_THREAD_DOESNT_EXIST); + ensure!(>::exists(thread_id, post_id), errors::MSG_POST_DOESNT_EXIST); - ensure!(!text.is_empty(), MSG_EMPTY_POST_PROVIDED); + ensure!(!text.is_empty(), errors::MSG_EMPTY_POST_PROVIDED); ensure!( text.len() as u32 <= T::PostLengthLimit::get(), - MSG_TOO_LONG_POST + errors::MSG_TOO_LONG_POST ); let post = >::get(&thread_id, &post_id); - ensure!(post.author_id == post_author_id, MSG_NOT_AUTHOR); + ensure!(post.author_id == post_author_id, errors::MSG_NOT_AUTHOR); ensure!(post.edition_number < T::MaxPostEditionNumber::get(), - MSG_POST_EDITION_NUMBER_EXCEEDED); + errors::MSG_POST_EDITION_NUMBER_EXCEEDED); let new_post = Post { text, @@ -182,6 +195,7 @@ decl_module! { // mutation >::insert(thread_id, post_id, new_post); + Self::deposit_event(RawEvent::PostUpdated(post_id, post_author_id)); } } } @@ -201,13 +215,13 @@ impl Module { ) -> Result { ensure!( T::ThreadAuthorOriginValidator::validate_actor_origin(origin, thread_author_id.clone()), - MSG_INVALID_THREAD_AUTHOR_ORIGIN + errors::MSG_INVALID_THREAD_AUTHOR_ORIGIN ); - ensure!(!title.is_empty(), MSG_EMPTY_TITLE_PROVIDED); + ensure!(!title.is_empty(), errors::MSG_EMPTY_TITLE_PROVIDED); ensure!( title.len() as u32 <= T::ThreadTitleLengthLimit::get(), - MSG_TOO_LONG_TITLE + errors::MSG_TOO_LONG_TITLE ); // get new 'threads in a row' counter for the author @@ -215,7 +229,7 @@ impl Module { ensure!( current_thread_counter.counter as u32 <= T::MaxThreadInARowNumber::get(), - MSG_MAX_THREAD_IN_A_ROW_LIMIT_EXCEEDED + errors::MSG_MAX_THREAD_IN_A_ROW_LIMIT_EXCEEDED ); let next_thread_count_value = Self::thread_count() + 1; @@ -224,7 +238,7 @@ impl Module { let new_thread = Thread { title, created_at: Self::current_block(), - author_id: thread_author_id, + author_id: thread_author_id.clone(), }; // mutation @@ -233,6 +247,7 @@ impl Module { >::insert(thread_id, new_thread); ThreadCount::put(next_thread_count_value); >::put(current_thread_counter); + Self::deposit_event(RawEvent::ThreadCreated(thread_id, thread_author_id)); Ok(thread_id) } diff --git a/modules/proposals/discussion/src/tests/mock.rs b/modules/proposals/discussion/src/tests/mock.rs index c65c6f1b16..a9cbd72c94 100644 --- a/modules/proposals/discussion/src/tests/mock.rs +++ b/modules/proposals/discussion/src/tests/mock.rs @@ -11,7 +11,7 @@ pub use runtime_primitives::{ }; use crate::ActorOriginValidator; -use srml_support::{impl_outer_origin, parameter_types}; +use srml_support::{impl_outer_origin, parameter_types, impl_outer_event}; impl_outer_origin! { pub enum Origin for Test {} @@ -36,7 +36,18 @@ parameter_types! { pub const PostLengthLimit: u32 = 2000; } +mod discussion { + pub use crate::Event; +} + +impl_outer_event! { + pub enum TestEvent for Test { + discussion, + } +} + impl crate::Trait for Test { + type Event = TestEvent; type ThreadAuthorOriginValidator = (); type PostAuthorOriginValidator = (); type ThreadId = u32; @@ -69,7 +80,7 @@ impl system::Trait for Test { type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; - type Event = (); + type Event = TestEvent; type BlockHashCount = BlockHashCount; type MaximumBlockWeight = MaximumBlockWeight; type MaximumBlockLength = MaximumBlockLength; @@ -92,3 +103,4 @@ pub fn initial_test_ext() -> runtime_io::TestExternalities { } pub type Discussions = crate::Module; +pub type System = system::Module; diff --git a/modules/proposals/discussion/src/tests/mod.rs b/modules/proposals/discussion/src/tests/mod.rs index 889707a267..35ff52aa55 100644 --- a/modules/proposals/discussion/src/tests/mod.rs +++ b/modules/proposals/discussion/src/tests/mod.rs @@ -3,7 +3,25 @@ mod mock; use mock::*; use crate::*; +use crate::errors::*; use system::RawOrigin; +use system::{EventRecord, Phase}; + +struct EventFixture; +impl EventFixture { + fn assert_events(expected_raw_events: Vec>) { + let expected_events = expected_raw_events + .iter() + .map(|ev| EventRecord { + phase: Phase::ApplyExtrinsic(0), + event: TestEvent::discussion(ev.clone()), + topics: vec![], + }) + .collect::>>(); + + assert_eq!(System::events(), expected_events); + } +} struct TestPostEntry { pub post_id: u32, @@ -198,6 +216,12 @@ fn update_post_call_succeeds() { post_fixture.add_post_and_assert(Ok(())); post_fixture.update_post_and_assert(Ok(())); + + EventFixture::assert_events(vec![ + RawEvent::ThreadCreated(1, 1), + RawEvent::PostCreated(1, 1), + RawEvent::PostUpdated(1, 1), + ]); }); } @@ -286,10 +310,10 @@ fn thread_content_check_succeeded() { fn create_discussion_call_with_bad_title_failed() { initial_test_ext().execute_with(|| { let mut discussion_fixture = DiscussionFixture::default().with_title(Vec::new()); - discussion_fixture.create_discussion_and_assert(Err(crate::MSG_EMPTY_TITLE_PROVIDED)); + discussion_fixture.create_discussion_and_assert(Err(MSG_EMPTY_TITLE_PROVIDED)); discussion_fixture = DiscussionFixture::default().with_title([0; 201].to_vec()); - discussion_fixture.create_discussion_and_assert(Err(crate::MSG_TOO_LONG_TITLE)); + discussion_fixture.create_discussion_and_assert(Err(MSG_TOO_LONG_TITLE)); }); } From 7a3cbe73e3d9eb3fe88eab7001c75878900588f1 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 3 Mar 2020 19:40:27 +0300 Subject: [PATCH 073/286] Update codex module with latest discussion module - add ThreadAuthorId param stub - update mock and tests --- modules/proposals/codex/src/lib.rs | 9 ++++++--- modules/proposals/codex/src/tests/mock.rs | 11 +++++++++-- modules/proposals/discussion/src/errors.rs | 6 +++--- modules/proposals/discussion/src/lib.rs | 12 ++++++------ modules/proposals/discussion/src/tests/mock.rs | 2 +- modules/proposals/discussion/src/tests/mod.rs | 2 +- 6 files changed, 26 insertions(+), 16 deletions(-) diff --git a/modules/proposals/codex/src/lib.rs b/modules/proposals/codex/src/lib.rs index ddc5a3f59d..e7b7d22eb7 100644 --- a/modules/proposals/codex/src/lib.rs +++ b/modules/proposals/codex/src/lib.rs @@ -11,21 +11,22 @@ // Do not delete! Cannot be uncommented by default, because of Parity decl_module! issue. //#![warn(missing_docs)] -pub use proposal_types::{ProposalType, RuntimeUpgradeProposalExecutable, TextProposalExecutable}; - mod proposal_types; #[cfg(test)] mod tests; use codec::Encode; -use proposal_engine::*; use rstd::clone::Clone; use rstd::marker::PhantomData; use rstd::prelude::*; use rstd::vec::Vec; +use runtime_primitives::traits::One; use srml_support::{decl_error, decl_module, decl_storage, ensure}; use system::RawOrigin; +use proposal_engine::*; +pub use proposal_types::{ProposalType, RuntimeUpgradeProposalExecutable, TextProposalExecutable}; + /// 'Proposals codex' substrate module Trait pub trait Trait: system::Trait + proposal_engine::Trait + proposal_discussion::Trait { /// Defines max allowed text proposal length. @@ -100,6 +101,7 @@ decl_module! { let discussion_thread_id = >::create_thread( cloned_origin1, + T::ThreadAuthorId::one(), //TODO: temporary stub, provide implementation title.clone(), )?; @@ -142,6 +144,7 @@ decl_module! { let discussion_thread_id = >::create_thread( cloned_origin1, + T::ThreadAuthorId::one(), //TODO: temporary stub, provide implementation title.clone(), )?; diff --git a/modules/proposals/codex/src/tests/mock.rs b/modules/proposals/codex/src/tests/mock.rs index 310a22cd60..ac941da93c 100644 --- a/modules/proposals/codex/src/tests/mock.rs +++ b/modules/proposals/codex/src/tests/mock.rs @@ -105,6 +105,12 @@ impl proposal_engine::Trait for Test { type MaxActiveProposalLimit = MaxActiveProposalLimit; } +impl proposal_discussion::ActorOriginValidator for () { + fn validate_actor_origin(_: Origin, _: u64) -> bool { + true + } +} + parameter_types! { pub const MaxPostEditionNumber: u32 = 5; pub const MaxThreadInARowNumber: u32 = 3; @@ -113,8 +119,9 @@ parameter_types! { } impl proposal_discussion::Trait for Test { - type ThreadAuthorOrigin = system::EnsureSigned; - type PostAuthorOrigin = system::EnsureSigned; + type Event = (); + type ThreadAuthorOriginValidator = (); + type PostAuthorOriginValidator = (); type ThreadId = u32; type PostId = u32; type ThreadAuthorId = u64; diff --git a/modules/proposals/discussion/src/errors.rs b/modules/proposals/discussion/src/errors.rs index c73fb37064..9cdc1367d8 100644 --- a/modules/proposals/discussion/src/errors.rs +++ b/modules/proposals/discussion/src/errors.rs @@ -7,8 +7,8 @@ pub(crate) const MSG_POST_DOESNT_EXIST: &str = "Post doesn't exist"; pub(crate) const MSG_EMPTY_POST_PROVIDED: &str = "Post cannot be empty"; pub(crate) const MSG_TOO_LONG_POST: &str = "Post is too long"; pub(crate) const MSG_MAX_THREAD_IN_A_ROW_LIMIT_EXCEEDED: &str = - "Max number of threads by same author in a row limit exceeded"; + "Max number of threads by same author in a row limit exceeded"; pub(crate) const MSG_INVALID_THREAD_AUTHOR_ORIGIN: &str = - "Invalid combination of the origin and thread_author_id"; + "Invalid combination of the origin and thread_author_id"; pub(crate) const MSG_INVALID_POST_AUTHOR_ORIGIN: &str = - "Invalid combination of the origin and post_author_id"; \ No newline at end of file + "Invalid combination of the origin and post_author_id"; diff --git a/modules/proposals/discussion/src/lib.rs b/modules/proposals/discussion/src/lib.rs index 185c15969a..47bf123011 100644 --- a/modules/proposals/discussion/src/lib.rs +++ b/modules/proposals/discussion/src/lib.rs @@ -15,21 +15,21 @@ // Do not delete! Cannot be uncommented by default, because of Parity decl_module! issue. //#![warn(missing_docs)] +mod errors; #[cfg(test)] mod tests; mod types; -mod errors; use rstd::clone::Clone; use rstd::prelude::*; use rstd::vec::Vec; -use srml_support::{decl_module, decl_event, decl_storage, ensure, Parameter}; +use srml_support::{decl_event, decl_module, decl_storage, ensure, Parameter}; +use runtime_primitives::traits::SimpleArithmetic; use srml_support::traits::Get; -use types::ActorOriginValidator; +pub use types::ActorOriginValidator; use types::{Post, Thread, ThreadCounter}; -// TODO: create events // TODO: move errors to decl_error macro (after substrate version upgrade) decl_event!( @@ -60,7 +60,7 @@ pub trait Trait: system::Trait { /// Validates thread author id and origin combination type ThreadAuthorOriginValidator: ActorOriginValidator; - /// Validates post author id and origin combination + /// Validates post author id and origin combination type PostAuthorOriginValidator: ActorOriginValidator; /// Discussion thread Id type @@ -70,7 +70,7 @@ pub trait Trait: system::Trait { type PostId: From + Parameter + Default + Copy; /// Type for the thread author id. Should be authenticated by account id. - type ThreadAuthorId: From + Parameter + Default; + type ThreadAuthorId: From + Parameter + Default + SimpleArithmetic; /// Type for the post author id. Should be authenticated by account id. type PostAuthorId: From + Parameter + Default; diff --git a/modules/proposals/discussion/src/tests/mock.rs b/modules/proposals/discussion/src/tests/mock.rs index a9cbd72c94..597f96e10e 100644 --- a/modules/proposals/discussion/src/tests/mock.rs +++ b/modules/proposals/discussion/src/tests/mock.rs @@ -11,7 +11,7 @@ pub use runtime_primitives::{ }; use crate::ActorOriginValidator; -use srml_support::{impl_outer_origin, parameter_types, impl_outer_event}; +use srml_support::{impl_outer_event, impl_outer_origin, parameter_types}; impl_outer_origin! { pub enum Origin for Test {} diff --git a/modules/proposals/discussion/src/tests/mod.rs b/modules/proposals/discussion/src/tests/mod.rs index 35ff52aa55..9d6853e4a9 100644 --- a/modules/proposals/discussion/src/tests/mod.rs +++ b/modules/proposals/discussion/src/tests/mod.rs @@ -2,8 +2,8 @@ mod mock; use mock::*; -use crate::*; use crate::errors::*; +use crate::*; use system::RawOrigin; use system::{EventRecord, Phase}; From 0dad6a008ad31be154a56116c732c83e279712e4 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Thu, 12 Mar 2020 15:19:51 +0300 Subject: [PATCH 074/286] =?UTF-8?q?Move=20proposals=20to=20the=20=E2=80=98?= =?UTF-8?q?runtime-modules=E2=80=99=20folder?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- {modules => runtime-modules}/proposals/Cargo.toml | 0 {modules => runtime-modules}/proposals/codex/Cargo.toml | 0 {modules => runtime-modules}/proposals/codex/src/lib.rs | 0 .../proposals/codex/src/proposal_types/mod.rs | 0 .../proposals/codex/src/proposal_types/parameters.rs | 0 .../proposals/codex/src/proposal_types/runtime_upgrade.rs | 0 .../proposals/codex/src/proposal_types/text_proposal.rs | 0 {modules => runtime-modules}/proposals/codex/src/tests/mock.rs | 0 {modules => runtime-modules}/proposals/codex/src/tests/mod.rs | 0 {modules => runtime-modules}/proposals/discussion/Cargo.toml | 0 {modules => runtime-modules}/proposals/discussion/src/errors.rs | 0 {modules => runtime-modules}/proposals/discussion/src/lib.rs | 0 .../proposals/discussion/src/tests/mock.rs | 0 .../proposals/discussion/src/tests/mod.rs | 0 {modules => runtime-modules}/proposals/discussion/src/types.rs | 0 {modules => runtime-modules}/proposals/engine/Cargo.toml | 0 {modules => runtime-modules}/proposals/engine/src/errors.rs | 0 {modules => runtime-modules}/proposals/engine/src/lib.rs | 0 .../proposals/engine/src/tests/mock/balance_manager.rs | 0 .../proposals/engine/src/tests/mock/mod.rs | 0 .../proposals/engine/src/tests/mock/proposals.rs | 0 .../proposals/engine/src/tests/mock/stakes.rs | 0 {modules => runtime-modules}/proposals/engine/src/tests/mod.rs | 0 {modules => runtime-modules}/proposals/engine/src/types/mod.rs | 0 .../proposals/engine/src/types/proposal_statuses.rs | 0 {modules => runtime-modules}/proposals/engine/src/types/stakes.rs | 0 26 files changed, 0 insertions(+), 0 deletions(-) rename {modules => runtime-modules}/proposals/Cargo.toml (100%) rename {modules => runtime-modules}/proposals/codex/Cargo.toml (100%) rename {modules => runtime-modules}/proposals/codex/src/lib.rs (100%) rename {modules => runtime-modules}/proposals/codex/src/proposal_types/mod.rs (100%) rename {modules => runtime-modules}/proposals/codex/src/proposal_types/parameters.rs (100%) rename {modules => runtime-modules}/proposals/codex/src/proposal_types/runtime_upgrade.rs (100%) rename {modules => runtime-modules}/proposals/codex/src/proposal_types/text_proposal.rs (100%) rename {modules => runtime-modules}/proposals/codex/src/tests/mock.rs (100%) rename {modules => runtime-modules}/proposals/codex/src/tests/mod.rs (100%) rename {modules => runtime-modules}/proposals/discussion/Cargo.toml (100%) rename {modules => runtime-modules}/proposals/discussion/src/errors.rs (100%) rename {modules => runtime-modules}/proposals/discussion/src/lib.rs (100%) rename {modules => runtime-modules}/proposals/discussion/src/tests/mock.rs (100%) rename {modules => runtime-modules}/proposals/discussion/src/tests/mod.rs (100%) rename {modules => runtime-modules}/proposals/discussion/src/types.rs (100%) rename {modules => runtime-modules}/proposals/engine/Cargo.toml (100%) rename {modules => runtime-modules}/proposals/engine/src/errors.rs (100%) rename {modules => runtime-modules}/proposals/engine/src/lib.rs (100%) rename {modules => runtime-modules}/proposals/engine/src/tests/mock/balance_manager.rs (100%) rename {modules => runtime-modules}/proposals/engine/src/tests/mock/mod.rs (100%) rename {modules => runtime-modules}/proposals/engine/src/tests/mock/proposals.rs (100%) rename {modules => runtime-modules}/proposals/engine/src/tests/mock/stakes.rs (100%) rename {modules => runtime-modules}/proposals/engine/src/tests/mod.rs (100%) rename {modules => runtime-modules}/proposals/engine/src/types/mod.rs (100%) rename {modules => runtime-modules}/proposals/engine/src/types/proposal_statuses.rs (100%) rename {modules => runtime-modules}/proposals/engine/src/types/stakes.rs (100%) diff --git a/modules/proposals/Cargo.toml b/runtime-modules/proposals/Cargo.toml similarity index 100% rename from modules/proposals/Cargo.toml rename to runtime-modules/proposals/Cargo.toml diff --git a/modules/proposals/codex/Cargo.toml b/runtime-modules/proposals/codex/Cargo.toml similarity index 100% rename from modules/proposals/codex/Cargo.toml rename to runtime-modules/proposals/codex/Cargo.toml diff --git a/modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs similarity index 100% rename from modules/proposals/codex/src/lib.rs rename to runtime-modules/proposals/codex/src/lib.rs diff --git a/modules/proposals/codex/src/proposal_types/mod.rs b/runtime-modules/proposals/codex/src/proposal_types/mod.rs similarity index 100% rename from modules/proposals/codex/src/proposal_types/mod.rs rename to runtime-modules/proposals/codex/src/proposal_types/mod.rs diff --git a/modules/proposals/codex/src/proposal_types/parameters.rs b/runtime-modules/proposals/codex/src/proposal_types/parameters.rs similarity index 100% rename from modules/proposals/codex/src/proposal_types/parameters.rs rename to runtime-modules/proposals/codex/src/proposal_types/parameters.rs diff --git a/modules/proposals/codex/src/proposal_types/runtime_upgrade.rs b/runtime-modules/proposals/codex/src/proposal_types/runtime_upgrade.rs similarity index 100% rename from modules/proposals/codex/src/proposal_types/runtime_upgrade.rs rename to runtime-modules/proposals/codex/src/proposal_types/runtime_upgrade.rs diff --git a/modules/proposals/codex/src/proposal_types/text_proposal.rs b/runtime-modules/proposals/codex/src/proposal_types/text_proposal.rs similarity index 100% rename from modules/proposals/codex/src/proposal_types/text_proposal.rs rename to runtime-modules/proposals/codex/src/proposal_types/text_proposal.rs diff --git a/modules/proposals/codex/src/tests/mock.rs b/runtime-modules/proposals/codex/src/tests/mock.rs similarity index 100% rename from modules/proposals/codex/src/tests/mock.rs rename to runtime-modules/proposals/codex/src/tests/mock.rs diff --git a/modules/proposals/codex/src/tests/mod.rs b/runtime-modules/proposals/codex/src/tests/mod.rs similarity index 100% rename from modules/proposals/codex/src/tests/mod.rs rename to runtime-modules/proposals/codex/src/tests/mod.rs diff --git a/modules/proposals/discussion/Cargo.toml b/runtime-modules/proposals/discussion/Cargo.toml similarity index 100% rename from modules/proposals/discussion/Cargo.toml rename to runtime-modules/proposals/discussion/Cargo.toml diff --git a/modules/proposals/discussion/src/errors.rs b/runtime-modules/proposals/discussion/src/errors.rs similarity index 100% rename from modules/proposals/discussion/src/errors.rs rename to runtime-modules/proposals/discussion/src/errors.rs diff --git a/modules/proposals/discussion/src/lib.rs b/runtime-modules/proposals/discussion/src/lib.rs similarity index 100% rename from modules/proposals/discussion/src/lib.rs rename to runtime-modules/proposals/discussion/src/lib.rs diff --git a/modules/proposals/discussion/src/tests/mock.rs b/runtime-modules/proposals/discussion/src/tests/mock.rs similarity index 100% rename from modules/proposals/discussion/src/tests/mock.rs rename to runtime-modules/proposals/discussion/src/tests/mock.rs diff --git a/modules/proposals/discussion/src/tests/mod.rs b/runtime-modules/proposals/discussion/src/tests/mod.rs similarity index 100% rename from modules/proposals/discussion/src/tests/mod.rs rename to runtime-modules/proposals/discussion/src/tests/mod.rs diff --git a/modules/proposals/discussion/src/types.rs b/runtime-modules/proposals/discussion/src/types.rs similarity index 100% rename from modules/proposals/discussion/src/types.rs rename to runtime-modules/proposals/discussion/src/types.rs diff --git a/modules/proposals/engine/Cargo.toml b/runtime-modules/proposals/engine/Cargo.toml similarity index 100% rename from modules/proposals/engine/Cargo.toml rename to runtime-modules/proposals/engine/Cargo.toml diff --git a/modules/proposals/engine/src/errors.rs b/runtime-modules/proposals/engine/src/errors.rs similarity index 100% rename from modules/proposals/engine/src/errors.rs rename to runtime-modules/proposals/engine/src/errors.rs diff --git a/modules/proposals/engine/src/lib.rs b/runtime-modules/proposals/engine/src/lib.rs similarity index 100% rename from modules/proposals/engine/src/lib.rs rename to runtime-modules/proposals/engine/src/lib.rs diff --git a/modules/proposals/engine/src/tests/mock/balance_manager.rs b/runtime-modules/proposals/engine/src/tests/mock/balance_manager.rs similarity index 100% rename from modules/proposals/engine/src/tests/mock/balance_manager.rs rename to runtime-modules/proposals/engine/src/tests/mock/balance_manager.rs diff --git a/modules/proposals/engine/src/tests/mock/mod.rs b/runtime-modules/proposals/engine/src/tests/mock/mod.rs similarity index 100% rename from modules/proposals/engine/src/tests/mock/mod.rs rename to runtime-modules/proposals/engine/src/tests/mock/mod.rs diff --git a/modules/proposals/engine/src/tests/mock/proposals.rs b/runtime-modules/proposals/engine/src/tests/mock/proposals.rs similarity index 100% rename from modules/proposals/engine/src/tests/mock/proposals.rs rename to runtime-modules/proposals/engine/src/tests/mock/proposals.rs diff --git a/modules/proposals/engine/src/tests/mock/stakes.rs b/runtime-modules/proposals/engine/src/tests/mock/stakes.rs similarity index 100% rename from modules/proposals/engine/src/tests/mock/stakes.rs rename to runtime-modules/proposals/engine/src/tests/mock/stakes.rs diff --git a/modules/proposals/engine/src/tests/mod.rs b/runtime-modules/proposals/engine/src/tests/mod.rs similarity index 100% rename from modules/proposals/engine/src/tests/mod.rs rename to runtime-modules/proposals/engine/src/tests/mod.rs diff --git a/modules/proposals/engine/src/types/mod.rs b/runtime-modules/proposals/engine/src/types/mod.rs similarity index 100% rename from modules/proposals/engine/src/types/mod.rs rename to runtime-modules/proposals/engine/src/types/mod.rs diff --git a/modules/proposals/engine/src/types/proposal_statuses.rs b/runtime-modules/proposals/engine/src/types/proposal_statuses.rs similarity index 100% rename from modules/proposals/engine/src/types/proposal_statuses.rs rename to runtime-modules/proposals/engine/src/types/proposal_statuses.rs diff --git a/modules/proposals/engine/src/types/stakes.rs b/runtime-modules/proposals/engine/src/types/stakes.rs similarity index 100% rename from modules/proposals/engine/src/types/stakes.rs rename to runtime-modules/proposals/engine/src/types/stakes.rs From 1d826d3b4f110cbbc23732e67690bfa6409890e4 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Thu, 12 Mar 2020 15:45:37 +0300 Subject: [PATCH 075/286] =?UTF-8?q?Update=20Cargo.toml=E2=80=99s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - delete proposals workspace - update proposals Cargo.toml’s (engine, codex, discussions) - update global workspace --- Cargo.toml | 3 +++ runtime-modules/proposals/Cargo.toml | 6 ------ runtime-modules/proposals/codex/Cargo.toml | 19 +++++++++---------- .../proposals/discussion/Cargo.toml | 14 +++++++------- runtime-modules/proposals/engine/Cargo.toml | 19 +++++++++---------- 5 files changed, 28 insertions(+), 33 deletions(-) delete mode 100644 runtime-modules/proposals/Cargo.toml diff --git a/Cargo.toml b/Cargo.toml index 280ee5a743..a5bfcd4d5f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,9 @@ [workspace] members = [ "runtime", + "runtime-modules/proposals/engine", + "runtime-modules/proposals/codex", + "runtime-modules/proposals/discussion", "runtime-modules/common", "runtime-modules/content-working-group", "runtime-modules/forum", diff --git a/runtime-modules/proposals/Cargo.toml b/runtime-modules/proposals/Cargo.toml deleted file mode 100644 index a9ca69eb1b..0000000000 --- a/runtime-modules/proposals/Cargo.toml +++ /dev/null @@ -1,6 +0,0 @@ -[workspace] -members = [ - "engine", - "codex", - "discussion", -] \ No newline at end of file diff --git a/runtime-modules/proposals/codex/Cargo.toml b/runtime-modules/proposals/codex/Cargo.toml index c70d81a060..1e7ca1bcb4 100644 --- a/runtime-modules/proposals/codex/Cargo.toml +++ b/runtime-modules/proposals/codex/Cargo.toml @@ -42,49 +42,48 @@ version = '1.0.0' default_features = false git = 'https://github.com/paritytech/substrate.git' package = 'substrate-primitives' -rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' +rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' [dependencies.rstd] default_features = false git = 'https://github.com/paritytech/substrate.git' package = 'sr-std' -rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' +rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' [dependencies.runtime-primitives] default_features = false git = 'https://github.com/paritytech/substrate.git' package = 'sr-primitives' -rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' +rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' [dependencies.srml-support] default_features = false git = 'https://github.com/paritytech/substrate.git' package = 'srml-support' -rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' +rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' [dependencies.system] default_features = false git = 'https://github.com/paritytech/substrate.git' package = 'srml-system' -rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' +rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' [dependencies.timestamp] default_features = false git = 'https://github.com/paritytech/substrate.git' package = 'srml-timestamp' -rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' +rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' [dependencies.balances] package = 'srml-balances' default-features = false git = 'https://github.com/paritytech/substrate.git' -rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' +rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' [dependencies.stake] default_features = false -git = 'https://github.com/joystream/substrate-stake-module' package = 'substrate-stake-module' -rev = '0516efe9230da112bc095e28f34a3715c2e03ca8' +path = '../../stake' [dependencies.proposal_engine] @@ -101,4 +100,4 @@ path = '../discussion' default_features = false git = 'https://github.com/paritytech/substrate.git' package = 'sr-io' -rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' \ No newline at end of file +rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' \ No newline at end of file diff --git a/runtime-modules/proposals/discussion/Cargo.toml b/runtime-modules/proposals/discussion/Cargo.toml index ead2c561ba..e278ae4358 100644 --- a/runtime-modules/proposals/discussion/Cargo.toml +++ b/runtime-modules/proposals/discussion/Cargo.toml @@ -38,40 +38,40 @@ version = '1.0.0' default_features = false git = 'https://github.com/paritytech/substrate.git' package = 'substrate-primitives' -rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' +rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' [dependencies.rstd] default_features = false git = 'https://github.com/paritytech/substrate.git' package = 'sr-std' -rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' +rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' [dependencies.runtime-primitives] default_features = false git = 'https://github.com/paritytech/substrate.git' package = 'sr-primitives' -rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' +rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' [dependencies.srml-support] default_features = false git = 'https://github.com/paritytech/substrate.git' package = 'srml-support' -rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' +rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' [dependencies.system] default_features = false git = 'https://github.com/paritytech/substrate.git' package = 'srml-system' -rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' +rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' [dependencies.timestamp] default_features = false git = 'https://github.com/paritytech/substrate.git' package = 'srml-timestamp' -rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' +rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' [dev-dependencies.runtime-io] default_features = false git = 'https://github.com/paritytech/substrate.git' package = 'sr-io' -rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' \ No newline at end of file +rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' \ No newline at end of file diff --git a/runtime-modules/proposals/engine/Cargo.toml b/runtime-modules/proposals/engine/Cargo.toml index 130220b780..a6c83b6dac 100644 --- a/runtime-modules/proposals/engine/Cargo.toml +++ b/runtime-modules/proposals/engine/Cargo.toml @@ -40,49 +40,48 @@ version = '1.0.0' default_features = false git = 'https://github.com/paritytech/substrate.git' package = 'substrate-primitives' -rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' +rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' [dependencies.rstd] default_features = false git = 'https://github.com/paritytech/substrate.git' package = 'sr-std' -rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' +rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' [dependencies.runtime-primitives] default_features = false git = 'https://github.com/paritytech/substrate.git' package = 'sr-primitives' -rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' +rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' [dependencies.srml-support] default_features = false git = 'https://github.com/paritytech/substrate.git' package = 'srml-support' -rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' +rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' [dependencies.system] default_features = false git = 'https://github.com/paritytech/substrate.git' package = 'srml-system' -rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' +rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' [dependencies.timestamp] default_features = false git = 'https://github.com/paritytech/substrate.git' package = 'srml-timestamp' -rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' +rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' [dependencies.balances] package = 'srml-balances' default-features = false git = 'https://github.com/paritytech/substrate.git' -rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' +rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' [dependencies.stake] default_features = false -git = 'https://github.com/joystream/substrate-stake-module' package = 'substrate-stake-module' -rev = '0516efe9230da112bc095e28f34a3715c2e03ca8' +path = '../../stake' [dev-dependencies] mockall = "0.6.0" @@ -91,6 +90,6 @@ mockall = "0.6.0" default_features = false git = 'https://github.com/paritytech/substrate.git' package = 'sr-io' -rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3' +rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' From 2967e9e4a2650fadb5f35795eea7b6ff543a83fe Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Thu, 12 Mar 2020 15:57:47 +0300 Subject: [PATCH 076/286] Disable warning in runtime lib.rs Add #![allow(array_into_iter)] to runtime/lib.rs srml_staking_reward_curve::build! - substrate macro produces a warning. We need to remove this attribute after post-Rome substrate upgrade. --- runtime/src/lib.rs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 748a61ca29..3467b07ab4 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -4,6 +4,10 @@ // `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256. #![recursion_limit = "256"] +// srml_staking_reward_curve::build! - substrate macro produces a warning. +// TODO: remove after post-Rome substrate upgrade +#![allow(array_into_iter)] + // Make the WASM binary available. // This is required only by the node build. // A dummy wasm_binary.rs will be built for the IDE. @@ -328,6 +332,7 @@ impl session::historical::Trait for Runtime { type FullIdentificationOf = staking::ExposureOf; } + srml_staking_reward_curve::build! { const REWARD_CURVE: PiecewiseLinear<'static> = curve!( min_inflation: 0_025_000, From 7587e9fc694a350817568e18c0389cfa55bfdddd Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Thu, 12 Mar 2020 18:25:53 +0300 Subject: [PATCH 077/286] Integrate discussion system (proposals) with membership crate --- runtime-modules/proposals/codex/Cargo.toml | 11 +++- runtime-modules/proposals/codex/src/lib.rs | 8 +-- .../proposals/codex/src/tests/mock.rs | 14 ++++- .../proposals/discussion/Cargo.toml | 16 ++++++ .../proposals/discussion/src/lib.rs | 26 ++++------ .../proposals/discussion/src/tests/mock.rs | 43 ++++++++++++++- .../proposals/discussion/src/types.rs | 52 ++++++++++++++++++- runtime/src/lib.rs | 2 - 8 files changed, 147 insertions(+), 25 deletions(-) diff --git a/runtime-modules/proposals/codex/Cargo.toml b/runtime-modules/proposals/codex/Cargo.toml index 1e7ca1bcb4..e97e6327e3 100644 --- a/runtime-modules/proposals/codex/Cargo.toml +++ b/runtime-modules/proposals/codex/Cargo.toml @@ -85,6 +85,10 @@ default_features = false package = 'substrate-stake-module' path = '../../stake' +[dependencies.membership] +default_features = false +package = 'substrate-membership-module' +path = '../../membership' [dependencies.proposal_engine] default_features = false @@ -100,4 +104,9 @@ path = '../discussion' default_features = false git = 'https://github.com/paritytech/substrate.git' package = 'sr-io' -rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' \ No newline at end of file +rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' + +[dev-dependencies.common] +default_features = false +package = 'substrate-common-module' +path = '../../common' \ No newline at end of file diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index e7b7d22eb7..e187be5838 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -28,7 +28,9 @@ use proposal_engine::*; pub use proposal_types::{ProposalType, RuntimeUpgradeProposalExecutable, TextProposalExecutable}; /// 'Proposals codex' substrate module Trait -pub trait Trait: system::Trait + proposal_engine::Trait + proposal_discussion::Trait { +pub trait Trait: + system::Trait + proposal_engine::Trait + membership::members::Trait + proposal_discussion::Trait +{ /// Defines max allowed text proposal length. type TextProposalMaxLength: Get; @@ -101,7 +103,7 @@ decl_module! { let discussion_thread_id = >::create_thread( cloned_origin1, - T::ThreadAuthorId::one(), //TODO: temporary stub, provide implementation + T::MemberId::one(), //TODO: temporary stub, provide implementation title.clone(), )?; @@ -144,7 +146,7 @@ decl_module! { let discussion_thread_id = >::create_thread( cloned_origin1, - T::ThreadAuthorId::one(), //TODO: temporary stub, provide implementation + T::MemberId::one(), //TODO: temporary stub, provide implementation title.clone(), )?; diff --git a/runtime-modules/proposals/codex/src/tests/mock.rs b/runtime-modules/proposals/codex/src/tests/mock.rs index ac941da93c..6081b3b4f9 100644 --- a/runtime-modules/proposals/codex/src/tests/mock.rs +++ b/runtime-modules/proposals/codex/src/tests/mock.rs @@ -36,6 +36,19 @@ impl_outer_dispatch! { } } +impl common::currency::GovernanceCurrency for Test { + type Currency = balances::Module; +} + +impl membership::members::Trait for Test { + type Event = (); + type MemberId = u64; + type PaidTermId = u64; + type SubscriptionId = u64; + type ActorId = u64; + type InitialMembersBalance = (); +} + parameter_types! { pub const ExistentialDeposit: u32 = 0; pub const TransferFee: u32 = 0; @@ -124,7 +137,6 @@ impl proposal_discussion::Trait for Test { type PostAuthorOriginValidator = (); type ThreadId = u32; type PostId = u32; - type ThreadAuthorId = u64; type PostAuthorId = u64; type MaxPostEditionNumber = MaxPostEditionNumber; type ThreadTitleLengthLimit = ThreadTitleLengthLimit; diff --git a/runtime-modules/proposals/discussion/Cargo.toml b/runtime-modules/proposals/discussion/Cargo.toml index e278ae4358..30343c212d 100644 --- a/runtime-modules/proposals/discussion/Cargo.toml +++ b/runtime-modules/proposals/discussion/Cargo.toml @@ -70,8 +70,24 @@ git = 'https://github.com/paritytech/substrate.git' package = 'srml-timestamp' rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' +[dependencies.membership] +default_features = false +package = 'substrate-membership-module' +path = '../../membership' + [dev-dependencies.runtime-io] default_features = false git = 'https://github.com/paritytech/substrate.git' package = 'sr-io' +rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' + +[dev-dependencies.common] +default_features = false +package = 'substrate-common-module' +path = '../../common' + +[dev-dependencies.balances] +package = 'srml-balances' +default-features = false +git = 'https://github.com/paritytech/substrate.git' rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' \ No newline at end of file diff --git a/runtime-modules/proposals/discussion/src/lib.rs b/runtime-modules/proposals/discussion/src/lib.rs index 47bf123011..bfdb74c246 100644 --- a/runtime-modules/proposals/discussion/src/lib.rs +++ b/runtime-modules/proposals/discussion/src/lib.rs @@ -25,11 +25,12 @@ use rstd::prelude::*; use rstd::vec::Vec; use srml_support::{decl_event, decl_module, decl_storage, ensure, Parameter}; -use runtime_primitives::traits::SimpleArithmetic; use srml_support::traits::Get; -pub use types::ActorOriginValidator; +pub use types::{ActorOriginValidator, ThreadPostActorOriginValidator}; use types::{Post, Thread, ThreadCounter}; +pub(crate) use types::MemberId; + // TODO: move errors to decl_error macro (after substrate version upgrade) decl_event!( @@ -37,12 +38,12 @@ decl_event!( pub enum Event where ::ThreadId, - ::ThreadAuthorId, + MemberId = MemberId, ::PostId, ::PostAuthorId, { /// Emits on thread creation. - ThreadCreated(ThreadId, ThreadAuthorId), + ThreadCreated(ThreadId, MemberId), /// Emits on post creation. PostCreated(PostId, PostAuthorId), @@ -53,12 +54,12 @@ decl_event!( ); /// 'Proposal discussion' substrate module Trait -pub trait Trait: system::Trait { +pub trait Trait: system::Trait + membership::members::Trait { /// Engine event type. type Event: From> + Into<::Event>; /// Validates thread author id and origin combination - type ThreadAuthorOriginValidator: ActorOriginValidator; + type ThreadAuthorOriginValidator: ActorOriginValidator>; /// Validates post author id and origin combination type PostAuthorOriginValidator: ActorOriginValidator; @@ -69,9 +70,6 @@ pub trait Trait: system::Trait { /// Post Id type type PostId: From + Parameter + Default + Copy; - /// Type for the thread author id. Should be authenticated by account id. - type ThreadAuthorId: From + Parameter + Default + SimpleArithmetic; - /// Type for the post author id. Should be authenticated by account id. type PostAuthorId: From + Parameter + Default; @@ -93,7 +91,7 @@ decl_storage! { pub trait Store for Module as ProposalDiscussion { /// Map thread identifier to corresponding thread. pub ThreadById get(thread_by_id): map T::ThreadId => - Thread; + Thread, T::BlockNumber>; /// Count of all threads that have been created. pub ThreadCount get(fn thread_count): u32; @@ -107,7 +105,7 @@ decl_storage! { /// Last author thread counter (part of the antispam mechanism) pub LastThreadAuthorCounter get(fn last_thread_author_counter): - Option>; + Option>>; } } @@ -210,7 +208,7 @@ impl Module { /// times in a row by the same author. pub fn create_thread( origin: T::Origin, - thread_author_id: T::ThreadAuthorId, + thread_author_id: MemberId, title: Vec, ) -> Result { ensure!( @@ -253,9 +251,7 @@ impl Module { } // returns incremented thread counter if last thread author equals with provided parameter - fn get_updated_thread_counter( - author_id: T::ThreadAuthorId, - ) -> ThreadCounter { + fn get_updated_thread_counter(author_id: MemberId) -> ThreadCounter> { // if thread counter exists if let Some(last_thread_author_counter) = Self::last_thread_author_counter() { // if last(previous) author is the same as current author diff --git a/runtime-modules/proposals/discussion/src/tests/mock.rs b/runtime-modules/proposals/discussion/src/tests/mock.rs index 597f96e10e..186a4cfff1 100644 --- a/runtime-modules/proposals/discussion/src/tests/mock.rs +++ b/runtime-modules/proposals/discussion/src/tests/mock.rs @@ -40,19 +40,60 @@ mod discussion { pub use crate::Event; } +mod membership_mod { + pub use membership::members::Event; +} + impl_outer_event! { pub enum TestEvent for Test { discussion, + balances, + membership_mod, } } +parameter_types! { + pub const ExistentialDeposit: u32 = 0; + pub const TransferFee: u32 = 0; + pub const CreationFee: u32 = 0; +} + +impl balances::Trait for Test { + /// The type for recording an account's balance. + type Balance = u64; + /// What to do if an account's free balance gets zeroed. + type OnFreeBalanceZero = (); + /// What to do if a new account is created. + type OnNewAccount = (); + + type Event = TestEvent; + + type DustRemoval = (); + type TransferPayment = (); + type ExistentialDeposit = ExistentialDeposit; + type TransferFee = TransferFee; + type CreationFee = CreationFee; +} + +impl common::currency::GovernanceCurrency for Test { + type Currency = balances::Module; +} + +impl membership::members::Trait for Test { + type Event = TestEvent; + type MemberId = u64; + type PaidTermId = u64; + type SubscriptionId = u64; + type ActorId = u64; + type InitialMembersBalance = (); +} + impl crate::Trait for Test { type Event = TestEvent; type ThreadAuthorOriginValidator = (); type PostAuthorOriginValidator = (); type ThreadId = u32; type PostId = u32; - type ThreadAuthorId = u64; type PostAuthorId = u64; type MaxPostEditionNumber = MaxPostEditionNumber; type ThreadTitleLengthLimit = ThreadTitleLengthLimit; diff --git a/runtime-modules/proposals/discussion/src/types.rs b/runtime-modules/proposals/discussion/src/types.rs index d9aa1c7a25..856926c1f2 100644 --- a/runtime-modules/proposals/discussion/src/types.rs +++ b/runtime-modules/proposals/discussion/src/types.rs @@ -1,8 +1,13 @@ -use rstd::prelude::*; +use crate::Trait; + +use codec::{Decode, Encode}; #[cfg(feature = "std")] use serde::{Deserialize, Serialize}; -use codec::{Decode, Encode}; +use rstd::marker::PhantomData; +use rstd::prelude::*; + +use system::ensure_signed; /// Represents a discussion thread #[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))] @@ -75,3 +80,46 @@ pub trait ActorOriginValidator { /// Check for valid combination of origin and actor_id fn validate_actor_origin(origin: Origin, actor_id: ActorId) -> bool; } + +// Member of the Joystream organization +pub(crate) type MemberId = ::MemberId; + +/// Default discussion system actor origin validator. Valid for both thread and post authors. +pub struct ThreadPostActorOriginValidator { + marker: PhantomData, +} + +impl ThreadPostActorOriginValidator { + /// Create ThreadPostActorOriginValidator instance + pub fn new() -> Self { + ThreadPostActorOriginValidator { + marker: PhantomData, + } + } +} + +impl ActorOriginValidator<::Origin, MemberId> + for ThreadPostActorOriginValidator +{ + /// Check for valid combination of origin and actor_id. Actor_id should be valid member_id of + /// the membership module + fn validate_actor_origin(origin: ::Origin, actor_id: MemberId) -> bool { + let account_id_result = ensure_signed(origin); + + //todo : modify to Result and rename to ensure + + // check valid signed account_id + if let Ok(account_id) = account_id_result { + // check whether actor_id belongs to the registered member + let profile_result = >::ensure_profile(actor_id); + + if let Ok(profile) = profile_result { + // whether the account_id belongs to the actor + return profile.root_account == account_id + || profile.controller_account == account_id; + } + } + + false + } +} diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 3467b07ab4..6a5e975d02 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -3,7 +3,6 @@ #![cfg_attr(not(feature = "std"), no_std)] // `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256. #![recursion_limit = "256"] - // srml_staking_reward_curve::build! - substrate macro produces a warning. // TODO: remove after post-Rome substrate upgrade #![allow(array_into_iter)] @@ -332,7 +331,6 @@ impl session::historical::Trait for Runtime { type FullIdentificationOf = staking::ExposureOf; } - srml_staking_reward_curve::build! { const REWARD_CURVE: PiecewiseLinear<'static> = curve!( min_inflation: 0_025_000, From 0edc9187fc24831807c9838a4175942ac26cb160 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Thu, 12 Mar 2020 19:04:17 +0300 Subject: [PATCH 078/286] Convert PostAuthorId to the MemberId MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - convert PostAuthorId to the MemberId in proposal discussion module - change validate_actor_origin() to the ensure_actor_origin() - convert ensure_actor_origin() from bool to Result<(), &’static str> --- .../proposals/codex/src/tests/mock.rs | 18 +-------- .../proposals/discussion/src/lib.rs | 37 +++++++++---------- .../proposals/discussion/src/tests/mock.rs | 11 ++++-- .../proposals/discussion/src/tests/mod.rs | 2 +- .../proposals/discussion/src/types.rs | 26 ++++++------- 5 files changed, 40 insertions(+), 54 deletions(-) diff --git a/runtime-modules/proposals/codex/src/tests/mock.rs b/runtime-modules/proposals/codex/src/tests/mock.rs index 6081b3b4f9..72676a7a10 100644 --- a/runtime-modules/proposals/codex/src/tests/mock.rs +++ b/runtime-modules/proposals/codex/src/tests/mock.rs @@ -90,37 +90,24 @@ parameter_types! { impl proposal_engine::Trait for Test { type Event = (); - type ProposalOrigin = system::EnsureSigned; - type VoteOrigin = system::EnsureSigned; - type TotalVotersCounter = MockVotersParameters; - type ProposalCodeDecoder = crate::ProposalType; - type ProposalId = u32; - type ProposerId = u64; - type VoterId = u64; - type StakeHandlerProvider = proposal_engine::DefaultStakeHandlerProvider; - type CancellationFee = CancellationFee; - type RejectionFee = RejectionFee; - type TitleMaxLength = TitleMaxLength; - type DescriptionMaxLength = DescriptionMaxLength; - type MaxActiveProposalLimit = MaxActiveProposalLimit; } impl proposal_discussion::ActorOriginValidator for () { - fn validate_actor_origin(_: Origin, _: u64) -> bool { - true + fn ensure_actor_origin(_: Origin, _: u64, _: &'static str) -> Result<(), &'static str> { + Ok(()) } } @@ -137,7 +124,6 @@ impl proposal_discussion::Trait for Test { type PostAuthorOriginValidator = (); type ThreadId = u32; type PostId = u32; - type PostAuthorId = u64; type MaxPostEditionNumber = MaxPostEditionNumber; type ThreadTitleLengthLimit = ThreadTitleLengthLimit; type PostLengthLimit = PostLengthLimit; diff --git a/runtime-modules/proposals/discussion/src/lib.rs b/runtime-modules/proposals/discussion/src/lib.rs index bfdb74c246..94902731c3 100644 --- a/runtime-modules/proposals/discussion/src/lib.rs +++ b/runtime-modules/proposals/discussion/src/lib.rs @@ -40,16 +40,15 @@ decl_event!( ::ThreadId, MemberId = MemberId, ::PostId, - ::PostAuthorId, { /// Emits on thread creation. ThreadCreated(ThreadId, MemberId), /// Emits on post creation. - PostCreated(PostId, PostAuthorId), + PostCreated(PostId, MemberId), /// Emits on post update. - PostUpdated(PostId, PostAuthorId), + PostUpdated(PostId, MemberId), } ); @@ -62,7 +61,7 @@ pub trait Trait: system::Trait + membership::members::Trait { type ThreadAuthorOriginValidator: ActorOriginValidator>; /// Validates post author id and origin combination - type PostAuthorOriginValidator: ActorOriginValidator; + type PostAuthorOriginValidator: ActorOriginValidator>; /// Discussion thread Id type type ThreadId: From + Into + Parameter + Default + Copy; @@ -70,9 +69,6 @@ pub trait Trait: system::Trait + membership::members::Trait { /// Post Id type type PostId: From + Parameter + Default + Copy; - /// Type for the post author id. Should be authenticated by account id. - type PostAuthorId: From + Parameter + Default; - /// Defines post edition number limit. type MaxPostEditionNumber: Get; @@ -98,7 +94,7 @@ decl_storage! { /// Map thread id and post id to corresponding post. pub PostThreadIdByPostId: double_map T::ThreadId, twox_128(T::PostId) => - Post; + Post, T::BlockNumber, T::ThreadId>; /// Count of all posts that have been created. pub PostCount get(fn post_count): u32; @@ -119,14 +115,15 @@ decl_module! { /// Adds a post with author origin check. pub fn add_post( origin, - post_author_id: T::PostAuthorId, + post_author_id: MemberId, thread_id : T::ThreadId, text : Vec ) { - ensure!( - T::PostAuthorOriginValidator::validate_actor_origin(origin, post_author_id.clone()), + T::PostAuthorOriginValidator::ensure_actor_origin( + origin, + post_author_id.clone(), errors::MSG_INVALID_POST_AUTHOR_ORIGIN - ); + )?; ensure!(>::exists(thread_id), errors::MSG_THREAD_DOESNT_EXIST); ensure!(!text.is_empty(), errors::MSG_EMPTY_POST_PROVIDED); @@ -158,15 +155,16 @@ decl_module! { /// Updates a post with author origin check. Update attempts number is limited. pub fn update_post( origin, - post_author_id: T::PostAuthorId, + post_author_id: MemberId, thread_id: T::ThreadId, post_id : T::PostId, text : Vec ){ - ensure!( - T::PostAuthorOriginValidator::validate_actor_origin(origin, post_author_id.clone()), + T::PostAuthorOriginValidator::ensure_actor_origin( + origin, + post_author_id.clone(), errors::MSG_INVALID_POST_AUTHOR_ORIGIN - ); + )?; ensure!(>::exists(thread_id), errors::MSG_THREAD_DOESNT_EXIST); ensure!(>::exists(thread_id, post_id), errors::MSG_POST_DOESNT_EXIST); @@ -211,10 +209,11 @@ impl Module { thread_author_id: MemberId, title: Vec, ) -> Result { - ensure!( - T::ThreadAuthorOriginValidator::validate_actor_origin(origin, thread_author_id.clone()), + T::ThreadAuthorOriginValidator::ensure_actor_origin( + origin, + thread_author_id.clone(), errors::MSG_INVALID_THREAD_AUTHOR_ORIGIN - ); + )?; ensure!(!title.is_empty(), errors::MSG_EMPTY_TITLE_PROVIDED); ensure!( diff --git a/runtime-modules/proposals/discussion/src/tests/mock.rs b/runtime-modules/proposals/discussion/src/tests/mock.rs index 186a4cfff1..03ec78be09 100644 --- a/runtime-modules/proposals/discussion/src/tests/mock.rs +++ b/runtime-modules/proposals/discussion/src/tests/mock.rs @@ -94,7 +94,6 @@ impl crate::Trait for Test { type PostAuthorOriginValidator = (); type ThreadId = u32; type PostId = u32; - type PostAuthorId = u64; type MaxPostEditionNumber = MaxPostEditionNumber; type ThreadTitleLengthLimit = ThreadTitleLengthLimit; type PostLengthLimit = PostLengthLimit; @@ -102,12 +101,16 @@ impl crate::Trait for Test { } impl ActorOriginValidator for () { - fn validate_actor_origin(origin: Origin, actor_id: u64) -> bool { + fn ensure_actor_origin(origin: Origin, actor_id: u64, error: &'static str) -> Result<(), &'static str> { if system::ensure_none(origin).is_ok() { - return true; + return Ok(()); } - actor_id == 1 + if actor_id == 1 { + return Ok(()) + } + + Err(error) } } diff --git a/runtime-modules/proposals/discussion/src/tests/mod.rs b/runtime-modules/proposals/discussion/src/tests/mod.rs index 9d6853e4a9..a91ec1dd2b 100644 --- a/runtime-modules/proposals/discussion/src/tests/mod.rs +++ b/runtime-modules/proposals/discussion/src/tests/mod.rs @@ -9,7 +9,7 @@ use system::{EventRecord, Phase}; struct EventFixture; impl EventFixture { - fn assert_events(expected_raw_events: Vec>) { + fn assert_events(expected_raw_events: Vec>) { let expected_events = expected_raw_events .iter() .map(|ev| EventRecord { diff --git a/runtime-modules/proposals/discussion/src/types.rs b/runtime-modules/proposals/discussion/src/types.rs index 856926c1f2..49bf728436 100644 --- a/runtime-modules/proposals/discussion/src/types.rs +++ b/runtime-modules/proposals/discussion/src/types.rs @@ -78,7 +78,7 @@ impl ThreadCounter { /// Abstract validator for the origin(account_id) and actor_id (eg.: thread author id). pub trait ActorOriginValidator { /// Check for valid combination of origin and actor_id - fn validate_actor_origin(origin: Origin, actor_id: ActorId) -> bool; + fn ensure_actor_origin(origin: Origin, actor_id: ActorId, error: &'static str) -> Result<(), &'static str>; } // Member of the Joystream organization @@ -103,23 +103,21 @@ impl ActorOriginValidator<::Origin, MemberId> { /// Check for valid combination of origin and actor_id. Actor_id should be valid member_id of /// the membership module - fn validate_actor_origin(origin: ::Origin, actor_id: MemberId) -> bool { - let account_id_result = ensure_signed(origin); + fn ensure_actor_origin(origin: ::Origin, actor_id: MemberId, error : &'static str) -> Result<(), &'static str> { + // check valid signed account_id + let account_id = ensure_signed(origin)?; - //todo : modify to Result and rename to ensure + // check whether actor_id belongs to the registered member + let profile_result = >::ensure_profile(actor_id); - // check valid signed account_id - if let Ok(account_id) = account_id_result { - // check whether actor_id belongs to the registered member - let profile_result = >::ensure_profile(actor_id); - - if let Ok(profile) = profile_result { - // whether the account_id belongs to the actor - return profile.root_account == account_id - || profile.controller_account == account_id; + if let Ok(profile) = profile_result { + // whether the account_id belongs to the actor + if profile.root_account == account_id + || profile.controller_account == account_id { + return Ok(()) } } - false + Err(error) } } From 59d102780e06be7c2a3349a572f9a5d8cb91a2e5 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 13 Mar 2020 13:51:21 +0300 Subject: [PATCH 079/286] Integrate engine with membership module --- runtime-modules/proposals/codex/src/lib.rs | 12 ++++-- .../proposals/discussion/src/lib.rs | 2 +- .../proposals/discussion/src/types.rs | 8 ++-- runtime-modules/proposals/engine/Cargo.toml | 10 ++++- runtime-modules/proposals/engine/src/lib.rs | 38 +++++++++---------- .../proposals/engine/src/types/mod.rs | 3 ++ 6 files changed, 43 insertions(+), 30 deletions(-) diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index e187be5838..13d6fc5bf2 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -20,7 +20,6 @@ use rstd::clone::Clone; use rstd::marker::PhantomData; use rstd::prelude::*; use rstd::vec::Vec; -use runtime_primitives::traits::One; use srml_support::{decl_error, decl_module, decl_storage, ensure}; use system::RawOrigin; @@ -47,6 +46,9 @@ pub type BalanceOf = pub type NegativeImbalance = <::Currency as Currency<::AccountId>>::NegativeImbalance; +// Member of the Joystream organization +pub(crate) type MemberId = ::MemberId; + decl_error! { pub enum Error { /// The size of the provided text for text proposal exceeded the limit @@ -81,6 +83,7 @@ decl_module! { /// Create text (signal) proposal type. On approval prints its content. pub fn create_text_proposal( origin, + member_id: MemberId, title: Vec, description: Vec, text: Vec, @@ -103,12 +106,13 @@ decl_module! { let discussion_thread_id = >::create_thread( cloned_origin1, - T::MemberId::one(), //TODO: temporary stub, provide implementation + member_id, title.clone(), )?; let proposal_id = >::create_proposal( cloned_origin2, + member_id, parameters, title, description, @@ -123,6 +127,7 @@ decl_module! { /// Create runtime upgrade proposal type. On approval prints its content. pub fn create_runtime_upgrade_proposal( origin, + member_id: MemberId, title: Vec, description: Vec, wasm: Vec, @@ -146,12 +151,13 @@ decl_module! { let discussion_thread_id = >::create_thread( cloned_origin1, - T::MemberId::one(), //TODO: temporary stub, provide implementation + member_id, title.clone(), )?; let proposal_id = >::create_proposal( cloned_origin2, + member_id, parameters, title, description, diff --git a/runtime-modules/proposals/discussion/src/lib.rs b/runtime-modules/proposals/discussion/src/lib.rs index 94902731c3..97c8507314 100644 --- a/runtime-modules/proposals/discussion/src/lib.rs +++ b/runtime-modules/proposals/discussion/src/lib.rs @@ -26,7 +26,7 @@ use rstd::vec::Vec; use srml_support::{decl_event, decl_module, decl_storage, ensure, Parameter}; use srml_support::traits::Get; -pub use types::{ActorOriginValidator, ThreadPostActorOriginValidator}; +pub use types::{ActorOriginValidator, MembershipOriginValidator}; use types::{Post, Thread, ThreadCounter}; pub(crate) use types::MemberId; diff --git a/runtime-modules/proposals/discussion/src/types.rs b/runtime-modules/proposals/discussion/src/types.rs index 49bf728436..496d8caba1 100644 --- a/runtime-modules/proposals/discussion/src/types.rs +++ b/runtime-modules/proposals/discussion/src/types.rs @@ -85,21 +85,21 @@ pub trait ActorOriginValidator { pub(crate) type MemberId = ::MemberId; /// Default discussion system actor origin validator. Valid for both thread and post authors. -pub struct ThreadPostActorOriginValidator { +pub struct MembershipOriginValidator { marker: PhantomData, } -impl ThreadPostActorOriginValidator { +impl MembershipOriginValidator { /// Create ThreadPostActorOriginValidator instance pub fn new() -> Self { - ThreadPostActorOriginValidator { + MembershipOriginValidator { marker: PhantomData, } } } impl ActorOriginValidator<::Origin, MemberId> - for ThreadPostActorOriginValidator + for MembershipOriginValidator { /// Check for valid combination of origin and actor_id. Actor_id should be valid member_id of /// the membership module diff --git a/runtime-modules/proposals/engine/Cargo.toml b/runtime-modules/proposals/engine/Cargo.toml index a6c83b6dac..b30d6ccd80 100644 --- a/runtime-modules/proposals/engine/Cargo.toml +++ b/runtime-modules/proposals/engine/Cargo.toml @@ -83,6 +83,11 @@ default_features = false package = 'substrate-stake-module' path = '../../stake' +[dependencies.membership] +default_features = false +package = 'substrate-membership-module' +path = '../../membership' + [dev-dependencies] mockall = "0.6.0" @@ -92,4 +97,7 @@ git = 'https://github.com/paritytech/substrate.git' package = 'sr-io' rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' - +[dev-dependencies.common] +default_features = false +package = 'substrate-common-module' +path = '../../common' \ No newline at end of file diff --git a/runtime-modules/proposals/engine/src/lib.rs b/runtime-modules/proposals/engine/src/lib.rs index 50bd37667d..88dddb9ce8 100644 --- a/runtime-modules/proposals/engine/src/lib.rs +++ b/runtime-modules/proposals/engine/src/lib.rs @@ -22,6 +22,7 @@ // TODO: Test cancellation, rejection fees pub use types::BalanceOf; +use types::MemberId; use types::FinalizedProposalData; use types::ProposalStakeManager; pub use types::VotingResults; @@ -49,7 +50,7 @@ use srml_support::{ use system::ensure_root; /// Proposals engine trait. -pub trait Trait: system::Trait + timestamp::Trait + stake::Trait { +pub trait Trait: system::Trait + timestamp::Trait + stake::Trait + membership::members::Trait { /// Engine event type. type Event: From> + Into<::Event>; @@ -68,12 +69,6 @@ pub trait Trait: system::Trait + timestamp::Trait + stake::Trait { /// Proposal Id type type ProposalId: From + Parameter + Default + Copy; - /// Type for the proposer id. Should be authenticated by account id. - type ProposerId: From + Parameter + Default; - - /// Type for the voter id. Should be authenticated by account id. - type VoterId: From + Parameter + Default + Clone; - /// Provides stake logic implementation. Can be used to mock stake logic. type StakeHandlerProvider: StakeHandlerProvider; @@ -98,15 +93,14 @@ decl_event!( pub enum Event where ::ProposalId, - ::ProposerId, - ::VoterId, + MemberId = MemberId, ::BlockNumber, { /// Emits on proposal creation. /// Params: - /// - Account id of a proposer. + /// - Member id of a proposer. /// - Id of a newly created proposal after it was saved in storage. - ProposalCreated(ProposerId, ProposalId), + ProposalCreated(MemberId, ProposalId), /// Emits on proposal status change. /// Params: @@ -116,10 +110,10 @@ decl_event!( /// Emits on voting for the proposal /// Params: - /// - Voter - an account id of a voter. + /// - Voter - member id of a voter. /// - Id of a proposal. /// - Kind of vote. - Voted(VoterId, ProposalId, VoteKind), + Voted(MemberId, ProposalId, VoteKind), } ); @@ -146,7 +140,7 @@ decl_storage! { /// Double map for preventing duplicate votes. Should be cleaned after usage. pub VoteExistsByProposalByVoter get(fn vote_by_proposal_by_voter): - double_map T::ProposalId, twox_256(T::VoterId) => VoteKind; + double_map T::ProposalId, twox_256(MemberId) => VoteKind; } } @@ -158,9 +152,9 @@ decl_module! { fn deposit_event() = default; /// Vote extrinsic. Conditions: origin must allow votes. - pub fn vote(origin, proposal_id: T::ProposalId, vote: VoteKind) { + pub fn vote(origin, voter_id: MemberId, proposal_id: T::ProposalId, vote: VoteKind) { let account_id = T::VoteOrigin::ensure_origin(origin)?; - let voter_id = T::VoterId::from(account_id); + //TODO: set validator ensure!(>::exists(proposal_id), errors::MSG_PROPOSAL_NOT_FOUND); let mut proposal = Self::proposals(proposal_id); @@ -184,9 +178,10 @@ decl_module! { } /// Cancel a proposal by its original proposer. - pub fn cancel_proposal(origin, proposal_id: T::ProposalId) { + pub fn cancel_proposal(origin, proposer_id: MemberId, proposal_id: T::ProposalId) { let account_id = T::ProposalOrigin::ensure_origin(origin)?; - let proposer_id = T::ProposerId::from(account_id); + // TODO proposer_id should be the same? +// let proposer_id = T::ProposerId::from(account_id); ensure!(>::exists(proposal_id), errors::MSG_PROPOSAL_NOT_FOUND); let proposal = Self::proposals(proposal_id); @@ -242,6 +237,7 @@ impl Module { /// Create proposal. Requires 'proposal origin' membership. pub fn create_proposal( origin: T::Origin, + proposer_id: MemberId, parameters: ProposalParameters>, title: Vec, description: Vec, @@ -250,7 +246,7 @@ impl Module { proposal_code: Vec, ) -> Result { let account_id = T::ProposalOrigin::ensure_origin(origin)?; - let proposer_id = T::ProposerId::from(account_id.clone()); +// let proposer_id = T::ProposerId::from(account_id.clone()); Self::ensure_create_proposal_parameters_are_valid( ¶meters, @@ -536,7 +532,7 @@ impl Module { type FinalizedProposal = FinalizedProposalData< ::ProposalId, ::BlockNumber, - ::ProposerId, + MemberId, types::BalanceOf, ::StakeId, >; @@ -544,7 +540,7 @@ type FinalizedProposal = FinalizedProposalData< // Simplification of the 'Proposal' type type ProposalObject = Proposal< ::BlockNumber, - ::ProposerId, + MemberId, types::BalanceOf, ::StakeId, >; diff --git a/runtime-modules/proposals/engine/src/types/mod.rs b/runtime-modules/proposals/engine/src/types/mod.rs index 18724ceb8c..c618e7ec39 100644 --- a/runtime-modules/proposals/engine/src/types/mod.rs +++ b/runtime-modules/proposals/engine/src/types/mod.rs @@ -321,6 +321,9 @@ pub(crate) struct FinalizedProposalData = ::MemberId; + #[cfg(test)] mod tests { use crate::*; From 7985e6d07620310686042779ef9df096bf60d933 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 13 Mar 2020 14:24:53 +0300 Subject: [PATCH 080/286] Refactor actor_origin_validator - move actor_origin_validator trait and implementation into the membership crate - add actor_validation to the engine --- runtime-modules/membership/src/lib.rs | 1 + .../membership/src/origin_validator.rs | 50 ++++++++++++++++++ runtime-modules/proposals/codex/src/lib.rs | 3 +- .../proposals/discussion/src/lib.rs | 7 ++- .../proposals/discussion/src/types.rs | 52 ------------------- .../proposals/engine/src/errors.rs | 5 +- runtime-modules/proposals/engine/src/lib.rs | 35 ++++++++----- .../proposals/engine/src/types/mod.rs | 3 -- 8 files changed, 80 insertions(+), 76 deletions(-) create mode 100644 runtime-modules/membership/src/origin_validator.rs diff --git a/runtime-modules/membership/src/lib.rs b/runtime-modules/membership/src/lib.rs index a777802fd3..76f8c23c95 100644 --- a/runtime-modules/membership/src/lib.rs +++ b/runtime-modules/membership/src/lib.rs @@ -4,6 +4,7 @@ pub mod genesis; pub mod members; pub mod role_types; +pub mod origin_validator; mod mock; mod tests; diff --git a/runtime-modules/membership/src/origin_validator.rs b/runtime-modules/membership/src/origin_validator.rs new file mode 100644 index 0000000000..97bcda3320 --- /dev/null +++ b/runtime-modules/membership/src/origin_validator.rs @@ -0,0 +1,50 @@ +use rstd::marker::PhantomData; + +use system::ensure_signed; + +/// Abstract validator for the origin(account_id) and actor_id (eg.: thread author id). +pub trait ActorOriginValidator { + /// Check for valid combination of origin and actor_id + fn ensure_actor_origin(origin: Origin, actor_id: ActorId, error: &'static str) -> Result; +} + +/// Member of the Joystream organization +pub type MemberId = ::MemberId; + +/// Default discussion system actor origin validator. Valid for both thread and post authors. +pub struct MembershipOriginValidator { + marker: PhantomData, +} + +impl MembershipOriginValidator { + /// Create ThreadPostActorOriginValidator instance + pub fn new() -> Self { + MembershipOriginValidator { + marker: PhantomData, + } + } +} + +impl ActorOriginValidator<::Origin, MemberId, ::AccountId> +for MembershipOriginValidator +{ + /// Check for valid combination of origin and actor_id. Actor_id should be valid member_id of + /// the membership module + fn ensure_actor_origin(origin: ::Origin, actor_id: MemberId, error : &'static str) -> Result<::AccountId, &'static str> { + // check valid signed account_id + let account_id = ensure_signed(origin)?; + + // check whether actor_id belongs to the registered member + let profile_result = >::ensure_profile(actor_id); + + if let Ok(profile) = profile_result { + // whether the account_id belongs to the actor + if profile.root_account == account_id + || profile.controller_account == account_id { + return Ok(account_id) + } + } + + Err(error) + } +} diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index 13d6fc5bf2..1a52f30438 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -46,8 +46,7 @@ pub type BalanceOf = pub type NegativeImbalance = <::Currency as Currency<::AccountId>>::NegativeImbalance; -// Member of the Joystream organization -pub(crate) type MemberId = ::MemberId; +use membership::origin_validator::{MemberId}; decl_error! { pub enum Error { diff --git a/runtime-modules/proposals/discussion/src/lib.rs b/runtime-modules/proposals/discussion/src/lib.rs index 97c8507314..050d26f213 100644 --- a/runtime-modules/proposals/discussion/src/lib.rs +++ b/runtime-modules/proposals/discussion/src/lib.rs @@ -26,10 +26,9 @@ use rstd::vec::Vec; use srml_support::{decl_event, decl_module, decl_storage, ensure, Parameter}; use srml_support::traits::Get; -pub use types::{ActorOriginValidator, MembershipOriginValidator}; use types::{Post, Thread, ThreadCounter}; -pub(crate) use types::MemberId; +use membership::origin_validator::{ActorOriginValidator, MemberId}; // TODO: move errors to decl_error macro (after substrate version upgrade) @@ -58,10 +57,10 @@ pub trait Trait: system::Trait + membership::members::Trait { type Event: From> + Into<::Event>; /// Validates thread author id and origin combination - type ThreadAuthorOriginValidator: ActorOriginValidator>; + type ThreadAuthorOriginValidator: ActorOriginValidator, Self::AccountId>; /// Validates post author id and origin combination - type PostAuthorOriginValidator: ActorOriginValidator>; + type PostAuthorOriginValidator: ActorOriginValidator, Self::AccountId>; /// Discussion thread Id type type ThreadId: From + Into + Parameter + Default + Copy; diff --git a/runtime-modules/proposals/discussion/src/types.rs b/runtime-modules/proposals/discussion/src/types.rs index 496d8caba1..27e20d9fcc 100644 --- a/runtime-modules/proposals/discussion/src/types.rs +++ b/runtime-modules/proposals/discussion/src/types.rs @@ -1,14 +1,9 @@ -use crate::Trait; - use codec::{Decode, Encode}; #[cfg(feature = "std")] use serde::{Deserialize, Serialize}; -use rstd::marker::PhantomData; use rstd::prelude::*; -use system::ensure_signed; - /// Represents a discussion thread #[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))] #[derive(Encode, Decode, Default, Clone, PartialEq, Eq)] @@ -74,50 +69,3 @@ impl ThreadCounter { } } } - -/// Abstract validator for the origin(account_id) and actor_id (eg.: thread author id). -pub trait ActorOriginValidator { - /// Check for valid combination of origin and actor_id - fn ensure_actor_origin(origin: Origin, actor_id: ActorId, error: &'static str) -> Result<(), &'static str>; -} - -// Member of the Joystream organization -pub(crate) type MemberId = ::MemberId; - -/// Default discussion system actor origin validator. Valid for both thread and post authors. -pub struct MembershipOriginValidator { - marker: PhantomData, -} - -impl MembershipOriginValidator { - /// Create ThreadPostActorOriginValidator instance - pub fn new() -> Self { - MembershipOriginValidator { - marker: PhantomData, - } - } -} - -impl ActorOriginValidator<::Origin, MemberId> - for MembershipOriginValidator -{ - /// Check for valid combination of origin and actor_id. Actor_id should be valid member_id of - /// the membership module - fn ensure_actor_origin(origin: ::Origin, actor_id: MemberId, error : &'static str) -> Result<(), &'static str> { - // check valid signed account_id - let account_id = ensure_signed(origin)?; - - // check whether actor_id belongs to the registered member - let profile_result = >::ensure_profile(actor_id); - - if let Ok(profile) = profile_result { - // whether the account_id belongs to the actor - if profile.root_account == account_id - || profile.controller_account == account_id { - return Ok(()) - } - } - - Err(error) - } -} diff --git a/runtime-modules/proposals/engine/src/errors.rs b/runtime-modules/proposals/engine/src/errors.rs index 4fab05342d..7e0f4dc6cb 100644 --- a/runtime-modules/proposals/engine/src/errors.rs +++ b/runtime-modules/proposals/engine/src/errors.rs @@ -12,7 +12,8 @@ pub const MSG_STAKE_SHOULD_BE_EMPTY: &str = "Stake should be empty for this prop pub const MSG_STAKE_DIFFERS_FROM_REQUIRED: &str = "Stake differs from the proposal requirements"; pub const MSG_INVALID_PARAMETER_APPROVAL_THRESHOLD: &str = "Approval threshold cannot be zero"; pub const MSG_INVALID_PARAMETER_SLASHING_THRESHOLD: &str = "Slashing threshold cannot be zero"; +pub const MSG_ONLY_MEMBERS_CAN_PROPOSE: &str = "Only members can make or cancel a proposal"; +pub const MSG_ONLY_COUNCILORS_CAN_VOTE: &str = "Only councilors can vote on proposals"; //pub const MSG_STAKE_IS_GREATER_THAN_BALANCE: &str = "Balance is too low to be staked"; -//pub const MSG_ONLY_MEMBERS_CAN_PROPOSE: &str = "Only members can make a proposal"; -//pub const MSG_ONLY_COUNCILORS_CAN_VOTE: &str = "Only councilors can vote on proposals"; + diff --git a/runtime-modules/proposals/engine/src/lib.rs b/runtime-modules/proposals/engine/src/lib.rs index 88dddb9ce8..95fa753fea 100644 --- a/runtime-modules/proposals/engine/src/lib.rs +++ b/runtime-modules/proposals/engine/src/lib.rs @@ -22,7 +22,6 @@ // TODO: Test cancellation, rejection fees pub use types::BalanceOf; -use types::MemberId; use types::FinalizedProposalData; use types::ProposalStakeManager; pub use types::VotingResults; @@ -42,23 +41,25 @@ mod tests; use rstd::prelude::*; -use runtime_primitives::traits::{EnsureOrigin, Zero}; +use runtime_primitives::traits::{Zero}; use srml_support::traits::Get; use srml_support::{ decl_event, decl_module, decl_storage, dispatch, ensure, Parameter, StorageDoubleMap, }; use system::ensure_root; +use membership::origin_validator::{ActorOriginValidator, MemberId}; + /// Proposals engine trait. pub trait Trait: system::Trait + timestamp::Trait + stake::Trait + membership::members::Trait { /// Engine event type. type Event: From> + Into<::Event>; - /// Origin from which proposals must come. - type ProposalOrigin: EnsureOrigin; + /// Validates proposer id and origin combination + type ProposerOriginValidator: ActorOriginValidator, Self::AccountId>; - /// Origin from which votes must come. - type VoteOrigin: EnsureOrigin; + /// Validates voter id and origin combination + type VoterOriginValidator: ActorOriginValidator, Self::AccountId>; /// Provides data for voting. Defines maximum voters count for the proposal. type TotalVotersCounter: VotersParameters; @@ -153,8 +154,11 @@ decl_module! { /// Vote extrinsic. Conditions: origin must allow votes. pub fn vote(origin, voter_id: MemberId, proposal_id: T::ProposalId, vote: VoteKind) { - let account_id = T::VoteOrigin::ensure_origin(origin)?; - //TODO: set validator + T::VoterOriginValidator::ensure_actor_origin( + origin, + voter_id.clone(), + errors::MSG_ONLY_COUNCILORS_CAN_VOTE + )?; ensure!(>::exists(proposal_id), errors::MSG_PROPOSAL_NOT_FOUND); let mut proposal = Self::proposals(proposal_id); @@ -179,9 +183,11 @@ decl_module! { /// Cancel a proposal by its original proposer. pub fn cancel_proposal(origin, proposer_id: MemberId, proposal_id: T::ProposalId) { - let account_id = T::ProposalOrigin::ensure_origin(origin)?; - // TODO proposer_id should be the same? -// let proposer_id = T::ProposerId::from(account_id); + T::ProposerOriginValidator::ensure_actor_origin( + origin, + proposer_id.clone(), + errors::MSG_ONLY_MEMBERS_CAN_PROPOSE + )?; ensure!(>::exists(proposal_id), errors::MSG_PROPOSAL_NOT_FOUND); let proposal = Self::proposals(proposal_id); @@ -245,8 +251,11 @@ impl Module { proposal_type: u32, proposal_code: Vec, ) -> Result { - let account_id = T::ProposalOrigin::ensure_origin(origin)?; -// let proposer_id = T::ProposerId::from(account_id.clone()); + let account_id = T::ProposerOriginValidator::ensure_actor_origin( + origin, + proposer_id.clone(), + errors::MSG_ONLY_MEMBERS_CAN_PROPOSE + )?; Self::ensure_create_proposal_parameters_are_valid( ¶meters, diff --git a/runtime-modules/proposals/engine/src/types/mod.rs b/runtime-modules/proposals/engine/src/types/mod.rs index c618e7ec39..18724ceb8c 100644 --- a/runtime-modules/proposals/engine/src/types/mod.rs +++ b/runtime-modules/proposals/engine/src/types/mod.rs @@ -321,9 +321,6 @@ pub(crate) struct FinalizedProposalData = ::MemberId; - #[cfg(test)] mod tests { use crate::*; From dc3d9b00cd840878a5508ef8cce1915bc48b2727 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 13 Mar 2020 15:38:18 +0300 Subject: [PATCH 081/286] Update & fix tests --- runtime-modules/membership/src/lib.rs | 2 +- .../membership/src/origin_validator.rs | 68 +++++++++++-------- runtime-modules/proposals/codex/src/lib.rs | 2 +- .../proposals/codex/src/tests/mock.rs | 12 ++-- .../proposals/codex/src/tests/mod.rs | 15 ++++ .../proposals/discussion/src/lib.rs | 14 +++- .../proposals/discussion/src/tests/mock.rs | 12 ++-- .../proposals/engine/src/errors.rs | 1 - runtime-modules/proposals/engine/src/lib.rs | 14 ++-- .../proposals/engine/src/tests/mock/mod.rs | 45 +++++++----- .../proposals/engine/src/tests/mod.rs | 35 ++++++++-- 11 files changed, 145 insertions(+), 75 deletions(-) diff --git a/runtime-modules/membership/src/lib.rs b/runtime-modules/membership/src/lib.rs index 76f8c23c95..a054746f0f 100644 --- a/runtime-modules/membership/src/lib.rs +++ b/runtime-modules/membership/src/lib.rs @@ -3,8 +3,8 @@ pub mod genesis; pub mod members; -pub mod role_types; pub mod origin_validator; +pub mod role_types; mod mock; mod tests; diff --git a/runtime-modules/membership/src/origin_validator.rs b/runtime-modules/membership/src/origin_validator.rs index 97bcda3320..3e84d1547a 100644 --- a/runtime-modules/membership/src/origin_validator.rs +++ b/runtime-modules/membership/src/origin_validator.rs @@ -4,8 +4,12 @@ use system::ensure_signed; /// Abstract validator for the origin(account_id) and actor_id (eg.: thread author id). pub trait ActorOriginValidator { - /// Check for valid combination of origin and actor_id - fn ensure_actor_origin(origin: Origin, actor_id: ActorId, error: &'static str) -> Result; + /// Check for valid combination of origin and actor_id + fn ensure_actor_origin( + origin: Origin, + actor_id: ActorId, + error: &'static str, + ) -> Result; } /// Member of the Joystream organization @@ -13,38 +17,42 @@ pub type MemberId = ::MemberId; /// Default discussion system actor origin validator. Valid for both thread and post authors. pub struct MembershipOriginValidator { - marker: PhantomData, + marker: PhantomData, } impl MembershipOriginValidator { - /// Create ThreadPostActorOriginValidator instance - pub fn new() -> Self { - MembershipOriginValidator { - marker: PhantomData, - } - } + /// Create ThreadPostActorOriginValidator instance + pub fn new() -> Self { + MembershipOriginValidator { + marker: PhantomData, + } + } } -impl ActorOriginValidator<::Origin, MemberId, ::AccountId> -for MembershipOriginValidator +impl + ActorOriginValidator<::Origin, MemberId, ::AccountId> + for MembershipOriginValidator { - /// Check for valid combination of origin and actor_id. Actor_id should be valid member_id of - /// the membership module - fn ensure_actor_origin(origin: ::Origin, actor_id: MemberId, error : &'static str) -> Result<::AccountId, &'static str> { - // check valid signed account_id - let account_id = ensure_signed(origin)?; - - // check whether actor_id belongs to the registered member - let profile_result = >::ensure_profile(actor_id); - - if let Ok(profile) = profile_result { - // whether the account_id belongs to the actor - if profile.root_account == account_id - || profile.controller_account == account_id { - return Ok(account_id) - } - } - - Err(error) - } + /// Check for valid combination of origin and actor_id. Actor_id should be valid member_id of + /// the membership module + fn ensure_actor_origin( + origin: ::Origin, + actor_id: MemberId, + error: &'static str, + ) -> Result<::AccountId, &'static str> { + // check valid signed account_id + let account_id = ensure_signed(origin)?; + + // check whether actor_id belongs to the registered member + let profile_result = >::ensure_profile(actor_id); + + if let Ok(profile) = profile_result { + // whether the account_id belongs to the actor + if profile.root_account == account_id || profile.controller_account == account_id { + return Ok(account_id); + } + } + + Err(error) + } } diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index 1a52f30438..aefe86b2fa 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -46,7 +46,7 @@ pub type BalanceOf = pub type NegativeImbalance = <::Currency as Currency<::AccountId>>::NegativeImbalance; -use membership::origin_validator::{MemberId}; +use membership::origin_validator::MemberId; decl_error! { pub enum Error { diff --git a/runtime-modules/proposals/codex/src/tests/mock.rs b/runtime-modules/proposals/codex/src/tests/mock.rs index 72676a7a10..761d989b69 100644 --- a/runtime-modules/proposals/codex/src/tests/mock.rs +++ b/runtime-modules/proposals/codex/src/tests/mock.rs @@ -90,13 +90,11 @@ parameter_types! { impl proposal_engine::Trait for Test { type Event = (); - type ProposalOrigin = system::EnsureSigned; - type VoteOrigin = system::EnsureSigned; + type ProposerOriginValidator = (); + type VoterOriginValidator = (); type TotalVotersCounter = MockVotersParameters; type ProposalCodeDecoder = crate::ProposalType; type ProposalId = u32; - type ProposerId = u64; - type VoterId = u64; type StakeHandlerProvider = proposal_engine::DefaultStakeHandlerProvider; type CancellationFee = CancellationFee; type RejectionFee = RejectionFee; @@ -105,9 +103,9 @@ impl proposal_engine::Trait for Test { type MaxActiveProposalLimit = MaxActiveProposalLimit; } -impl proposal_discussion::ActorOriginValidator for () { - fn ensure_actor_origin(_: Origin, _: u64, _: &'static str) -> Result<(), &'static str> { - Ok(()) +impl membership::origin_validator::ActorOriginValidator for () { + fn ensure_actor_origin(_: Origin, _: u64, _: &'static str) -> Result { + Ok(1) } } diff --git a/runtime-modules/proposals/codex/src/tests/mod.rs b/runtime-modules/proposals/codex/src/tests/mod.rs index 6253fc6ad0..b5c17538bb 100644 --- a/runtime-modules/proposals/codex/src/tests/mod.rs +++ b/runtime-modules/proposals/codex/src/tests/mod.rs @@ -11,6 +11,7 @@ use mock::*; fn create_text_proposal_codex_call_succeeds() { initial_test_ext().execute_with(|| { let account_id = 1; + let proposer_id = 1; let origin = RawOrigin::Signed(account_id).into(); let required_stake = Some(>::from(500u32)); @@ -19,6 +20,7 @@ fn create_text_proposal_codex_call_succeeds() { assert_eq!( ProposalCodex::create_text_proposal( origin, + proposer_id, b"title".to_vec(), b"body".to_vec(), b"text".to_vec(), @@ -39,6 +41,7 @@ fn create_text_proposal_codex_call_fails_with_invalid_stake() { assert_eq!( ProposalCodex::create_text_proposal( RawOrigin::Signed(1).into(), + 1, b"title".to_vec(), b"body".to_vec(), b"text".to_vec(), @@ -52,6 +55,7 @@ fn create_text_proposal_codex_call_fails_with_invalid_stake() { assert_eq!( ProposalCodex::create_text_proposal( RawOrigin::Signed(1).into(), + 1, b"title".to_vec(), b"body".to_vec(), b"text".to_vec(), @@ -71,6 +75,7 @@ fn create_text_proposal_codex_call_fails_with_incorrect_text_size() { assert_eq!( ProposalCodex::create_text_proposal( origin, + 1, b"title".to_vec(), b"body".to_vec(), long_text, @@ -82,6 +87,7 @@ fn create_text_proposal_codex_call_fails_with_incorrect_text_size() { assert_eq!( ProposalCodex::create_text_proposal( RawOrigin::Signed(1).into(), + 1, b"title".to_vec(), b"body".to_vec(), Vec::new(), @@ -99,6 +105,7 @@ fn create_text_proposal_codex_call_fails_with_insufficient_rights() { assert!(ProposalCodex::create_text_proposal( origin, + 1, b"title".to_vec(), b"body".to_vec(), b"text".to_vec(), @@ -117,6 +124,7 @@ fn create_upgrade_runtime_proposal_codex_call_fails_with_incorrect_wasm_size() { assert_eq!( ProposalCodex::create_runtime_upgrade_proposal( origin, + 1, b"title".to_vec(), b"body".to_vec(), long_wasm, @@ -128,6 +136,7 @@ fn create_upgrade_runtime_proposal_codex_call_fails_with_incorrect_wasm_size() { assert_eq!( ProposalCodex::create_runtime_upgrade_proposal( RawOrigin::Signed(1).into(), + 1, b"title".to_vec(), b"body".to_vec(), Vec::new(), @@ -145,6 +154,7 @@ fn create_upgrade_runtime_proposal_codex_call_fails_with_insufficient_rights() { assert!(ProposalCodex::create_runtime_upgrade_proposal( origin, + 1, b"title".to_vec(), b"body".to_vec(), b"wasm".to_vec(), @@ -157,9 +167,11 @@ fn create_upgrade_runtime_proposal_codex_call_fails_with_insufficient_rights() { #[test] fn create_runtime_upgrade_proposal_codex_call_fails_with_invalid_stake() { initial_test_ext().execute_with(|| { + let proposer_id = 1; assert_eq!( ProposalCodex::create_runtime_upgrade_proposal( RawOrigin::Signed(1).into(), + proposer_id, b"title".to_vec(), b"body".to_vec(), b"wasm".to_vec(), @@ -173,6 +185,7 @@ fn create_runtime_upgrade_proposal_codex_call_fails_with_invalid_stake() { assert_eq!( ProposalCodex::create_runtime_upgrade_proposal( RawOrigin::Signed(1).into(), + proposer_id, b"title".to_vec(), b"body".to_vec(), b"wasm".to_vec(), @@ -187,6 +200,7 @@ fn create_runtime_upgrade_proposal_codex_call_fails_with_invalid_stake() { fn create_runtime_upgrade_proposal_codex_call_succeeds() { initial_test_ext().execute_with(|| { let account_id = 1; + let proposer_id = 1; let origin = RawOrigin::Signed(account_id).into(); let required_stake = Some(>::from(50000u32)); @@ -195,6 +209,7 @@ fn create_runtime_upgrade_proposal_codex_call_succeeds() { assert_eq!( ProposalCodex::create_runtime_upgrade_proposal( origin, + proposer_id, b"title".to_vec(), b"body".to_vec(), b"wasm".to_vec(), diff --git a/runtime-modules/proposals/discussion/src/lib.rs b/runtime-modules/proposals/discussion/src/lib.rs index 050d26f213..99f5105955 100644 --- a/runtime-modules/proposals/discussion/src/lib.rs +++ b/runtime-modules/proposals/discussion/src/lib.rs @@ -57,10 +57,18 @@ pub trait Trait: system::Trait + membership::members::Trait { type Event: From> + Into<::Event>; /// Validates thread author id and origin combination - type ThreadAuthorOriginValidator: ActorOriginValidator, Self::AccountId>; + type ThreadAuthorOriginValidator: ActorOriginValidator< + Self::Origin, + MemberId, + Self::AccountId, + >; /// Validates post author id and origin combination - type PostAuthorOriginValidator: ActorOriginValidator, Self::AccountId>; + type PostAuthorOriginValidator: ActorOriginValidator< + Self::Origin, + MemberId, + Self::AccountId, + >; /// Discussion thread Id type type ThreadId: From + Into + Parameter + Default + Copy; @@ -211,7 +219,7 @@ impl Module { T::ThreadAuthorOriginValidator::ensure_actor_origin( origin, thread_author_id.clone(), - errors::MSG_INVALID_THREAD_AUTHOR_ORIGIN + errors::MSG_INVALID_THREAD_AUTHOR_ORIGIN, )?; ensure!(!title.is_empty(), errors::MSG_EMPTY_TITLE_PROVIDED); diff --git a/runtime-modules/proposals/discussion/src/tests/mock.rs b/runtime-modules/proposals/discussion/src/tests/mock.rs index 03ec78be09..cfeaacdafc 100644 --- a/runtime-modules/proposals/discussion/src/tests/mock.rs +++ b/runtime-modules/proposals/discussion/src/tests/mock.rs @@ -100,14 +100,18 @@ impl crate::Trait for Test { type MaxThreadInARowNumber = MaxThreadInARowNumber; } -impl ActorOriginValidator for () { - fn ensure_actor_origin(origin: Origin, actor_id: u64, error: &'static str) -> Result<(), &'static str> { +impl ActorOriginValidator for () { + fn ensure_actor_origin( + origin: Origin, + actor_id: u64, + error: &'static str, + ) -> Result { if system::ensure_none(origin).is_ok() { - return Ok(()); + return Ok(1); } if actor_id == 1 { - return Ok(()) + return Ok(1); } Err(error) diff --git a/runtime-modules/proposals/engine/src/errors.rs b/runtime-modules/proposals/engine/src/errors.rs index 7e0f4dc6cb..b513726857 100644 --- a/runtime-modules/proposals/engine/src/errors.rs +++ b/runtime-modules/proposals/engine/src/errors.rs @@ -16,4 +16,3 @@ pub const MSG_ONLY_MEMBERS_CAN_PROPOSE: &str = "Only members can make or cancel pub const MSG_ONLY_COUNCILORS_CAN_VOTE: &str = "Only councilors can vote on proposals"; //pub const MSG_STAKE_IS_GREATER_THAN_BALANCE: &str = "Balance is too low to be staked"; - diff --git a/runtime-modules/proposals/engine/src/lib.rs b/runtime-modules/proposals/engine/src/lib.rs index 95fa753fea..2e35691eab 100644 --- a/runtime-modules/proposals/engine/src/lib.rs +++ b/runtime-modules/proposals/engine/src/lib.rs @@ -41,7 +41,7 @@ mod tests; use rstd::prelude::*; -use runtime_primitives::traits::{Zero}; +use runtime_primitives::traits::Zero; use srml_support::traits::Get; use srml_support::{ decl_event, decl_module, decl_storage, dispatch, ensure, Parameter, StorageDoubleMap, @@ -51,12 +51,18 @@ use system::ensure_root; use membership::origin_validator::{ActorOriginValidator, MemberId}; /// Proposals engine trait. -pub trait Trait: system::Trait + timestamp::Trait + stake::Trait + membership::members::Trait { +pub trait Trait: + system::Trait + timestamp::Trait + stake::Trait + membership::members::Trait +{ /// Engine event type. type Event: From> + Into<::Event>; /// Validates proposer id and origin combination - type ProposerOriginValidator: ActorOriginValidator, Self::AccountId>; + type ProposerOriginValidator: ActorOriginValidator< + Self::Origin, + MemberId, + Self::AccountId, + >; /// Validates voter id and origin combination type VoterOriginValidator: ActorOriginValidator, Self::AccountId>; @@ -254,7 +260,7 @@ impl Module { let account_id = T::ProposerOriginValidator::ensure_actor_origin( origin, proposer_id.clone(), - errors::MSG_ONLY_MEMBERS_CAN_PROPOSE + errors::MSG_ONLY_MEMBERS_CAN_PROPOSE, )?; Self::ensure_create_proposal_parameters_are_valid( diff --git a/runtime-modules/proposals/engine/src/tests/mock/mod.rs b/runtime-modules/proposals/engine/src/tests/mock/mod.rs index 1f9ba495aa..3d9d8c3081 100644 --- a/runtime-modules/proposals/engine/src/tests/mock/mod.rs +++ b/runtime-modules/proposals/engine/src/tests/mock/mod.rs @@ -43,10 +43,15 @@ mod engine { pub use crate::Event; } +mod membership_mod { + pub use membership::members::Event; +} + impl_outer_event! { pub enum TestEvent for Test { balances, engine, + membership_mod, } } @@ -73,6 +78,10 @@ impl balances::Trait for Test { type CreationFee = CreationFee; } +impl common::currency::GovernanceCurrency for Test { + type Currency = balances::Module; +} + impl stake::Trait for Test { type Currency = Balances; type StakePoolId = StakePoolId; @@ -89,36 +98,38 @@ parameter_types! { pub const MaxActiveProposalLimit: u32 = 100; } -impl crate::Trait for Test { +impl membership::members::Trait for Test { type Event = TestEvent; + type MemberId = u64; + type PaidTermId = u64; + type SubscriptionId = u64; + type ActorId = u64; + type InitialMembersBalance = (); +} - type ProposalOrigin = system::EnsureSigned; - - type VoteOrigin = system::EnsureSigned; - +impl crate::Trait for Test { + type Event = TestEvent; + type ProposerOriginValidator = (); + type VoterOriginValidator = (); type TotalVotersCounter = (); - type ProposalCodeDecoder = ProposalType; - type ProposalId = u32; - - type ProposerId = u64; - - type VoterId = u64; - type StakeHandlerProvider = stakes::TestStakeHandlerProvider; - type CancellationFee = CancellationFee; - type RejectionFee = RejectionFee; - type TitleMaxLength = TitleMaxLength; - type DescriptionMaxLength = DescriptionMaxLength; - type MaxActiveProposalLimit = MaxActiveProposalLimit; } +impl membership::origin_validator::ActorOriginValidator for () { + fn ensure_actor_origin(origin: Origin, _account_id: u64, _: &'static str) -> Result { + let signed_account_id = system::ensure_signed(origin)?; + + Ok(signed_account_id) + } +} + // If changing count is required, we can upgrade the implementation as shown here: // https://substrate.dev/recipes/3-entrees/testing/externalities.html impl crate::VotersParameters for () { diff --git a/runtime-modules/proposals/engine/src/tests/mod.rs b/runtime-modules/proposals/engine/src/tests/mod.rs index ac591d3110..f8878ecba6 100644 --- a/runtime-modules/proposals/engine/src/tests/mod.rs +++ b/runtime-modules/proposals/engine/src/tests/mod.rs @@ -59,6 +59,7 @@ impl Default for ProposalParametersFixture { struct DummyProposalFixture { parameters: ProposalParameters, origin: RawOrigin, + proposer_id: u64, proposal_type: u32, proposal_code: Vec, title: Vec, @@ -84,6 +85,7 @@ impl Default for DummyProposalFixture { required_stake: None, }, origin: RawOrigin::Signed(1), + proposer_id: 1, proposal_type: dummy_proposal.proposal_type(), proposal_code: dummy_proposal.encode(), title: dummy_proposal.title, @@ -128,6 +130,7 @@ impl DummyProposalFixture { fn create_proposal_and_assert(self, result: Result) -> Option { let proposal_id_result = ProposalsEngine::create_proposal( self.origin.into(), + self.proposer_id, self.parameters, self.title, self.description, @@ -144,6 +147,7 @@ impl DummyProposalFixture { struct CancelProposalFixture { origin: RawOrigin, proposal_id: u32, + proposer_id: u64, } impl CancelProposalFixture { @@ -151,6 +155,7 @@ impl CancelProposalFixture { CancelProposalFixture { proposal_id, origin: RawOrigin::Signed(1), + proposer_id: 1, } } @@ -158,9 +163,20 @@ impl CancelProposalFixture { CancelProposalFixture { origin, ..self } } + fn with_proposer(self, proposer_id: u64) -> Self { + CancelProposalFixture { + proposer_id, + ..self + } + } + fn cancel_and_assert(self, expected_result: dispatch::Result) { assert_eq!( - ProposalsEngine::cancel_proposal(self.origin.into(), self.proposal_id,), + ProposalsEngine::cancel_proposal( + self.origin.into(), + self.proposer_id, + self.proposal_id + ), expected_result ); } @@ -193,6 +209,7 @@ impl VetoProposalFixture { struct VoteGenerator { proposal_id: u32, current_account_id: u64, + current_voter_id: u64, pub auto_increment_voter_id: bool, } @@ -200,6 +217,7 @@ impl VoteGenerator { fn new(proposal_id: u32) -> Self { VoteGenerator { proposal_id, + current_voter_id: 0, current_account_id: 0, auto_increment_voter_id: true, } @@ -215,10 +233,12 @@ impl VoteGenerator { fn vote(&mut self, vote_kind: VoteKind) -> dispatch::Result { if self.auto_increment_voter_id { self.current_account_id += 1; + self.current_voter_id += 1; } ProposalsEngine::vote( system::RawOrigin::Signed(self.current_account_id).into(), + self.current_voter_id, self.proposal_id, vote_kind, ) @@ -227,7 +247,7 @@ impl VoteGenerator { struct EventFixture; impl EventFixture { - fn assert_events(expected_raw_events: Vec>) { + fn assert_events(expected_raw_events: Vec>) { let expected_events = expected_raw_events .iter() .map(|ev| EventRecord { @@ -272,7 +292,7 @@ fn create_dummy_proposal_fails_with_insufficient_rights() { initial_test_ext().execute_with(|| { let dummy_proposal = DummyProposalFixture::default().with_origin(RawOrigin::None); - dummy_proposal.create_proposal_and_assert(Err("Invalid origin")); + dummy_proposal.create_proposal_and_assert(Err("RequireSignedOrigin")); }); } @@ -291,8 +311,8 @@ fn vote_succeeds() { fn vote_fails_with_insufficient_rights() { initial_test_ext().execute_with(|| { assert_eq!( - ProposalsEngine::vote(system::RawOrigin::None.into(), 1, VoteKind::Approve), - Err("Invalid origin") + ProposalsEngine::vote(system::RawOrigin::None.into(), 1, 1, VoteKind::Approve), + Err("RequireSignedOrigin") ); }); } @@ -601,8 +621,9 @@ fn cancel_proposal_fails_with_insufficient_rights() { let dummy_proposal = DummyProposalFixture::default(); let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); - let cancel_proposal = - CancelProposalFixture::new(proposal_id).with_origin(RawOrigin::Signed(2)); + let cancel_proposal = CancelProposalFixture::new(proposal_id) + .with_origin(RawOrigin::Signed(2)) + .with_proposer(2); cancel_proposal.cancel_and_assert(Err("You do not own this proposal")); }); } From 79c2849b93704da7bf7d418928ce911a367078b1 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 13 Mar 2020 18:58:21 +0300 Subject: [PATCH 082/286] Add tests for membership module (MembershipOriginValidator) --- runtime-modules/membership/src/lib.rs | 2 +- .../membership/src/origin_validator.rs | 108 ++++++++++++++++++ .../proposals/discussion/src/tests/mock.rs | 10 +- .../proposals/discussion/src/tests/mod.rs | 11 ++ .../proposals/engine/src/tests/mock/mod.rs | 6 +- .../proposals/engine/src/tests/mod.rs | 1 - 6 files changed, 128 insertions(+), 10 deletions(-) diff --git a/runtime-modules/membership/src/lib.rs b/runtime-modules/membership/src/lib.rs index a054746f0f..2606e34df5 100644 --- a/runtime-modules/membership/src/lib.rs +++ b/runtime-modules/membership/src/lib.rs @@ -6,5 +6,5 @@ pub mod members; pub mod origin_validator; pub mod role_types; -mod mock; +pub(crate) mod mock; mod tests; diff --git a/runtime-modules/membership/src/origin_validator.rs b/runtime-modules/membership/src/origin_validator.rs index 3e84d1547a..9da5363192 100644 --- a/runtime-modules/membership/src/origin_validator.rs +++ b/runtime-modules/membership/src/origin_validator.rs @@ -1,5 +1,6 @@ use rstd::marker::PhantomData; +use srml_support::print; use system::ensure_signed; /// Abstract validator for the origin(account_id) and actor_id (eg.: thread author id). @@ -47,6 +48,7 @@ impl let profile_result = >::ensure_profile(actor_id); if let Ok(profile) = profile_result { + print("profile"); // whether the account_id belongs to the actor if profile.root_account == account_id || profile.controller_account == account_id { return Ok(account_id); @@ -56,3 +58,109 @@ impl Err(error) } } + +#[cfg(test)] +mod tests { + + use crate::members::UserInfo; + use crate::mock::{Test, TestExternalitiesBuilder}; + use crate::origin_validator::{ActorOriginValidator, MembershipOriginValidator}; + use system::RawOrigin; + + type Membership = crate::members::Module; + + pub fn initial_test_ext() -> runtime_io::TestExternalities { + const DEFAULT_FEE: u64 = 500; + let initial_members = [1, 2, 3]; + + TestExternalitiesBuilder::::default() + .set_membership_config( + crate::genesis::GenesisConfigBuilder::default() + .default_paid_membership_fee(DEFAULT_FEE) + .members(initial_members.to_vec()) + .build(), + ) + .build() + } + + #[test] + fn membership_origin_validator_fails_with_unregistered_member() { + initial_test_ext().execute_with(|| { + let origin = RawOrigin::Signed(1); + let member_id = 1; + let error = "Error"; + + let validation_result = MembershipOriginValidator::::ensure_actor_origin( + origin.into(), + member_id, + error, + ); + + assert_eq!(validation_result, Err(error)); + }); + } + + #[test] + fn membership_origin_validator_succeeds() { + initial_test_ext().execute_with(|| { + let account_id = 1; + let origin = RawOrigin::Signed(account_id); + let member_id = 0; + let error = "Error"; + let authority_account_id = 10; + Membership::set_screening_authority(RawOrigin::Root.into(), authority_account_id) + .unwrap(); + + Membership::add_screened_member( + RawOrigin::Signed(authority_account_id).into(), + account_id, + UserInfo { + handle: Some(b"handle".to_vec()), + avatar_uri: None, + about: None, + }, + ) + .unwrap(); + + let validation_result = MembershipOriginValidator::::ensure_actor_origin( + origin.into(), + member_id, + error, + ); + + assert_eq!(validation_result, Ok(account_id)); + }); + } + + #[test] + fn membership_origin_validator_fails_with_incompatible_account_id_and_member_id() { + initial_test_ext().execute_with(|| { + let account_id = 1; + let member_id = 0; + let error = "Error"; + let authority_account_id = 10; + Membership::set_screening_authority(RawOrigin::Root.into(), authority_account_id) + .unwrap(); + + Membership::add_screened_member( + RawOrigin::Signed(authority_account_id).into(), + account_id, + UserInfo { + handle: Some(b"handle".to_vec()), + avatar_uri: None, + about: None, + }, + ) + .unwrap(); + + let invalid_account_id = 2; + let validation_result = MembershipOriginValidator::::ensure_actor_origin( + RawOrigin::Signed(invalid_account_id).into(), + member_id, + error, + ); + + assert_eq!(validation_result, Err(error)); + }); + } +} diff --git a/runtime-modules/proposals/discussion/src/tests/mock.rs b/runtime-modules/proposals/discussion/src/tests/mock.rs index cfeaacdafc..83992b78e9 100644 --- a/runtime-modules/proposals/discussion/src/tests/mock.rs +++ b/runtime-modules/proposals/discussion/src/tests/mock.rs @@ -59,17 +59,13 @@ parameter_types! { } impl balances::Trait for Test { - /// The type for recording an account's balance. type Balance = u64; /// What to do if an account's free balance gets zeroed. type OnFreeBalanceZero = (); - /// What to do if a new account is created. type OnNewAccount = (); - - type Event = TestEvent; - - type DustRemoval = (); type TransferPayment = (); + type DustRemoval = (); + type Event = TestEvent; type ExistentialDeposit = ExistentialDeposit; type TransferFee = TransferFee; type CreationFee = CreationFee; @@ -120,9 +116,9 @@ impl ActorOriginValidator for () { impl system::Trait for Test { type Origin = Origin; + type Call = (); type Index = u64; type BlockNumber = u64; - type Call = (); type Hash = H256; type Hashing = BlakeTwo256; type AccountId = u64; diff --git a/runtime-modules/proposals/discussion/src/tests/mod.rs b/runtime-modules/proposals/discussion/src/tests/mod.rs index a91ec1dd2b..c3d5903297 100644 --- a/runtime-modules/proposals/discussion/src/tests/mod.rs +++ b/runtime-modules/proposals/discussion/src/tests/mod.rs @@ -86,6 +86,13 @@ impl DiscussionFixture { DiscussionFixture { author_id, ..self } } + fn with_origin(self, origin: RawOrigin) -> Self { + DiscussionFixture { + origin: origin.into(), + ..self + } + } + fn create_discussion_and_assert(&self, result: Result) -> Option { let create_discussion_result = Discussions::create_thread( self.origin.clone().into(), @@ -417,7 +424,11 @@ fn add_discussion_thread_fails_because_of_max_thread_by_same_author_in_a_row_lim fn add_discussion_thread_fails_because_of_invalid_author_origin() { initial_test_ext().execute_with(|| { let discussion_fixture = DiscussionFixture::default().with_author(2); + discussion_fixture.create_discussion_and_assert(Err(MSG_INVALID_THREAD_AUTHOR_ORIGIN)); + let discussion_fixture = DiscussionFixture::default() + .with_origin(RawOrigin::Signed(3)) + .with_author(2); discussion_fixture.create_discussion_and_assert(Err(MSG_INVALID_THREAD_AUTHOR_ORIGIN)); }); } diff --git a/runtime-modules/proposals/engine/src/tests/mock/mod.rs b/runtime-modules/proposals/engine/src/tests/mock/mod.rs index 3d9d8c3081..26e88b2d83 100644 --- a/runtime-modules/proposals/engine/src/tests/mock/mod.rs +++ b/runtime-modules/proposals/engine/src/tests/mock/mod.rs @@ -123,7 +123,11 @@ impl crate::Trait for Test { } impl membership::origin_validator::ActorOriginValidator for () { - fn ensure_actor_origin(origin: Origin, _account_id: u64, _: &'static str) -> Result { + fn ensure_actor_origin( + origin: Origin, + _account_id: u64, + _: &'static str, + ) -> Result { let signed_account_id = system::ensure_signed(origin)?; Ok(signed_account_id) diff --git a/runtime-modules/proposals/engine/src/tests/mod.rs b/runtime-modules/proposals/engine/src/tests/mod.rs index f8878ecba6..0ab9803a07 100644 --- a/runtime-modules/proposals/engine/src/tests/mod.rs +++ b/runtime-modules/proposals/engine/src/tests/mod.rs @@ -291,7 +291,6 @@ fn create_dummy_proposal_succeeds() { fn create_dummy_proposal_fails_with_insufficient_rights() { initial_test_ext().execute_with(|| { let dummy_proposal = DummyProposalFixture::default().with_origin(RawOrigin::None); - dummy_proposal.create_proposal_and_assert(Err("RequireSignedOrigin")); }); } From 64f44860b29b31bd7617ba7c05893f7ab86e2c07 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 13 Mar 2020 19:10:01 +0300 Subject: [PATCH 083/286] Update membership module tests (origin validator) --- .../membership/src/origin_validator.rs | 20 ++++--------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/runtime-modules/membership/src/origin_validator.rs b/runtime-modules/membership/src/origin_validator.rs index 9da5363192..0c168d402c 100644 --- a/runtime-modules/membership/src/origin_validator.rs +++ b/runtime-modules/membership/src/origin_validator.rs @@ -48,7 +48,6 @@ impl let profile_result = >::ensure_profile(actor_id); if let Ok(profile) = profile_result { - print("profile"); // whether the account_id belongs to the actor if profile.root_account == account_id || profile.controller_account == account_id { return Ok(account_id); @@ -61,7 +60,6 @@ impl #[cfg(test)] mod tests { - use crate::members::UserInfo; use crate::mock::{Test, TestExternalitiesBuilder}; use crate::origin_validator::{ActorOriginValidator, MembershipOriginValidator}; @@ -70,17 +68,7 @@ mod tests { type Membership = crate::members::Module; pub fn initial_test_ext() -> runtime_io::TestExternalities { - const DEFAULT_FEE: u64 = 500; - let initial_members = [1, 2, 3]; - - TestExternalitiesBuilder::::default() - .set_membership_config( - crate::genesis::GenesisConfigBuilder::default() - .default_paid_membership_fee(DEFAULT_FEE) - .members(initial_members.to_vec()) - .build(), - ) - .build() + TestExternalitiesBuilder::::default().build() } #[test] @@ -105,7 +93,6 @@ mod tests { initial_test_ext().execute_with(|| { let account_id = 1; let origin = RawOrigin::Signed(account_id); - let member_id = 0; let error = "Error"; let authority_account_id = 10; Membership::set_screening_authority(RawOrigin::Root.into(), authority_account_id) @@ -121,6 +108,7 @@ mod tests { }, ) .unwrap(); + let member_id = 0; // newly created member_id let validation_result = MembershipOriginValidator::::ensure_actor_origin( origin.into(), @@ -136,8 +124,7 @@ mod tests { fn membership_origin_validator_fails_with_incompatible_account_id_and_member_id() { initial_test_ext().execute_with(|| { let account_id = 1; - let member_id = 0; - let error = "Error"; + let error = "Errorss"; let authority_account_id = 10; Membership::set_screening_authority(RawOrigin::Root.into(), authority_account_id) .unwrap(); @@ -152,6 +139,7 @@ mod tests { }, ) .unwrap(); + let member_id = 0; // newly created member_id let invalid_account_id = 2; let validation_result = MembershipOriginValidator::::ensure_actor_origin( From 80ae71ca6970aeddba33abefe61cd6999ae1851a Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Mon, 16 Mar 2020 13:18:10 +0300 Subject: [PATCH 084/286] Make set_countil() public for testing purposes --- runtime-modules/governance/src/council.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime-modules/governance/src/council.rs b/runtime-modules/governance/src/council.rs index 792977f073..b61cedd488 100644 --- a/runtime-modules/governance/src/council.rs +++ b/runtime-modules/governance/src/council.rs @@ -76,7 +76,7 @@ decl_module! { // Privileged methods /// Force set a zero staked council. Stakes in existing council will vanish into thin air! - fn set_council(origin, accounts: Vec) { + pub fn set_council(origin, accounts: Vec) { ensure_root(origin)?; let new_council: Seats> = accounts.into_iter().map(|account| { Seat { From 309f116d49eae7663d182265116509f651d2001e Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Mon, 16 Mar 2020 13:19:02 +0300 Subject: [PATCH 085/286] Move ActorOriginValidator from membership to common --- runtime-modules/common/src/lib.rs | 1 + .../common/src/origin_validator.rs | 9 +++++++ .../membership/src/origin_validator.rs | 26 +++---------------- 3 files changed, 14 insertions(+), 22 deletions(-) create mode 100644 runtime-modules/common/src/origin_validator.rs diff --git a/runtime-modules/common/src/lib.rs b/runtime-modules/common/src/lib.rs index 23177ac457..e48bf36060 100644 --- a/runtime-modules/common/src/lib.rs +++ b/runtime-modules/common/src/lib.rs @@ -2,3 +2,4 @@ #![cfg_attr(not(feature = "std"), no_std)] pub mod currency; +pub mod origin_validator; diff --git a/runtime-modules/common/src/origin_validator.rs b/runtime-modules/common/src/origin_validator.rs new file mode 100644 index 0000000000..437a131033 --- /dev/null +++ b/runtime-modules/common/src/origin_validator.rs @@ -0,0 +1,9 @@ +/// Abstract validator for the origin(account_id) and actor_id (eg.: thread author id). +pub trait ActorOriginValidator { + /// Check for valid combination of origin and actor_id + fn ensure_actor_origin( + origin: Origin, + actor_id: ActorId, + error: &'static str, + ) -> Result; +} diff --git a/runtime-modules/membership/src/origin_validator.rs b/runtime-modules/membership/src/origin_validator.rs index 0c168d402c..91443b3fd3 100644 --- a/runtime-modules/membership/src/origin_validator.rs +++ b/runtime-modules/membership/src/origin_validator.rs @@ -1,35 +1,16 @@ use rstd::marker::PhantomData; -use srml_support::print; +use common::origin_validator::ActorOriginValidator; use system::ensure_signed; -/// Abstract validator for the origin(account_id) and actor_id (eg.: thread author id). -pub trait ActorOriginValidator { - /// Check for valid combination of origin and actor_id - fn ensure_actor_origin( - origin: Origin, - actor_id: ActorId, - error: &'static str, - ) -> Result; -} - /// Member of the Joystream organization pub type MemberId = ::MemberId; -/// Default discussion system actor origin validator. Valid for both thread and post authors. +/// Default membership actor origin validator. pub struct MembershipOriginValidator { marker: PhantomData, } -impl MembershipOriginValidator { - /// Create ThreadPostActorOriginValidator instance - pub fn new() -> Self { - MembershipOriginValidator { - marker: PhantomData, - } - } -} - impl ActorOriginValidator<::Origin, MemberId, ::AccountId> for MembershipOriginValidator @@ -62,7 +43,8 @@ impl mod tests { use crate::members::UserInfo; use crate::mock::{Test, TestExternalitiesBuilder}; - use crate::origin_validator::{ActorOriginValidator, MembershipOriginValidator}; + use crate::origin_validator::MembershipOriginValidator; + use common::origin_validator::ActorOriginValidator; use system::RawOrigin; type Membership = crate::members::Module; From db0f440d77dcf3284b6d0ff121c8b4be5526d4f7 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Mon, 16 Mar 2020 13:20:08 +0300 Subject: [PATCH 086/286] Integrate engine module with council - add governance dependency - implement ActorOriginValidator for council voting (CouncilOriginValidator) - change mocks - add tests --- runtime-modules/proposals/codex/Cargo.toml | 7 +- .../proposals/codex/src/tests/mock.rs | 7 +- .../proposals/discussion/Cargo.toml | 10 +- .../proposals/discussion/src/lib.rs | 3 +- runtime-modules/proposals/engine/Cargo.toml | 15 +- runtime-modules/proposals/engine/src/lib.rs | 10 +- .../proposals/engine/src/tests/mock/mod.rs | 14 +- .../proposals/engine/src/tests/mod.rs | 2 +- .../src/types/council_origin_validator.rs | 161 ++++++++++++++++++ .../proposals/engine/src/types/mod.rs | 3 + 10 files changed, 214 insertions(+), 18 deletions(-) create mode 100644 runtime-modules/proposals/engine/src/types/council_origin_validator.rs diff --git a/runtime-modules/proposals/codex/Cargo.toml b/runtime-modules/proposals/codex/Cargo.toml index e97e6327e3..1abb1d1048 100644 --- a/runtime-modules/proposals/codex/Cargo.toml +++ b/runtime-modules/proposals/codex/Cargo.toml @@ -109,4 +109,9 @@ rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' [dev-dependencies.common] default_features = false package = 'substrate-common-module' -path = '../../common' \ No newline at end of file +path = '../../common' + +[dev-dependencies.governance] +default_features = false +package = 'substrate-governance-module' +path = '../../governance' \ No newline at end of file diff --git a/runtime-modules/proposals/codex/src/tests/mock.rs b/runtime-modules/proposals/codex/src/tests/mock.rs index 761d989b69..68f81878d9 100644 --- a/runtime-modules/proposals/codex/src/tests/mock.rs +++ b/runtime-modules/proposals/codex/src/tests/mock.rs @@ -103,7 +103,12 @@ impl proposal_engine::Trait for Test { type MaxActiveProposalLimit = MaxActiveProposalLimit; } -impl membership::origin_validator::ActorOriginValidator for () { +impl governance::council::Trait for Test { + type Event = (); + type CouncilTermEnded = (); +} + +impl common::origin_validator::ActorOriginValidator for () { fn ensure_actor_origin(_: Origin, _: u64, _: &'static str) -> Result { Ok(1) } diff --git a/runtime-modules/proposals/discussion/Cargo.toml b/runtime-modules/proposals/discussion/Cargo.toml index 30343c212d..e443fa7229 100644 --- a/runtime-modules/proposals/discussion/Cargo.toml +++ b/runtime-modules/proposals/discussion/Cargo.toml @@ -75,17 +75,17 @@ default_features = false package = 'substrate-membership-module' path = '../../membership' +[dependencies.common] +default_features = false +package = 'substrate-common-module' +path = '../../common' + [dev-dependencies.runtime-io] default_features = false git = 'https://github.com/paritytech/substrate.git' package = 'sr-io' rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' -[dev-dependencies.common] -default_features = false -package = 'substrate-common-module' -path = '../../common' - [dev-dependencies.balances] package = 'srml-balances' default-features = false diff --git a/runtime-modules/proposals/discussion/src/lib.rs b/runtime-modules/proposals/discussion/src/lib.rs index 99f5105955..3f61d17b6e 100644 --- a/runtime-modules/proposals/discussion/src/lib.rs +++ b/runtime-modules/proposals/discussion/src/lib.rs @@ -28,7 +28,8 @@ use srml_support::{decl_event, decl_module, decl_storage, ensure, Parameter}; use srml_support::traits::Get; use types::{Post, Thread, ThreadCounter}; -use membership::origin_validator::{ActorOriginValidator, MemberId}; +use common::origin_validator::ActorOriginValidator; +use membership::origin_validator::MemberId; // TODO: move errors to decl_error macro (after substrate version upgrade) diff --git a/runtime-modules/proposals/engine/Cargo.toml b/runtime-modules/proposals/engine/Cargo.toml index b30d6ccd80..2ab26e8fa2 100644 --- a/runtime-modules/proposals/engine/Cargo.toml +++ b/runtime-modules/proposals/engine/Cargo.toml @@ -88,6 +88,16 @@ default_features = false package = 'substrate-membership-module' path = '../../membership' +[dependencies.common] +default_features = false +package = 'substrate-common-module' +path = '../../common' + +[dependencies.governance] +default_features = false +package = 'substrate-governance-module' +path = '../../governance' + [dev-dependencies] mockall = "0.6.0" @@ -96,8 +106,3 @@ default_features = false git = 'https://github.com/paritytech/substrate.git' package = 'sr-io' rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' - -[dev-dependencies.common] -default_features = false -package = 'substrate-common-module' -path = '../../common' \ No newline at end of file diff --git a/runtime-modules/proposals/engine/src/lib.rs b/runtime-modules/proposals/engine/src/lib.rs index 2e35691eab..d0801d61c0 100644 --- a/runtime-modules/proposals/engine/src/lib.rs +++ b/runtime-modules/proposals/engine/src/lib.rs @@ -32,6 +32,7 @@ pub use types::{ pub use types::{DefaultStakeHandlerProvider, StakeHandler, StakeHandlerProvider}; pub use types::{ProposalCodeDecoder, ProposalExecutable}; pub use types::{VoteKind, VotersParameters}; +pub use types::CouncilOriginValidator; mod errors; pub(crate) mod types; @@ -48,11 +49,16 @@ use srml_support::{ }; use system::ensure_root; -use membership::origin_validator::{ActorOriginValidator, MemberId}; +use common::origin_validator::ActorOriginValidator; +use membership::origin_validator::MemberId; /// Proposals engine trait. pub trait Trait: - system::Trait + timestamp::Trait + stake::Trait + membership::members::Trait + system::Trait + + timestamp::Trait + + stake::Trait + + membership::members::Trait + + governance::council::Trait { /// Engine event type. type Event: From> + Into<::Event>; diff --git a/runtime-modules/proposals/engine/src/tests/mock/mod.rs b/runtime-modules/proposals/engine/src/tests/mock/mod.rs index 26e88b2d83..435e1e36e5 100644 --- a/runtime-modules/proposals/engine/src/tests/mock/mod.rs +++ b/runtime-modules/proposals/engine/src/tests/mock/mod.rs @@ -47,11 +47,16 @@ mod membership_mod { pub use membership::members::Event; } +mod council_mod { + pub use governance::council::Event; +} + impl_outer_event! { pub enum TestEvent for Test { balances, engine, - membership_mod, + membership_mod, + council_mod, } } @@ -82,6 +87,11 @@ impl common::currency::GovernanceCurrency for Test { type Currency = balances::Module; } +impl governance::council::Trait for Test { + type Event = TestEvent; + type CouncilTermEnded = (); +} + impl stake::Trait for Test { type Currency = Balances; type StakePoolId = StakePoolId; @@ -122,7 +132,7 @@ impl crate::Trait for Test { type MaxActiveProposalLimit = MaxActiveProposalLimit; } -impl membership::origin_validator::ActorOriginValidator for () { +impl common::origin_validator::ActorOriginValidator for () { fn ensure_actor_origin( origin: Origin, _account_id: u64, diff --git a/runtime-modules/proposals/engine/src/tests/mod.rs b/runtime-modules/proposals/engine/src/tests/mod.rs index 0ab9803a07..0cc6737270 100644 --- a/runtime-modules/proposals/engine/src/tests/mod.rs +++ b/runtime-modules/proposals/engine/src/tests/mod.rs @@ -1,4 +1,4 @@ -mod mock; +pub(crate) mod mock; use crate::*; use mock::*; diff --git a/runtime-modules/proposals/engine/src/types/council_origin_validator.rs b/runtime-modules/proposals/engine/src/types/council_origin_validator.rs new file mode 100644 index 0000000000..a73203585e --- /dev/null +++ b/runtime-modules/proposals/engine/src/types/council_origin_validator.rs @@ -0,0 +1,161 @@ +use rstd::marker::PhantomData; + +use common::origin_validator::ActorOriginValidator; +use membership::origin_validator::{MemberId, MembershipOriginValidator}; + +/// Default discussion system actor origin validator. Valid for both thread and post authors. +pub struct CouncilOriginValidator { + marker: PhantomData, +} + +impl + ActorOriginValidator<::Origin, MemberId, ::AccountId> + for CouncilOriginValidator +{ + /// Check for valid combination of origin and actor_id. Actor_id should be valid member_id of + /// the membership module + fn ensure_actor_origin( + origin: ::Origin, + actor_id: MemberId, + error: &'static str, + ) -> Result<::AccountId, &'static str> { + let account_id = + >::ensure_actor_origin(origin, actor_id, error)?; + + if >::is_councilor(&account_id) { + return Ok(account_id); + } + + Err(error) + } +} + +#[cfg(test)] +mod tests { + use crate::tests::mock::{Test, initial_test_ext}; + use common::origin_validator::ActorOriginValidator; + use membership::members::UserInfo; + use crate::CouncilOriginValidator; + use system::RawOrigin; + + type Membership = membership::members::Module; + type Council = governance::council::Module; + + #[test] + fn council_origin_validator_fails_with_unregistered_member() { + initial_test_ext().execute_with(|| { + let origin = RawOrigin::Signed(1); + let member_id = 1; + let error = "Error"; + + let validation_result = CouncilOriginValidator::::ensure_actor_origin( + origin.into(), + member_id, + error, + ); + + assert_eq!(validation_result, Err(error)); + }); + } + + #[test] + fn council_origin_validator_succeeds() { + initial_test_ext().execute_with(|| { + assert!(Council::set_council( + system::RawOrigin::Root.into(), + vec![1, 2, 3] + ).is_ok()); + + let account_id = 1; + let origin = RawOrigin::Signed(account_id); + let error = "Error"; + let authority_account_id = 10; + Membership::set_screening_authority(RawOrigin::Root.into(), authority_account_id) + .unwrap(); + + Membership::add_screened_member( + RawOrigin::Signed(authority_account_id).into(), + account_id, + UserInfo { + handle: Some(b"handle".to_vec()), + avatar_uri: None, + about: None, + }, + ) + .unwrap(); + let member_id = 0; // newly created member_id + + let validation_result = CouncilOriginValidator::::ensure_actor_origin( + origin.into(), + member_id, + error, + ); + + assert_eq!(validation_result, Ok(account_id)); + }); + } + + #[test] + fn council_origin_validator_fails_with_incompatible_account_id_and_member_id() { + initial_test_ext().execute_with(|| { + let account_id = 1; + let error = "Errorss"; + let authority_account_id = 10; + Membership::set_screening_authority(RawOrigin::Root.into(), authority_account_id) + .unwrap(); + + Membership::add_screened_member( + RawOrigin::Signed(authority_account_id).into(), + account_id, + UserInfo { + handle: Some(b"handle".to_vec()), + avatar_uri: None, + about: None, + }, + ) + .unwrap(); + let member_id = 0; // newly created member_id + + let invalid_account_id = 2; + let validation_result = CouncilOriginValidator::::ensure_actor_origin( + RawOrigin::Signed(invalid_account_id).into(), + member_id, + error, + ); + + assert_eq!(validation_result, Err(error)); + }); + } + + #[test] + fn council_origin_validator_fails_with_not_council_account_id() { + initial_test_ext().execute_with(|| { + let account_id = 1; + let origin = RawOrigin::Signed(account_id); + let error = "Error"; + let authority_account_id = 10; + Membership::set_screening_authority(RawOrigin::Root.into(), authority_account_id) + .unwrap(); + + Membership::add_screened_member( + RawOrigin::Signed(authority_account_id).into(), + account_id, + UserInfo { + handle: Some(b"handle".to_vec()), + avatar_uri: None, + about: None, + }, + ) + .unwrap(); + let member_id = 0; // newly created member_id + + let validation_result = CouncilOriginValidator::::ensure_actor_origin( + origin.into(), + member_id, + error, + ); + + assert_eq!(validation_result, Err(error)); + }); + } +} diff --git a/runtime-modules/proposals/engine/src/types/mod.rs b/runtime-modules/proposals/engine/src/types/mod.rs index 18724ceb8c..a71af731d9 100644 --- a/runtime-modules/proposals/engine/src/types/mod.rs +++ b/runtime-modules/proposals/engine/src/types/mod.rs @@ -11,9 +11,12 @@ use serde::{Deserialize, Serialize}; use srml_support::dispatch; use srml_support::traits::Currency; +mod council_origin_validator; mod proposal_statuses; mod stakes; +pub use council_origin_validator::CouncilOriginValidator; + pub use proposal_statuses::{ ApprovedProposalStatus, FinalizationData, ProposalDecisionStatus, ProposalStatus, }; From bc684d7b4cbb315d1ff4b4551112d29d444d9a30 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Mon, 16 Mar 2020 13:39:37 +0300 Subject: [PATCH 087/286] Implement total_voters_count() for engine module - implement VotersParameters::total_voters_count() using council size for proposals engine module - cargo fmt --- runtime-modules/proposals/engine/src/lib.rs | 2 +- .../src/types/council_origin_validator.rs | 59 +++++++++++-------- .../proposals/engine/src/types/mod.rs | 2 +- 3 files changed, 35 insertions(+), 28 deletions(-) diff --git a/runtime-modules/proposals/engine/src/lib.rs b/runtime-modules/proposals/engine/src/lib.rs index d0801d61c0..c94049390f 100644 --- a/runtime-modules/proposals/engine/src/lib.rs +++ b/runtime-modules/proposals/engine/src/lib.rs @@ -22,6 +22,7 @@ // TODO: Test cancellation, rejection fees pub use types::BalanceOf; +pub use types::CouncilManager; use types::FinalizedProposalData; use types::ProposalStakeManager; pub use types::VotingResults; @@ -32,7 +33,6 @@ pub use types::{ pub use types::{DefaultStakeHandlerProvider, StakeHandler, StakeHandlerProvider}; pub use types::{ProposalCodeDecoder, ProposalExecutable}; pub use types::{VoteKind, VotersParameters}; -pub use types::CouncilOriginValidator; mod errors; pub(crate) mod types; diff --git a/runtime-modules/proposals/engine/src/types/council_origin_validator.rs b/runtime-modules/proposals/engine/src/types/council_origin_validator.rs index a73203585e..28daaa463a 100644 --- a/runtime-modules/proposals/engine/src/types/council_origin_validator.rs +++ b/runtime-modules/proposals/engine/src/types/council_origin_validator.rs @@ -1,16 +1,18 @@ use rstd::marker::PhantomData; +use crate::VotersParameters; use common::origin_validator::ActorOriginValidator; use membership::origin_validator::{MemberId, MembershipOriginValidator}; -/// Default discussion system actor origin validator. Valid for both thread and post authors. -pub struct CouncilOriginValidator { +/// Handles work with the council. +/// Provides implementations for ActorOriginValidator and VotersParameters. +pub struct CouncilManager { marker: PhantomData, } impl ActorOriginValidator<::Origin, MemberId, ::AccountId> - for CouncilOriginValidator + for CouncilManager { /// Check for valid combination of origin and actor_id. Actor_id should be valid member_id of /// the membership module @@ -30,12 +32,20 @@ impl } } +impl VotersParameters for CouncilManager { + /// Implement total_voters_count() as council size + fn total_voters_count() -> u32 { + >::active_council().len() as u32 + } +} + #[cfg(test)] mod tests { - use crate::tests::mock::{Test, initial_test_ext}; + use crate::tests::mock::{initial_test_ext, Test}; + use crate::CouncilManager; + use crate::VotersParameters; use common::origin_validator::ActorOriginValidator; use membership::members::UserInfo; - use crate::CouncilOriginValidator; use system::RawOrigin; type Membership = membership::members::Module; @@ -48,11 +58,8 @@ mod tests { let member_id = 1; let error = "Error"; - let validation_result = CouncilOriginValidator::::ensure_actor_origin( - origin.into(), - member_id, - error, - ); + let validation_result = + CouncilManager::::ensure_actor_origin(origin.into(), member_id, error); assert_eq!(validation_result, Err(error)); }); @@ -61,10 +68,7 @@ mod tests { #[test] fn council_origin_validator_succeeds() { initial_test_ext().execute_with(|| { - assert!(Council::set_council( - system::RawOrigin::Root.into(), - vec![1, 2, 3] - ).is_ok()); + assert!(Council::set_council(system::RawOrigin::Root.into(), vec![1, 2, 3]).is_ok()); let account_id = 1; let origin = RawOrigin::Signed(account_id); @@ -85,11 +89,8 @@ mod tests { .unwrap(); let member_id = 0; // newly created member_id - let validation_result = CouncilOriginValidator::::ensure_actor_origin( - origin.into(), - member_id, - error, - ); + let validation_result = + CouncilManager::::ensure_actor_origin(origin.into(), member_id, error); assert_eq!(validation_result, Ok(account_id)); }); @@ -117,7 +118,7 @@ mod tests { let member_id = 0; // newly created member_id let invalid_account_id = 2; - let validation_result = CouncilOriginValidator::::ensure_actor_origin( + let validation_result = CouncilManager::::ensure_actor_origin( RawOrigin::Signed(invalid_account_id).into(), member_id, error, @@ -146,16 +147,22 @@ mod tests { about: None, }, ) - .unwrap(); + .unwrap(); let member_id = 0; // newly created member_id - let validation_result = CouncilOriginValidator::::ensure_actor_origin( - origin.into(), - member_id, - error, - ); + let validation_result = + CouncilManager::::ensure_actor_origin(origin.into(), member_id, error); assert_eq!(validation_result, Err(error)); }); } + + #[test] + fn council_size_calculation_aka_total_voters_count_succeeds() { + initial_test_ext().execute_with(|| { + assert!(Council::set_council(system::RawOrigin::Root.into(), vec![1, 2, 3, 7]).is_ok()); + + assert_eq!(CouncilManager::::total_voters_count(), 4) + }); + } } diff --git a/runtime-modules/proposals/engine/src/types/mod.rs b/runtime-modules/proposals/engine/src/types/mod.rs index a71af731d9..ef8d39aaa0 100644 --- a/runtime-modules/proposals/engine/src/types/mod.rs +++ b/runtime-modules/proposals/engine/src/types/mod.rs @@ -15,7 +15,7 @@ mod council_origin_validator; mod proposal_statuses; mod stakes; -pub use council_origin_validator::CouncilOriginValidator; +pub use council_origin_validator::CouncilManager; pub use proposal_statuses::{ ApprovedProposalStatus, FinalizationData, ProposalDecisionStatus, ProposalStatus, From 2a306e79998a36cad0da44e9f014ea81e7d4993f Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Mon, 16 Mar 2020 15:41:01 +0300 Subject: [PATCH 088/286] Change ensure_actor_origin() signature - change ensure_actor_origin() signature - remove error - introduce built-in error messages --- .../common/src/origin_validator.rs | 6 +---- .../membership/src/origin_validator.rs | 26 +++++++------------ .../proposals/codex/src/tests/mock.rs | 2 +- .../proposals/discussion/src/errors.rs | 4 --- .../proposals/discussion/src/lib.rs | 8 +----- .../proposals/discussion/src/tests/mock.rs | 8 ++---- .../proposals/discussion/src/tests/mod.rs | 6 ++--- .../proposals/engine/src/errors.rs | 2 -- runtime-modules/proposals/engine/src/lib.rs | 9 ++----- .../proposals/engine/src/tests/mock/mod.rs | 6 +---- .../src/types/council_origin_validator.rs | 21 +++++++-------- 11 files changed, 30 insertions(+), 68 deletions(-) diff --git a/runtime-modules/common/src/origin_validator.rs b/runtime-modules/common/src/origin_validator.rs index 437a131033..336331dda1 100644 --- a/runtime-modules/common/src/origin_validator.rs +++ b/runtime-modules/common/src/origin_validator.rs @@ -1,9 +1,5 @@ /// Abstract validator for the origin(account_id) and actor_id (eg.: thread author id). pub trait ActorOriginValidator { /// Check for valid combination of origin and actor_id - fn ensure_actor_origin( - origin: Origin, - actor_id: ActorId, - error: &'static str, - ) -> Result; + fn ensure_actor_origin(origin: Origin, actor_id: ActorId) -> Result; } diff --git a/runtime-modules/membership/src/origin_validator.rs b/runtime-modules/membership/src/origin_validator.rs index 91443b3fd3..dbe4655871 100644 --- a/runtime-modules/membership/src/origin_validator.rs +++ b/runtime-modules/membership/src/origin_validator.rs @@ -20,7 +20,6 @@ impl fn ensure_actor_origin( origin: ::Origin, actor_id: MemberId, - error: &'static str, ) -> Result<::AccountId, &'static str> { // check valid signed account_id let account_id = ensure_signed(origin)?; @@ -32,10 +31,12 @@ impl // whether the account_id belongs to the actor if profile.root_account == account_id || profile.controller_account == account_id { return Ok(account_id); + } else { + return Err("Membership validation failed: given account doesn't match with profile accounts"); } } - Err(error) + Err("Membership validation failed: cannot find a profile for a member") } } @@ -58,13 +59,10 @@ mod tests { initial_test_ext().execute_with(|| { let origin = RawOrigin::Signed(1); let member_id = 1; - let error = "Error"; + let error = "Membership validation failed: cannot find a profile for a member"; - let validation_result = MembershipOriginValidator::::ensure_actor_origin( - origin.into(), - member_id, - error, - ); + let validation_result = + MembershipOriginValidator::::ensure_actor_origin(origin.into(), member_id); assert_eq!(validation_result, Err(error)); }); @@ -75,7 +73,6 @@ mod tests { initial_test_ext().execute_with(|| { let account_id = 1; let origin = RawOrigin::Signed(account_id); - let error = "Error"; let authority_account_id = 10; Membership::set_screening_authority(RawOrigin::Root.into(), authority_account_id) .unwrap(); @@ -92,11 +89,8 @@ mod tests { .unwrap(); let member_id = 0; // newly created member_id - let validation_result = MembershipOriginValidator::::ensure_actor_origin( - origin.into(), - member_id, - error, - ); + let validation_result = + MembershipOriginValidator::::ensure_actor_origin(origin.into(), member_id); assert_eq!(validation_result, Ok(account_id)); }); @@ -106,7 +100,8 @@ mod tests { fn membership_origin_validator_fails_with_incompatible_account_id_and_member_id() { initial_test_ext().execute_with(|| { let account_id = 1; - let error = "Errorss"; + let error = + "Membership validation failed: given account doesn't match with profile accounts"; let authority_account_id = 10; Membership::set_screening_authority(RawOrigin::Root.into(), authority_account_id) .unwrap(); @@ -127,7 +122,6 @@ mod tests { let validation_result = MembershipOriginValidator::::ensure_actor_origin( RawOrigin::Signed(invalid_account_id).into(), member_id, - error, ); assert_eq!(validation_result, Err(error)); diff --git a/runtime-modules/proposals/codex/src/tests/mock.rs b/runtime-modules/proposals/codex/src/tests/mock.rs index 68f81878d9..e821a13081 100644 --- a/runtime-modules/proposals/codex/src/tests/mock.rs +++ b/runtime-modules/proposals/codex/src/tests/mock.rs @@ -109,7 +109,7 @@ impl governance::council::Trait for Test { } impl common::origin_validator::ActorOriginValidator for () { - fn ensure_actor_origin(_: Origin, _: u64, _: &'static str) -> Result { + fn ensure_actor_origin(_: Origin, _: u64) -> Result { Ok(1) } } diff --git a/runtime-modules/proposals/discussion/src/errors.rs b/runtime-modules/proposals/discussion/src/errors.rs index 9cdc1367d8..e375743df4 100644 --- a/runtime-modules/proposals/discussion/src/errors.rs +++ b/runtime-modules/proposals/discussion/src/errors.rs @@ -8,7 +8,3 @@ pub(crate) const MSG_EMPTY_POST_PROVIDED: &str = "Post cannot be empty"; pub(crate) const MSG_TOO_LONG_POST: &str = "Post is too long"; pub(crate) const MSG_MAX_THREAD_IN_A_ROW_LIMIT_EXCEEDED: &str = "Max number of threads by same author in a row limit exceeded"; -pub(crate) const MSG_INVALID_THREAD_AUTHOR_ORIGIN: &str = - "Invalid combination of the origin and thread_author_id"; -pub(crate) const MSG_INVALID_POST_AUTHOR_ORIGIN: &str = - "Invalid combination of the origin and post_author_id"; diff --git a/runtime-modules/proposals/discussion/src/lib.rs b/runtime-modules/proposals/discussion/src/lib.rs index 3f61d17b6e..9c262a047b 100644 --- a/runtime-modules/proposals/discussion/src/lib.rs +++ b/runtime-modules/proposals/discussion/src/lib.rs @@ -130,7 +130,6 @@ decl_module! { T::PostAuthorOriginValidator::ensure_actor_origin( origin, post_author_id.clone(), - errors::MSG_INVALID_POST_AUTHOR_ORIGIN )?; ensure!(>::exists(thread_id), errors::MSG_THREAD_DOESNT_EXIST); @@ -171,7 +170,6 @@ decl_module! { T::PostAuthorOriginValidator::ensure_actor_origin( origin, post_author_id.clone(), - errors::MSG_INVALID_POST_AUTHOR_ORIGIN )?; ensure!(>::exists(thread_id), errors::MSG_THREAD_DOESNT_EXIST); @@ -217,11 +215,7 @@ impl Module { thread_author_id: MemberId, title: Vec, ) -> Result { - T::ThreadAuthorOriginValidator::ensure_actor_origin( - origin, - thread_author_id.clone(), - errors::MSG_INVALID_THREAD_AUTHOR_ORIGIN, - )?; + T::ThreadAuthorOriginValidator::ensure_actor_origin(origin, thread_author_id.clone())?; ensure!(!title.is_empty(), errors::MSG_EMPTY_TITLE_PROVIDED); ensure!( diff --git a/runtime-modules/proposals/discussion/src/tests/mock.rs b/runtime-modules/proposals/discussion/src/tests/mock.rs index 83992b78e9..fbc916255d 100644 --- a/runtime-modules/proposals/discussion/src/tests/mock.rs +++ b/runtime-modules/proposals/discussion/src/tests/mock.rs @@ -97,11 +97,7 @@ impl crate::Trait for Test { } impl ActorOriginValidator for () { - fn ensure_actor_origin( - origin: Origin, - actor_id: u64, - error: &'static str, - ) -> Result { + fn ensure_actor_origin(origin: Origin, actor_id: u64) -> Result { if system::ensure_none(origin).is_ok() { return Ok(1); } @@ -110,7 +106,7 @@ impl ActorOriginValidator for () { return Ok(1); } - Err(error) + Err("Invalid author") } } diff --git a/runtime-modules/proposals/discussion/src/tests/mod.rs b/runtime-modules/proposals/discussion/src/tests/mod.rs index c3d5903297..cc2da35d09 100644 --- a/runtime-modules/proposals/discussion/src/tests/mod.rs +++ b/runtime-modules/proposals/discussion/src/tests/mod.rs @@ -268,7 +268,7 @@ fn update_post_call_failes_because_of_the_wrong_author() { post_fixture = post_fixture.with_author(2); - post_fixture.update_post_and_assert(Err(MSG_INVALID_POST_AUTHOR_ORIGIN)); + post_fixture.update_post_and_assert(Err("Invalid author")); post_fixture = post_fixture.with_origin(RawOrigin::None).with_author(2); @@ -424,11 +424,11 @@ fn add_discussion_thread_fails_because_of_max_thread_by_same_author_in_a_row_lim fn add_discussion_thread_fails_because_of_invalid_author_origin() { initial_test_ext().execute_with(|| { let discussion_fixture = DiscussionFixture::default().with_author(2); - discussion_fixture.create_discussion_and_assert(Err(MSG_INVALID_THREAD_AUTHOR_ORIGIN)); + discussion_fixture.create_discussion_and_assert(Err("Invalid author")); let discussion_fixture = DiscussionFixture::default() .with_origin(RawOrigin::Signed(3)) .with_author(2); - discussion_fixture.create_discussion_and_assert(Err(MSG_INVALID_THREAD_AUTHOR_ORIGIN)); + discussion_fixture.create_discussion_and_assert(Err("Invalid author")); }); } diff --git a/runtime-modules/proposals/engine/src/errors.rs b/runtime-modules/proposals/engine/src/errors.rs index b513726857..6dffb15541 100644 --- a/runtime-modules/proposals/engine/src/errors.rs +++ b/runtime-modules/proposals/engine/src/errors.rs @@ -12,7 +12,5 @@ pub const MSG_STAKE_SHOULD_BE_EMPTY: &str = "Stake should be empty for this prop pub const MSG_STAKE_DIFFERS_FROM_REQUIRED: &str = "Stake differs from the proposal requirements"; pub const MSG_INVALID_PARAMETER_APPROVAL_THRESHOLD: &str = "Approval threshold cannot be zero"; pub const MSG_INVALID_PARAMETER_SLASHING_THRESHOLD: &str = "Slashing threshold cannot be zero"; -pub const MSG_ONLY_MEMBERS_CAN_PROPOSE: &str = "Only members can make or cancel a proposal"; -pub const MSG_ONLY_COUNCILORS_CAN_VOTE: &str = "Only councilors can vote on proposals"; //pub const MSG_STAKE_IS_GREATER_THAN_BALANCE: &str = "Balance is too low to be staked"; diff --git a/runtime-modules/proposals/engine/src/lib.rs b/runtime-modules/proposals/engine/src/lib.rs index c94049390f..6c0b9d5350 100644 --- a/runtime-modules/proposals/engine/src/lib.rs +++ b/runtime-modules/proposals/engine/src/lib.rs @@ -169,7 +169,6 @@ decl_module! { T::VoterOriginValidator::ensure_actor_origin( origin, voter_id.clone(), - errors::MSG_ONLY_COUNCILORS_CAN_VOTE )?; ensure!(>::exists(proposal_id), errors::MSG_PROPOSAL_NOT_FOUND); @@ -198,7 +197,6 @@ decl_module! { T::ProposerOriginValidator::ensure_actor_origin( origin, proposer_id.clone(), - errors::MSG_ONLY_MEMBERS_CAN_PROPOSE )?; ensure!(>::exists(proposal_id), errors::MSG_PROPOSAL_NOT_FOUND); @@ -263,11 +261,8 @@ impl Module { proposal_type: u32, proposal_code: Vec, ) -> Result { - let account_id = T::ProposerOriginValidator::ensure_actor_origin( - origin, - proposer_id.clone(), - errors::MSG_ONLY_MEMBERS_CAN_PROPOSE, - )?; + let account_id = + T::ProposerOriginValidator::ensure_actor_origin(origin, proposer_id.clone())?; Self::ensure_create_proposal_parameters_are_valid( ¶meters, diff --git a/runtime-modules/proposals/engine/src/tests/mock/mod.rs b/runtime-modules/proposals/engine/src/tests/mock/mod.rs index 435e1e36e5..208f592c90 100644 --- a/runtime-modules/proposals/engine/src/tests/mock/mod.rs +++ b/runtime-modules/proposals/engine/src/tests/mock/mod.rs @@ -133,11 +133,7 @@ impl crate::Trait for Test { } impl common::origin_validator::ActorOriginValidator for () { - fn ensure_actor_origin( - origin: Origin, - _account_id: u64, - _: &'static str, - ) -> Result { + fn ensure_actor_origin(origin: Origin, _account_id: u64) -> Result { let signed_account_id = system::ensure_signed(origin)?; Ok(signed_account_id) diff --git a/runtime-modules/proposals/engine/src/types/council_origin_validator.rs b/runtime-modules/proposals/engine/src/types/council_origin_validator.rs index 28daaa463a..6ae22964d5 100644 --- a/runtime-modules/proposals/engine/src/types/council_origin_validator.rs +++ b/runtime-modules/proposals/engine/src/types/council_origin_validator.rs @@ -19,16 +19,14 @@ impl fn ensure_actor_origin( origin: ::Origin, actor_id: MemberId, - error: &'static str, ) -> Result<::AccountId, &'static str> { - let account_id = - >::ensure_actor_origin(origin, actor_id, error)?; + let account_id = >::ensure_actor_origin(origin, actor_id)?; if >::is_councilor(&account_id) { return Ok(account_id); } - Err(error) + Err("Council validation failed: account id doesn't belong to a council member") } } @@ -56,10 +54,10 @@ mod tests { initial_test_ext().execute_with(|| { let origin = RawOrigin::Signed(1); let member_id = 1; - let error = "Error"; + let error = "Membership validation failed: cannot find a profile for a member"; let validation_result = - CouncilManager::::ensure_actor_origin(origin.into(), member_id, error); + CouncilManager::::ensure_actor_origin(origin.into(), member_id); assert_eq!(validation_result, Err(error)); }); @@ -72,7 +70,6 @@ mod tests { let account_id = 1; let origin = RawOrigin::Signed(account_id); - let error = "Error"; let authority_account_id = 10; Membership::set_screening_authority(RawOrigin::Root.into(), authority_account_id) .unwrap(); @@ -90,7 +87,7 @@ mod tests { let member_id = 0; // newly created member_id let validation_result = - CouncilManager::::ensure_actor_origin(origin.into(), member_id, error); + CouncilManager::::ensure_actor_origin(origin.into(), member_id); assert_eq!(validation_result, Ok(account_id)); }); @@ -100,7 +97,8 @@ mod tests { fn council_origin_validator_fails_with_incompatible_account_id_and_member_id() { initial_test_ext().execute_with(|| { let account_id = 1; - let error = "Errorss"; + let error = + "Membership validation failed: given account doesn't match with profile accounts"; let authority_account_id = 10; Membership::set_screening_authority(RawOrigin::Root.into(), authority_account_id) .unwrap(); @@ -121,7 +119,6 @@ mod tests { let validation_result = CouncilManager::::ensure_actor_origin( RawOrigin::Signed(invalid_account_id).into(), member_id, - error, ); assert_eq!(validation_result, Err(error)); @@ -133,7 +130,7 @@ mod tests { initial_test_ext().execute_with(|| { let account_id = 1; let origin = RawOrigin::Signed(account_id); - let error = "Error"; + let error = "Council validation failed: account id doesn't belong to a council member"; let authority_account_id = 10; Membership::set_screening_authority(RawOrigin::Root.into(), authority_account_id) .unwrap(); @@ -151,7 +148,7 @@ mod tests { let member_id = 0; // newly created member_id let validation_result = - CouncilManager::::ensure_actor_origin(origin.into(), member_id, error); + CouncilManager::::ensure_actor_origin(origin.into(), member_id); assert_eq!(validation_result, Err(error)); }); From b889a42cd1484cf1132f8a88bed37d3fab36a379 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Mon, 16 Mar 2020 18:25:08 +0300 Subject: [PATCH 089/286] Add souce_account_id in the engine module - create new StakeData structure with stake_id field in the engine module - add souce_account_id field to the stake_data - change stake_id field to the StakeData in the Proposal structure --- .../proposals/engine/src/errors.rs | 2 - runtime-modules/proposals/engine/src/lib.rs | 29 +++++++++---- .../proposals/engine/src/tests/mod.rs | 24 +++++++---- .../proposals/engine/src/types/mod.rs | 41 ++++++++++++++----- .../proposals/engine/src/types/stakes.rs | 1 + 5 files changed, 66 insertions(+), 31 deletions(-) diff --git a/runtime-modules/proposals/engine/src/errors.rs b/runtime-modules/proposals/engine/src/errors.rs index 6dffb15541..35e45c8a66 100644 --- a/runtime-modules/proposals/engine/src/errors.rs +++ b/runtime-modules/proposals/engine/src/errors.rs @@ -12,5 +12,3 @@ pub const MSG_STAKE_SHOULD_BE_EMPTY: &str = "Stake should be empty for this prop pub const MSG_STAKE_DIFFERS_FROM_REQUIRED: &str = "Stake differs from the proposal requirements"; pub const MSG_INVALID_PARAMETER_APPROVAL_THRESHOLD: &str = "Approval threshold cannot be zero"; pub const MSG_INVALID_PARAMETER_SLASHING_THRESHOLD: &str = "Slashing threshold cannot be zero"; - -//pub const MSG_STAKE_IS_GREATER_THAN_BALANCE: &str = "Balance is too low to be staked"; diff --git a/runtime-modules/proposals/engine/src/lib.rs b/runtime-modules/proposals/engine/src/lib.rs index 6c0b9d5350..bcd4448757 100644 --- a/runtime-modules/proposals/engine/src/lib.rs +++ b/runtime-modules/proposals/engine/src/lib.rs @@ -28,7 +28,7 @@ use types::ProposalStakeManager; pub use types::VotingResults; pub use types::{ ApprovedProposalStatus, FinalizationData, Proposal, ProposalDecisionStatus, ProposalParameters, - ProposalStatus, + ProposalStatus, StakeData, }; pub use types::{DefaultStakeHandlerProvider, StakeHandler, StakeHandlerProvider}; pub use types::{ProposalCodeDecoder, ProposalExecutable}; @@ -280,9 +280,16 @@ impl Module { // Check stake_balance for value and create stake if value exists, else take None // If create_stake() returns error - return error from extrinsic let stake_id = stake_balance - .map(|stake_amount| ProposalStakeManager::::create_stake(stake_amount, account_id)) + .map(|stake_amount| { + ProposalStakeManager::::create_stake(stake_amount, account_id.clone()) + }) .transpose()?; + let stake_data = stake_id.map(|stake_id| StakeData { + stake_id, + source_account_id: account_id, + }); + let new_proposal = Proposal { created_at: Self::current_block(), parameters, @@ -292,7 +299,7 @@ impl Module { proposal_type, status: ProposalStatus::Active, voting_results: VotingResults::default(), - stake_id, + stake_data, }; let proposal_id = T::ProposalId::from(new_proposal_id); @@ -399,10 +406,12 @@ impl Module { // deal with stakes if necessary let slash_balance = Self::calculate_slash_balance(&decision_status, &proposal.parameters); - let slash_and_unstake_result = Self::slash_and_unstake(proposal.stake_id, slash_balance); + let slash_and_unstake_result = + Self::slash_and_unstake(proposal.stake_data.clone(), slash_balance); + //TODO: leave stake data as is? if slash_and_unstake_result.is_ok() { - proposal.stake_id = None; + proposal.stake_data = None; } // create finalized proposal status with error if any @@ -420,16 +429,16 @@ impl Module { // Slashes the stake and perform unstake only in case of existing stake fn slash_and_unstake( - current_stake_id: Option, + current_stake_data: Option>, slash_balance: BalanceOf, ) -> Result<(), &'static str> { // only if stake exists - if let Some(stake_id) = current_stake_id { + if let Some(stake_data) = current_stake_data { if !slash_balance.is_zero() { - ProposalStakeManager::::slash(stake_id, slash_balance)?; + ProposalStakeManager::::slash(stake_data.stake_id, slash_balance)?; } - ProposalStakeManager::::remove_stake(stake_id)?; + ProposalStakeManager::::remove_stake(stake_data.stake_id)?; } Ok(()) @@ -551,6 +560,7 @@ type FinalizedProposal = FinalizedProposalData< MemberId, types::BalanceOf, ::StakeId, + ::AccountId, >; // Simplification of the 'Proposal' type @@ -559,4 +569,5 @@ type ProposalObject = Proposal< MemberId, types::BalanceOf, ::StakeId, + ::AccountId, >; diff --git a/runtime-modules/proposals/engine/src/tests/mod.rs b/runtime-modules/proposals/engine/src/tests/mod.rs index 0cc6737270..abf31e6ff0 100644 --- a/runtime-modules/proposals/engine/src/tests/mod.rs +++ b/runtime-modules/proposals/engine/src/tests/mod.rs @@ -353,7 +353,7 @@ fn proposal_execution_succeeds() { rejections: 0, slashes: 0, }, - stake_id: None, + stake_data: None, } ); @@ -403,7 +403,7 @@ fn proposal_execution_failed() { rejections: 0, slashes: 0, }, - stake_id: None, + stake_data: None, } ) }); @@ -587,7 +587,7 @@ fn cancel_proposal_succeeds() { title: b"title".to_vec(), description: b"description".to_vec(), voting_results: VotingResults::default(), - stake_id: None, + stake_data: None, } ) }); @@ -657,7 +657,7 @@ fn veto_proposal_succeeds() { title: b"title".to_vec(), description: b"description".to_vec(), voting_results: VotingResults::default(), - stake_id: None, + stake_data: None, } ); @@ -789,7 +789,7 @@ fn create_proposal_and_expire_it() { title: b"title".to_vec(), description: b"description".to_vec(), voting_results: VotingResults::default(), - stake_id: None, + stake_data: None, } ) }); @@ -836,7 +836,7 @@ fn proposal_execution_postponed_because_of_grace_period() { rejections: 0, slashes: 0, }, - stake_id: None, + stake_data: None, } ); }); @@ -879,7 +879,7 @@ fn proposal_execution_succeeds_after_the_grace_period() { rejections: 0, slashes: 0, }, - stake_id: None, + stake_data: None, }; assert_eq!(proposal, expected_proposal); @@ -978,7 +978,10 @@ fn create_dummy_proposal_succeeds_with_stake() { title: b"title".to_vec(), description: b"description".to_vec(), voting_results: VotingResults::default(), - stake_id: Some(0), // valid stake_id + stake_data: Some(StakeData { + stake_id: 0, // valid stake_id + source_account_id: 1 + }), } ) }); @@ -1240,7 +1243,10 @@ fn finalize_proposal_using_stake_mocks_failed() { title: b"title".to_vec(), description: b"description".to_vec(), voting_results: VotingResults::default(), - stake_id: Some(1), + stake_data: Some(StakeData { + stake_id: 1, + source_account_id: 1 + }), } ); }); diff --git a/runtime-modules/proposals/engine/src/types/mod.rs b/runtime-modules/proposals/engine/src/types/mod.rs index ef8d39aaa0..a7058c6f77 100644 --- a/runtime-modules/proposals/engine/src/types/mod.rs +++ b/runtime-modules/proposals/engine/src/types/mod.rs @@ -114,10 +114,21 @@ impl VotingResults { } } +/// Contains created stake id and source account for the stake balance +#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive(Encode, Decode, Default, Clone, Copy, PartialEq, Eq, Debug)] +pub struct StakeData { + /// Created stake id for the proposal + pub stake_id: StakeId, + + /// Source account of the stake balance. Refund if any will be provided using this account + pub source_account_id: AccountId, +} + /// 'Proposal' contains information necessary for the proposal system functioning. #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] #[derive(Encode, Decode, Default, Clone, PartialEq, Eq, Debug)] -pub struct Proposal { +pub struct Proposal { /// Proposal type id pub proposal_type: u32, @@ -142,11 +153,12 @@ pub struct Proposal { /// Curring voting result for the proposal pub voting_results: VotingResults, - /// Created stake id for the proposal - pub stake_id: Option, + /// Stake data for the proposal + pub stake_data: Option>, } -impl Proposal +impl + Proposal where BlockNumber: Add + PartialOrd + Copy, { @@ -214,8 +226,8 @@ pub trait VotersParameters { } // Calculates quorum, votes threshold, expiration status -struct ProposalStatusResolution<'a, BlockNumber, ProposerId, Balance, StakeId> { - proposal: &'a Proposal, +struct ProposalStatusResolution<'a, BlockNumber, ProposerId, Balance, StakeId, AccountId> { + proposal: &'a Proposal, now: BlockNumber, votes_count: u32, total_voters_count: u32, @@ -223,8 +235,8 @@ struct ProposalStatusResolution<'a, BlockNumber, ProposerId, Balance, StakeId> { slashes: u32, } -impl<'a, BlockNumber, ProposerId, Balance, StakeId> - ProposalStatusResolution<'a, BlockNumber, ProposerId, Balance, StakeId> +impl<'a, BlockNumber, ProposerId, Balance, StakeId, AccountId> + ProposalStatusResolution<'a, BlockNumber, ProposerId, Balance, StakeId, AccountId> where BlockNumber: Add + PartialOrd + Copy, { @@ -310,12 +322,19 @@ pub type NegativeImbalance = pub type CurrencyOf = ::Currency; /// Data container for the finalized proposal results -pub(crate) struct FinalizedProposalData { +pub(crate) struct FinalizedProposalData< + ProposalId, + BlockNumber, + ProposerId, + Balance, + StakeId, + AccountId, +> { /// Proposal id pub proposal_id: ProposalId, /// Proposal to be finalized - pub proposal: Proposal, + pub proposal: Proposal, /// Proposal finalization status pub status: ProposalDecisionStatus, @@ -329,7 +348,7 @@ mod tests { use crate::*; // Alias introduced for simplicity of changing Proposal exact types. - type ProposalObject = Proposal; + type ProposalObject = Proposal; #[test] fn proposal_voting_period_expired() { diff --git a/runtime-modules/proposals/engine/src/types/stakes.rs b/runtime-modules/proposals/engine/src/types/stakes.rs index 5d4a5509df..43780477c4 100644 --- a/runtime-modules/proposals/engine/src/types/stakes.rs +++ b/runtime-modules/proposals/engine/src/types/stakes.rs @@ -153,6 +153,7 @@ impl ProposalStakeManager { pub fn remove_stake(stake_id: T::StakeId) -> Result<(), &'static str> { T::StakeHandlerProvider::stakes().unstake(stake_id)?; + //TODO: can't remove stake before refunding T::StakeHandlerProvider::stakes().remove_stake(stake_id)?; Ok(()) From 5b9fb19f0e95d64f79a2bf0f1c20196cd6907d53 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Mon, 16 Mar 2020 19:38:00 +0300 Subject: [PATCH 090/286] Add StakingEventHandler for engine module - add StakingEventHandler for engine module - add storage map StakesProposals - add refund_proposal_stake() callback --- runtime-modules/proposals/engine/src/lib.rs | 48 +++++++++++++++---- .../proposals/engine/src/types/mod.rs | 4 +- .../proposals/engine/src/types/stakes.rs | 32 ++++++++++++- 3 files changed, 72 insertions(+), 12 deletions(-) diff --git a/runtime-modules/proposals/engine/src/lib.rs b/runtime-modules/proposals/engine/src/lib.rs index bcd4448757..4570d44b0e 100644 --- a/runtime-modules/proposals/engine/src/lib.rs +++ b/runtime-modules/proposals/engine/src/lib.rs @@ -20,16 +20,17 @@ // TODO: Test module after the https://github.com/Joystream/substrate-runtime-joystream/issues/161 // issue will be fixed: "Fix stake module and allow slashing and unstaking in the same block." // TODO: Test cancellation, rejection fees +// TODO: Test StakingEventHandler +// TODO: Test refund_proposal_stake() -pub use types::BalanceOf; pub use types::CouncilManager; use types::FinalizedProposalData; use types::ProposalStakeManager; -pub use types::VotingResults; pub use types::{ ApprovedProposalStatus, FinalizationData, Proposal, ProposalDecisionStatus, ProposalParameters, - ProposalStatus, StakeData, + ProposalStatus, StakeData, StakingEventsHandler, VotingResults, }; +pub use types::{BalanceOf, CurrencyOf, NegativeImbalance}; pub use types::{DefaultStakeHandlerProvider, StakeHandler, StakeHandlerProvider}; pub use types::{ProposalCodeDecoder, ProposalExecutable}; pub use types::{VoteKind, VotersParameters}; @@ -43,7 +44,7 @@ mod tests; use rstd::prelude::*; use runtime_primitives::traits::Zero; -use srml_support::traits::Get; +use srml_support::traits::{Get, Currency}; use srml_support::{ decl_event, decl_module, decl_storage, dispatch, ensure, Parameter, StorageDoubleMap, }; @@ -154,6 +155,9 @@ decl_storage! { /// Double map for preventing duplicate votes. Should be cleaned after usage. pub VoteExistsByProposalByVoter get(fn vote_by_proposal_by_voter): double_map T::ProposalId, twox_256(MemberId) => VoteKind; + + /// Map proposal id by stake id. Required by StakingEventsHandler callback call + pub StakesProposals get(fn stakes_proposals): map T::StakeId => T::ProposalId; } } @@ -276,19 +280,25 @@ impl Module { let next_proposal_count_value = Self::proposal_count() + 1; let new_proposal_id = next_proposal_count_value; + let proposal_id = T::ProposalId::from(new_proposal_id); // Check stake_balance for value and create stake if value exists, else take None // If create_stake() returns error - return error from extrinsic - let stake_id = stake_balance + let stake_id_result = stake_balance .map(|stake_amount| { ProposalStakeManager::::create_stake(stake_amount, account_id.clone()) }) .transpose()?; - let stake_data = stake_id.map(|stake_id| StakeData { - stake_id, - source_account_id: account_id, - }); + let mut stake_data = None; + if let Some(stake_id) = stake_id_result { + stake_data = Some(StakeData { + stake_id, + source_account_id: account_id, + }); + + >::insert(stake_id, proposal_id); + } let new_proposal = Proposal { created_at: Self::current_block(), @@ -302,7 +312,6 @@ impl Module { stake_data, }; - let proposal_id = T::ProposalId::from(new_proposal_id); >::insert(proposal_id, new_proposal); >::insert(proposal_id, proposal_code); >::insert(proposal_id, ()); @@ -551,6 +560,25 @@ impl Module { Ok(()) } + + //TODO: candidate for invariant break or error saving to the state + /// Callback from StakingEventsHandler. Refunds unstaked imbalance back to the source account + pub(crate) fn refund_proposal_stake(stake_id: T::StakeId, imbalance: NegativeImbalance) { + if >::exists(stake_id) { + //TODO: handle non existence + + let proposal_id = Self::stakes_proposals(stake_id); + + if >::exists(proposal_id) { + let proposal = Self::proposals(proposal_id); + + if let Some(stake_data) = proposal.stake_data { + //TODO: handle the result + let _ = CurrencyOf::::resolve_into_existing(&stake_data.source_account_id, imbalance); + } + } + } + } } // Simplification of the 'FinalizedProposalData' type diff --git a/runtime-modules/proposals/engine/src/types/mod.rs b/runtime-modules/proposals/engine/src/types/mod.rs index a7058c6f77..420bbea49d 100644 --- a/runtime-modules/proposals/engine/src/types/mod.rs +++ b/runtime-modules/proposals/engine/src/types/mod.rs @@ -21,7 +21,9 @@ pub use proposal_statuses::{ ApprovedProposalStatus, FinalizationData, ProposalDecisionStatus, ProposalStatus, }; pub(crate) use stakes::ProposalStakeManager; -pub use stakes::{DefaultStakeHandlerProvider, StakeHandler, StakeHandlerProvider}; +pub use stakes::{ + DefaultStakeHandlerProvider, StakeHandler, StakeHandlerProvider, StakingEventsHandler, +}; #[cfg(test)] pub(crate) use stakes::DefaultStakeHandler; diff --git a/runtime-modules/proposals/engine/src/types/stakes.rs b/runtime-modules/proposals/engine/src/types/stakes.rs index 43780477c4..b7a639f246 100644 --- a/runtime-modules/proposals/engine/src/types/stakes.rs +++ b/runtime-modules/proposals/engine/src/types/stakes.rs @@ -4,7 +4,7 @@ use rstd::convert::From; use rstd::marker::PhantomData; use rstd::rc::Rc; use runtime_primitives::traits::Zero; -use srml_support::traits::{Currency, ExistenceRequirement, WithdrawReasons}; +use srml_support::traits::{Currency, ExistenceRequirement, Imbalance, WithdrawReasons}; // Mocking dependencies for testing #[cfg(test)] @@ -12,6 +12,36 @@ use mockall::predicate::*; #[cfg(test)] use mockall::*; +/// Proposal implementation of the staking event handler from the stake module. +/// 'marker' responsible for the 'Trait' binding. +pub struct StakingEventsHandler { + pub marker: PhantomData, +} + +impl stake::StakingEventsHandler for StakingEventsHandler { + /// Unstake remaining sum back to the source_account_id + fn unstaked( + id: &::StakeId, + _unstaked_amount: BalanceOf, + remaining_imbalance: NegativeImbalance, + ) -> NegativeImbalance { + >::refund_proposal_stake(*id, remaining_imbalance); + + >::zero() // all imbalance was consumed + } + + /// Empty handler for slashing + fn slashed( + _: &::StakeId, + _: &::SlashId, + _: BalanceOf, + _: BalanceOf, + remaining_imbalance: NegativeImbalance, + ) -> NegativeImbalance { + remaining_imbalance + } +} + /// Returns registered stake handler. This is scaffolds for the mocking of the stake module. pub trait StakeHandlerProvider { /// Returns stake logic handler From 90c2ad7d51f527747e5d22922360c5524acee4ab Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 17 Mar 2020 14:56:30 +0300 Subject: [PATCH 091/286] Remove comments --- runtime-modules/proposals/codex/src/tests/mock.rs | 2 -- runtime-modules/proposals/engine/src/lib.rs | 7 +++++-- runtime-modules/proposals/engine/src/tests/mock/mod.rs | 2 -- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/runtime-modules/proposals/codex/src/tests/mock.rs b/runtime-modules/proposals/codex/src/tests/mock.rs index e821a13081..839daf5127 100644 --- a/runtime-modules/proposals/codex/src/tests/mock.rs +++ b/runtime-modules/proposals/codex/src/tests/mock.rs @@ -174,8 +174,6 @@ impl timestamp::Trait for Test { type MinimumPeriod = MinimumPeriod; } -// TODO add a Hook type to capture TriggerElection and CouncilElected hooks - pub fn initial_test_ext() -> runtime_io::TestExternalities { let t = system::GenesisConfig::default() .build_storage::() diff --git a/runtime-modules/proposals/engine/src/lib.rs b/runtime-modules/proposals/engine/src/lib.rs index 4570d44b0e..05332271b3 100644 --- a/runtime-modules/proposals/engine/src/lib.rs +++ b/runtime-modules/proposals/engine/src/lib.rs @@ -44,7 +44,7 @@ mod tests; use rstd::prelude::*; use runtime_primitives::traits::Zero; -use srml_support::traits::{Get, Currency}; +use srml_support::traits::{Currency, Get}; use srml_support::{ decl_event, decl_module, decl_storage, dispatch, ensure, Parameter, StorageDoubleMap, }; @@ -574,7 +574,10 @@ impl Module { if let Some(stake_data) = proposal.stake_data { //TODO: handle the result - let _ = CurrencyOf::::resolve_into_existing(&stake_data.source_account_id, imbalance); + let _ = CurrencyOf::::resolve_into_existing( + &stake_data.source_account_id, + imbalance, + ); } } } diff --git a/runtime-modules/proposals/engine/src/tests/mock/mod.rs b/runtime-modules/proposals/engine/src/tests/mock/mod.rs index 208f592c90..6ebd7691eb 100644 --- a/runtime-modules/proposals/engine/src/tests/mock/mod.rs +++ b/runtime-modules/proposals/engine/src/tests/mock/mod.rs @@ -181,8 +181,6 @@ impl timestamp::Trait for Test { type MinimumPeriod = MinimumPeriod; } -// TODO add a Hook type to capture TriggerElection and CouncilElected hooks - pub fn initial_test_ext() -> runtime_io::TestExternalities { let t = system::GenesisConfig::default() .build_storage::() From b3f9c3de1ff22c415ccd5b65648c911d8ef16526 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 17 Mar 2020 15:32:53 +0300 Subject: [PATCH 092/286] Remove proposals version 1 - delete proposals from the governance module - clear the runtime from link to proposals version 1 --- runtime-modules/governance/src/lib.rs | 1 - runtime-modules/governance/src/mock.rs | 2 +- runtime-modules/governance/src/proposals.rs | 1572 ------------------- runtime/src/lib.rs | 7 +- 4 files changed, 2 insertions(+), 1580 deletions(-) delete mode 100644 runtime-modules/governance/src/proposals.rs diff --git a/runtime-modules/governance/src/lib.rs b/runtime-modules/governance/src/lib.rs index 9e1d712f8b..d38dcb9689 100644 --- a/runtime-modules/governance/src/lib.rs +++ b/runtime-modules/governance/src/lib.rs @@ -3,7 +3,6 @@ pub mod council; pub mod election; -pub mod proposals; mod sealed_vote; mod stake; diff --git a/runtime-modules/governance/src/mock.rs b/runtime-modules/governance/src/mock.rs index 5e6dc33dbe..31a3f6b550 100644 --- a/runtime-modules/governance/src/mock.rs +++ b/runtime-modules/governance/src/mock.rs @@ -1,6 +1,6 @@ #![cfg(test)] -pub use super::{council, election, proposals}; +pub use super::{council, election}; pub use common::currency::GovernanceCurrency; pub use system; diff --git a/runtime-modules/governance/src/proposals.rs b/runtime-modules/governance/src/proposals.rs deleted file mode 100644 index e681e51d6c..0000000000 --- a/runtime-modules/governance/src/proposals.rs +++ /dev/null @@ -1,1572 +0,0 @@ -use codec::{Decode, Encode}; -use rstd::prelude::*; -use sr_primitives::{ - print, - traits::{Hash, SaturatedConversion, Zero}, -}; -use srml_support::traits::{Currency, Get, ReservableCurrency}; -use srml_support::{decl_event, decl_module, decl_storage, dispatch, ensure}; -use system::{self, ensure_root, ensure_signed}; - -#[cfg(feature = "std")] -use serde::{Deserialize, Serialize}; - -#[cfg(test)] -use primitives::storage::well_known_keys; - -use super::council; -pub use common::currency::{BalanceOf, GovernanceCurrency}; - -const DEFAULT_APPROVAL_QUORUM: u32 = 60; -const DEFAULT_MIN_STAKE: u32 = 100; -const DEFAULT_CANCELLATION_FEE: u32 = 5; -const DEFAULT_REJECTION_FEE: u32 = 10; - -const DEFAULT_VOTING_PERIOD_IN_DAYS: u32 = 10; -const DEFAULT_VOTING_PERIOD_IN_SECS: u32 = DEFAULT_VOTING_PERIOD_IN_DAYS * 24 * 60 * 60; - -const DEFAULT_NAME_MAX_LEN: u32 = 100; -const DEFAULT_DESCRIPTION_MAX_LEN: u32 = 10_000; -const DEFAULT_WASM_CODE_MAX_LEN: u32 = 2_000_000; - -const MSG_STAKE_IS_TOO_LOW: &str = "Stake is too low"; -const MSG_STAKE_IS_GREATER_THAN_BALANCE: &str = "Balance is too low to be staked"; -const MSG_ONLY_MEMBERS_CAN_PROPOSE: &str = "Only members can make a proposal"; -const MSG_ONLY_COUNCILORS_CAN_VOTE: &str = "Only councilors can vote on proposals"; -const MSG_PROPOSAL_NOT_FOUND: &str = "This proposal does not exist"; -const MSG_PROPOSAL_EXPIRED: &str = "Voting period is expired for this proposal"; -const MSG_PROPOSAL_FINALIZED: &str = "Proposal is finalized already"; -const MSG_YOU_ALREADY_VOTED: &str = "You have already voted on this proposal"; -const MSG_YOU_DONT_OWN_THIS_PROPOSAL: &str = "You do not own this proposal"; -const MSG_PROPOSAL_STATUS_ALREADY_UPDATED: &str = "Proposal status has been updated already"; -const MSG_EMPTY_NAME_PROVIDED: &str = "Proposal cannot have an empty name"; -const MSG_EMPTY_DESCRIPTION_PROVIDED: &str = "Proposal cannot have an empty description"; -const MSG_EMPTY_WASM_CODE_PROVIDED: &str = "Proposal cannot have an empty WASM code"; -const MSG_TOO_LONG_NAME: &str = "Name is too long"; -const MSG_TOO_LONG_DESCRIPTION: &str = "Description is too long"; -const MSG_TOO_LONG_WASM_CODE: &str = "WASM code is too big"; - -#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))] -#[derive(Encode, Decode, Clone, PartialEq, Eq)] -pub enum ProposalStatus { - /// A new proposal that is available for voting. - Active, - /// If cancelled by a proposer. - Cancelled, - /// Not enough votes and voting period expired. - Expired, - /// To clear the quorum requirement, the percentage of council members with revealed votes - /// must be no less than the quorum value for the given proposal type. - Approved, - Rejected, - /// If all revealed votes are slashes, then the proposal is rejected, - /// and the proposal stake is slashed. - Slashed, -} - -impl Default for ProposalStatus { - fn default() -> Self { - ProposalStatus::Active - } -} - -use self::ProposalStatus::*; - -#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] -#[derive(Encode, Decode, Clone, PartialEq, Eq, Debug)] -pub enum VoteKind { - /// Signals presence, but unwillingness to cast judgment on substance of vote. - Abstain, - /// Pass, an alternative or a ranking, for binary, multiple choice - /// and ranked choice propositions, respectively. - Approve, - /// Against proposal. - Reject, - /// Against the proposal, and slash proposal stake. - Slash, -} - -impl Default for VoteKind { - fn default() -> Self { - VoteKind::Abstain - } -} - -use self::VoteKind::*; - -#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))] -#[derive(Encode, Decode, Default, Clone, PartialEq, Eq)] -/// Proposal for node runtime update. -pub struct RuntimeUpgradeProposal { - id: u32, - proposer: AccountId, - stake: Balance, - name: Vec, - description: Vec, - wasm_hash: Hash, - proposed_at: BlockNumber, - status: ProposalStatus, -} - -#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))] -#[derive(Encode, Decode, Default, Clone, PartialEq, Eq)] -pub struct TallyResult { - proposal_id: u32, - abstentions: u32, - approvals: u32, - rejections: u32, - slashes: u32, - status: ProposalStatus, - finalized_at: BlockNumber, -} - -pub trait Trait: - timestamp::Trait + council::Trait + GovernanceCurrency + membership::members::Trait -{ - /// The overarching event type. - type Event: From> + Into<::Event>; -} - -decl_event!( - pub enum Event - where - ::Hash, - ::BlockNumber, - ::AccountId - { - // New events - - /// Params: - /// * Account id of a member who proposed. - /// * Id of a newly created proposal after it was saved in storage. - ProposalCreated(AccountId, u32), - ProposalCanceled(AccountId, u32), - ProposalStatusUpdated(u32, ProposalStatus), - - /// Params: - /// * Voter - an account id of a councilor. - /// * Id of a proposal. - /// * Kind of vote. - Voted(AccountId, u32, VoteKind), - - TallyFinalized(TallyResult), - - /// * Hash - hash of wasm code of runtime update. - RuntimeUpdated(u32, Hash), - - /// Root cancelled proposal - ProposalVetoed(u32), - } -); - -decl_storage! { - trait Store for Module as Proposals { - - // Parameters (defaut values could be exported to config): - - // TODO rename 'approval_quorum' -> 'quorum_percent' ?! - /// A percent (up to 100) of the council participants - /// that must vote affirmatively in order to pass. - ApprovalQuorum get(approval_quorum) config(): u32 = DEFAULT_APPROVAL_QUORUM; - - /// Minimum amount of a balance to be staked in order to make a proposal. - MinStake get(min_stake) config(): BalanceOf = - BalanceOf::::from(DEFAULT_MIN_STAKE); - - /// A fee to be slashed (burn) in case a proposer decides to cancel a proposal. - CancellationFee get(cancellation_fee) config(): BalanceOf = - BalanceOf::::from(DEFAULT_CANCELLATION_FEE); - - /// A fee to be slashed (burn) in case a proposal was rejected. - RejectionFee get(rejection_fee) config(): BalanceOf = - BalanceOf::::from(DEFAULT_REJECTION_FEE); - - /// Max duration of proposal in blocks until it will be expired if not enough votes. - VotingPeriod get(voting_period) config(): T::BlockNumber = - T::BlockNumber::from(DEFAULT_VOTING_PERIOD_IN_SECS / - (::MinimumPeriod::get().saturated_into::() * 2)); - - NameMaxLen get(name_max_len) config(): u32 = DEFAULT_NAME_MAX_LEN; - DescriptionMaxLen get(description_max_len) config(): u32 = DEFAULT_DESCRIPTION_MAX_LEN; - WasmCodeMaxLen get(wasm_code_max_len) config(): u32 = DEFAULT_WASM_CODE_MAX_LEN; - - // Persistent state (always relevant, changes constantly): - - /// Count of all proposals that have been created. - ProposalCount get(proposal_count): u32; - - /// Get proposal details by its id. - Proposals get(proposals): map u32 => RuntimeUpgradeProposal, T::BlockNumber, T::Hash>; - - /// Ids of proposals that are open for voting (have not been finalized yet). - ActiveProposalIds get(active_proposal_ids): Vec = vec![]; - - /// Get WASM code of runtime upgrade by hash of its content. - WasmCodeByHash get(wasm_code_by_hash): map T::Hash => Vec; - - VotesByProposal get(votes_by_proposal): map u32 => Vec<(T::AccountId, VoteKind)>; - - // TODO Rethink: this can be replaced with: votes_by_proposal.find(|vote| vote.0 == proposer) - VoteByAccountAndProposal get(vote_by_account_and_proposal): map (T::AccountId, u32) => VoteKind; - - TallyResults get(tally_results): map u32 => TallyResult; - } -} - -decl_module! { - pub struct Module for enum Call where origin: T::Origin { - - fn deposit_event() = default; - - /// Use next code to create a proposal from Substrate UI's web console: - /// ```js - /// post({ sender: runtime.indices.ss58Decode('F7Gh'), call: calls.proposals.createProposal(2500, "0x123", "0x456", "0x789") }).tie(console.log) - /// ``` - fn create_proposal( - origin, - stake: BalanceOf, - name: Vec, - description: Vec, - wasm_code: Vec - ) { - - let proposer = ensure_signed(origin)?; - ensure!(Self::can_participate(&proposer), MSG_ONLY_MEMBERS_CAN_PROPOSE); - ensure!(stake >= Self::min_stake(), MSG_STAKE_IS_TOO_LOW); - - ensure!(!name.is_empty(), MSG_EMPTY_NAME_PROVIDED); - ensure!(name.len() as u32 <= Self::name_max_len(), MSG_TOO_LONG_NAME); - - ensure!(!description.is_empty(), MSG_EMPTY_DESCRIPTION_PROVIDED); - ensure!(description.len() as u32 <= Self::description_max_len(), MSG_TOO_LONG_DESCRIPTION); - - ensure!(!wasm_code.is_empty(), MSG_EMPTY_WASM_CODE_PROVIDED); - ensure!(wasm_code.len() as u32 <= Self::wasm_code_max_len(), MSG_TOO_LONG_WASM_CODE); - - // Lock proposer's stake: - T::Currency::reserve(&proposer, stake) - .map_err(|_| MSG_STAKE_IS_GREATER_THAN_BALANCE)?; - - let proposal_id = Self::proposal_count() + 1; - ProposalCount::put(proposal_id); - - // See in substrate repo @ srml/contract/src/wasm/code_cache.rs:73 - let wasm_hash = T::Hashing::hash(&wasm_code); - - let new_proposal = RuntimeUpgradeProposal { - id: proposal_id, - proposer: proposer.clone(), - stake, - name, - description, - wasm_hash, - proposed_at: Self::current_block(), - status: Active - }; - - if !>::exists(wasm_hash) { - >::insert(wasm_hash, wasm_code); - } - >::insert(proposal_id, new_proposal); - ActiveProposalIds::mutate(|ids| ids.push(proposal_id)); - Self::deposit_event(RawEvent::ProposalCreated(proposer.clone(), proposal_id)); - - // Auto-vote with Approve if proposer is a councilor: - if Self::is_councilor(&proposer) { - Self::_process_vote(proposer, proposal_id, Approve)?; - } - } - - /// Use next code to create a proposal from Substrate UI's web console: - /// ```js - /// post({ sender: runtime.indices.ss58Decode('F7Gh'), call: calls.proposals.voteOnProposal(1, { option: "Approve", _type: "VoteKind" }) }).tie(console.log) - /// ``` - fn vote_on_proposal(origin, proposal_id: u32, vote: VoteKind) { - let voter = ensure_signed(origin)?; - ensure!(Self::is_councilor(&voter), MSG_ONLY_COUNCILORS_CAN_VOTE); - - ensure!(>::exists(proposal_id), MSG_PROPOSAL_NOT_FOUND); - let proposal = Self::proposals(proposal_id); - - ensure!(proposal.status == Active, MSG_PROPOSAL_FINALIZED); - - let not_expired = !Self::is_voting_period_expired(proposal.proposed_at); - ensure!(not_expired, MSG_PROPOSAL_EXPIRED); - - let did_not_vote_before = !>::exists((voter.clone(), proposal_id)); - ensure!(did_not_vote_before, MSG_YOU_ALREADY_VOTED); - - Self::_process_vote(voter, proposal_id, vote)?; - } - - // TODO add 'reason' why a proposer wants to cancel (UX + feedback)? - /// Cancel a proposal by its original proposer. Some fee will be withdrawn from his balance. - fn cancel_proposal(origin, proposal_id: u32) { - let proposer = ensure_signed(origin)?; - - ensure!(>::exists(proposal_id), MSG_PROPOSAL_NOT_FOUND); - let proposal = Self::proposals(proposal_id); - - ensure!(proposer == proposal.proposer, MSG_YOU_DONT_OWN_THIS_PROPOSAL); - ensure!(proposal.status == Active, MSG_PROPOSAL_FINALIZED); - - // Spend some minimum fee on proposer's balance for canceling a proposal - let fee = Self::cancellation_fee(); - let _ = T::Currency::slash_reserved(&proposer, fee); - - // Return unspent part of remaining staked deposit (after taking some fee) - let left_stake = proposal.stake - fee; - let _ = T::Currency::unreserve(&proposer, left_stake); - - Self::_update_proposal_status(proposal_id, Cancelled)?; - Self::deposit_event(RawEvent::ProposalCanceled(proposer, proposal_id)); - } - - // Called on every block - fn on_finalize(n: T::BlockNumber) { - if let Err(e) = Self::end_block(n) { - print(e); - } - } - - /// Cancel a proposal and return stake without slashing - fn veto_proposal(origin, proposal_id: u32) { - ensure_root(origin)?; - ensure!(>::exists(proposal_id), MSG_PROPOSAL_NOT_FOUND); - let proposal = Self::proposals(proposal_id); - ensure!(proposal.status == Active, MSG_PROPOSAL_FINALIZED); - - let _ = T::Currency::unreserve(&proposal.proposer, proposal.stake); - - Self::_update_proposal_status(proposal_id, Cancelled)?; - - Self::deposit_event(RawEvent::ProposalVetoed(proposal_id)); - } - - fn set_approval_quorum(origin, new_value: u32) { - ensure_root(origin)?; - ensure!(new_value > 0, "approval quorom must be greater than zero"); - ApprovalQuorum::put(new_value); - } - } -} - -impl Module { - fn current_block() -> T::BlockNumber { - >::block_number() - } - - fn can_participate(sender: &T::AccountId) -> bool { - !T::Currency::free_balance(sender).is_zero() - && >::is_member_account(sender) - } - - fn is_councilor(sender: &T::AccountId) -> bool { - >::is_councilor(sender) - } - - fn councilors_count() -> u32 { - >::active_council().len() as u32 - } - - fn approval_quorum_seats() -> u32 { - (Self::approval_quorum() * Self::councilors_count()) / 100 - } - - fn is_voting_period_expired(proposed_at: T::BlockNumber) -> bool { - Self::current_block() >= proposed_at + Self::voting_period() - } - - fn _process_vote(voter: T::AccountId, proposal_id: u32, vote: VoteKind) -> dispatch::Result { - let new_vote = (voter.clone(), vote.clone()); - if >::exists(proposal_id) { - // Append a new vote to other votes on this proposal: - >::mutate(proposal_id, |votes| votes.push(new_vote)); - } else { - // This is the first vote on this proposal: - >::insert(proposal_id, vec![new_vote]); - } - >::insert((voter.clone(), proposal_id), &vote); - Self::deposit_event(RawEvent::Voted(voter, proposal_id, vote)); - Ok(()) - } - - fn end_block(_now: T::BlockNumber) -> dispatch::Result { - // TODO refactor this method - - // TODO iterate over not expired proposals and tally - - Self::tally()?; - // TODO approve or reject a proposal - - Ok(()) - } - - /// Get the voters for the current proposal. - pub fn tally() -> dispatch::Result { - let councilors: u32 = Self::councilors_count(); - let quorum: u32 = Self::approval_quorum_seats(); - - for &proposal_id in Self::active_proposal_ids().iter() { - let votes = Self::votes_by_proposal(proposal_id); - let mut abstentions: u32 = 0; - let mut approvals: u32 = 0; - let mut rejections: u32 = 0; - let mut slashes: u32 = 0; - - for (_, vote) in votes.iter() { - match vote { - Abstain => abstentions += 1, - Approve => approvals += 1, - Reject => rejections += 1, - Slash => slashes += 1, - } - } - - let proposal = Self::proposals(proposal_id); - let is_expired = Self::is_voting_period_expired(proposal.proposed_at); - - // We need to check that the council is not empty because otherwise, - // if there is no votes on a proposal it will be counted as if - // all 100% (zero) councilors voted on the proposal and should be approved. - - let non_empty_council = councilors > 0; - let all_councilors_voted = non_empty_council && votes.len() as u32 == councilors; - let all_councilors_slashed = non_empty_council && slashes == councilors; - let quorum_reached = quorum > 0 && approvals >= quorum; - - // Don't approve a proposal right after quorum reached - // if not all councilors casted their votes. - // Instead let other councilors cast their vote - // up until the proposal's expired. - - let new_status: Option = if all_councilors_slashed { - Some(Slashed) - } else if all_councilors_voted { - if quorum_reached { - Some(Approved) - } else { - Some(Rejected) - } - } else if is_expired { - if quorum_reached { - Some(Approved) - } else { - // Proposal has been expired and quorum not reached. - Some(Expired) - } - } else { - // Councilors still have time to vote on this proposal. - None - }; - - // TODO move next block outside of tally to 'end_block' - if let Some(status) = new_status { - Self::_update_proposal_status(proposal_id, status.clone())?; - let tally_result = TallyResult { - proposal_id, - abstentions, - approvals, - rejections, - slashes, - status, - finalized_at: Self::current_block(), - }; - >::insert(proposal_id, &tally_result); - Self::deposit_event(RawEvent::TallyFinalized(tally_result)); - } - } - - Ok(()) - } - - /// Updates proposal status and removes proposal from active ids. - fn _update_proposal_status(proposal_id: u32, new_status: ProposalStatus) -> dispatch::Result { - let all_active_ids = Self::active_proposal_ids(); - let all_len = all_active_ids.len(); - let other_active_ids: Vec = all_active_ids - .into_iter() - .filter(|&id| id != proposal_id) - .collect(); - - let not_found_in_active = other_active_ids.len() == all_len; - if not_found_in_active { - // Seems like this proposal's status has been updated and removed from active. - Err(MSG_PROPOSAL_STATUS_ALREADY_UPDATED) - } else { - let pid = proposal_id.clone(); - match new_status { - Slashed => Self::_slash_proposal(pid)?, - Rejected | Expired => Self::_reject_proposal(pid)?, - Approved => Self::_approve_proposal(pid)?, - Active | Cancelled => { /* nothing */ } - } - ActiveProposalIds::put(other_active_ids); - >::mutate(proposal_id, |p| p.status = new_status.clone()); - Self::deposit_event(RawEvent::ProposalStatusUpdated(proposal_id, new_status)); - Ok(()) - } - } - - /// Slash a proposal. The staked deposit will be slashed. - fn _slash_proposal(proposal_id: u32) -> dispatch::Result { - let proposal = Self::proposals(proposal_id); - - // Slash proposer's stake: - let _ = T::Currency::slash_reserved(&proposal.proposer, proposal.stake); - - Ok(()) - } - - /// Reject a proposal. The staked deposit will be returned to a proposer. - fn _reject_proposal(proposal_id: u32) -> dispatch::Result { - let proposal = Self::proposals(proposal_id); - let proposer = proposal.proposer; - - // Spend some minimum fee on proposer's balance to prevent spamming attacks: - let fee = Self::rejection_fee(); - let _ = T::Currency::slash_reserved(&proposer, fee); - - // Return unspent part of remaining staked deposit (after taking some fee): - let left_stake = proposal.stake - fee; - let _ = T::Currency::unreserve(&proposer, left_stake); - - Ok(()) - } - - /// Approve a proposal. The staked deposit will be returned. - fn _approve_proposal(proposal_id: u32) -> dispatch::Result { - let proposal = Self::proposals(proposal_id); - let wasm_code = Self::wasm_code_by_hash(proposal.wasm_hash); - - // Return staked deposit to proposer: - let _ = T::Currency::unreserve(&proposal.proposer, proposal.stake); - - // Update wasm code of node's runtime: - >::set_code(system::RawOrigin::Root.into(), wasm_code)?; - - Self::deposit_event(RawEvent::RuntimeUpdated(proposal_id, proposal.wasm_hash)); - - Ok(()) - } -} - -#[cfg(test)] -mod tests { - - use super::*; - use primitives::H256; - // The testing primitives are very useful for avoiding having to work with signatures - // or public keys. `u64` is used as the `AccountId` and no `Signature`s are requried. - use sr_primitives::{ - testing::Header, - traits::{BlakeTwo256, IdentityLookup}, - Perbill, - }; - use srml_support::*; - - impl_outer_origin! { - pub enum Origin for Test {} - } - - // Workaround for https://github.com/rust-lang/rust/issues/26925 . Remove when sorted. - #[derive(Clone, PartialEq, Eq, Debug)] - pub struct Test; - - parameter_types! { - pub const BlockHashCount: u64 = 250; - pub const MaximumBlockWeight: u32 = 1024; - pub const MaximumBlockLength: u32 = 2 * 1024; - pub const AvailableBlockRatio: Perbill = Perbill::one(); - pub const MinimumPeriod: u64 = 5; - } - - impl system::Trait for Test { - type Origin = Origin; - type Index = u64; - type BlockNumber = u64; - type Call = (); - type Hash = H256; - type Hashing = BlakeTwo256; - type AccountId = u64; - type Lookup = IdentityLookup; - type Header = Header; - type Event = (); - type BlockHashCount = BlockHashCount; - type MaximumBlockWeight = MaximumBlockWeight; - type MaximumBlockLength = MaximumBlockLength; - type AvailableBlockRatio = AvailableBlockRatio; - type Version = (); - } - - impl timestamp::Trait for Test { - type Moment = u64; - type OnTimestampSet = (); - type MinimumPeriod = MinimumPeriod; - } - - parameter_types! { - pub const ExistentialDeposit: u32 = 0; - pub const TransferFee: u32 = 0; - pub const CreationFee: u32 = 0; - pub const TransactionBaseFee: u32 = 1; - pub const TransactionByteFee: u32 = 0; - pub const InitialMembersBalance: u32 = 0; - } - - impl balances::Trait for Test { - /// The type for recording an account's balance. - type Balance = u64; - /// What to do if an account's free balance gets zeroed. - type OnFreeBalanceZero = (); - /// What to do if a new account is created. - type OnNewAccount = (); - /// The ubiquitous event type. - type Event = (); - - type DustRemoval = (); - type TransferPayment = (); - type ExistentialDeposit = ExistentialDeposit; - type TransferFee = TransferFee; - type CreationFee = CreationFee; - } - - impl council::Trait for Test { - type Event = (); - type CouncilTermEnded = (); - } - - impl GovernanceCurrency for Test { - type Currency = balances::Module; - } - - impl membership::members::Trait for Test { - type Event = (); - type MemberId = u32; - type PaidTermId = u32; - type SubscriptionId = u32; - type ActorId = u32; - type InitialMembersBalance = InitialMembersBalance; - } - - impl Trait for Test { - type Event = (); - } - - type System = system::Module; - type Balances = balances::Module; - type Proposals = Module; - - const COUNCILOR1: u64 = 1; - const COUNCILOR2: u64 = 2; - const COUNCILOR3: u64 = 3; - const COUNCILOR4: u64 = 4; - const COUNCILOR5: u64 = 5; - - const PROPOSER1: u64 = 11; - const PROPOSER2: u64 = 12; - - const NOT_COUNCILOR: u64 = 22; - - const ALL_COUNCILORS: [u64; 5] = [COUNCILOR1, COUNCILOR2, COUNCILOR3, COUNCILOR4, COUNCILOR5]; - - // TODO Figure out how to test Events in test... (low priority) - // mod proposals { - // pub use ::Event; - // } - // impl_outer_event!{ - // pub enum TestEvent for Test { - // balances,system,proposals, - // } - // } - - // This function basically just builds a genesis storage key/value store according to - // our desired mockup. - fn new_test_ext() -> runtime_io::TestExternalities { - let mut t = system::GenesisConfig::default() - .build_storage::() - .unwrap(); - - // balances doesn't contain GenesisConfig anymore - // // We use default for brevity, but you can configure as desired if needed. - // balances::GenesisConfig::::default() - // .assimilate_storage(&mut t) - // .unwrap(); - - let council_mock: council::Seats = ALL_COUNCILORS - .iter() - .map(|&c| council::Seat { - member: c, - stake: 0u64, - backers: vec![], - }) - .collect(); - - council::GenesisConfig:: { - active_council: council_mock, - term_ends_at: 0, - } - .assimilate_storage(&mut t) - .unwrap(); - - membership::members::GenesisConfig:: { - default_paid_membership_fee: 0, - members: vec![ - (PROPOSER1, "alice".into(), "".into(), "".into()), - (PROPOSER2, "bobby".into(), "".into(), "".into()), - (COUNCILOR1, "councilor1".into(), "".into(), "".into()), - (COUNCILOR2, "councilor2".into(), "".into(), "".into()), - (COUNCILOR3, "councilor3".into(), "".into(), "".into()), - (COUNCILOR4, "councilor4".into(), "".into(), "".into()), - (COUNCILOR5, "councilor5".into(), "".into(), "".into()), - ], - } - .assimilate_storage(&mut t) - .unwrap(); - // t.extend(GenesisConfig::{ - // // Here we can override defaults. - // }.build_storage().unwrap().0); - - t.into() - } - - /// A shortcut to get minimum stake in tests. - fn min_stake() -> u64 { - Proposals::min_stake() - } - - /// A shortcut to get cancellation fee in tests. - fn cancellation_fee() -> u64 { - Proposals::cancellation_fee() - } - - /// A shortcut to get rejection fee in tests. - fn rejection_fee() -> u64 { - Proposals::rejection_fee() - } - - /// Initial balance of Proposer 1. - fn initial_balance() -> u64 { - (min_stake() as f64 * 2.5) as u64 - } - - fn name() -> Vec { - b"Proposal Name".to_vec() - } - - fn description() -> Vec { - b"Proposal Description".to_vec() - } - - fn wasm_code() -> Vec { - b"Proposal Wasm Code".to_vec() - } - - fn _create_default_proposal() -> dispatch::Result { - _create_proposal(None, None, None, None, None) - } - - fn _create_proposal( - origin: Option, - stake: Option, - name: Option>, - description: Option>, - wasm_code: Option>, - ) -> dispatch::Result { - Proposals::create_proposal( - Origin::signed(origin.unwrap_or(PROPOSER1)), - stake.unwrap_or(min_stake()), - name.unwrap_or(self::name()), - description.unwrap_or(self::description()), - wasm_code.unwrap_or(self::wasm_code()), - ) - } - - fn get_runtime_code() -> Option> { - storage::unhashed::get_raw(well_known_keys::CODE) - } - - macro_rules! assert_runtime_code_empty { - () => { - assert_eq!(get_runtime_code(), Some(vec![])) - }; - } - - macro_rules! assert_runtime_code { - ($code:expr) => { - assert_eq!(get_runtime_code(), Some($code)) - }; - } - - #[test] - fn check_default_values() { - new_test_ext().execute_with(|| { - assert_eq!(Proposals::approval_quorum(), DEFAULT_APPROVAL_QUORUM); - assert_eq!( - Proposals::min_stake(), - BalanceOf::::from(DEFAULT_MIN_STAKE) - ); - assert_eq!( - Proposals::cancellation_fee(), - BalanceOf::::from(DEFAULT_CANCELLATION_FEE) - ); - assert_eq!( - Proposals::rejection_fee(), - BalanceOf::::from(DEFAULT_REJECTION_FEE) - ); - assert_eq!(Proposals::name_max_len(), DEFAULT_NAME_MAX_LEN); - assert_eq!( - Proposals::description_max_len(), - DEFAULT_DESCRIPTION_MAX_LEN - ); - assert_eq!(Proposals::wasm_code_max_len(), DEFAULT_WASM_CODE_MAX_LEN); - assert_eq!(Proposals::proposal_count(), 0); - assert!(Proposals::active_proposal_ids().is_empty()); - }); - } - - #[test] - fn member_create_proposal() { - new_test_ext().execute_with(|| { - let _ = Balances::deposit_creating(&PROPOSER1, initial_balance()); - - assert_ok!(_create_default_proposal()); - assert_eq!(Proposals::active_proposal_ids().len(), 1); - assert_eq!(Proposals::active_proposal_ids()[0], 1); - - let wasm_hash = BlakeTwo256::hash(&wasm_code()); - let expected_proposal = RuntimeUpgradeProposal { - id: 1, - proposer: PROPOSER1, - stake: min_stake(), - name: name(), - description: description(), - wasm_hash, - proposed_at: 1, - status: Active, - }; - assert_eq!(Proposals::proposals(1), expected_proposal); - - // Check that stake amount has been locked on proposer's balance: - assert_eq!( - Balances::free_balance(PROPOSER1), - initial_balance() - min_stake() - ); - assert_eq!(Balances::reserved_balance(PROPOSER1), min_stake()); - - // TODO expect event ProposalCreated(AccountId, u32) - }); - } - - #[test] - fn not_member_cannot_create_proposal() { - new_test_ext().execute_with(|| { - // In this test a proposer has an empty balance - // thus he is not considered as a member. - assert_eq!( - _create_default_proposal(), - Err(MSG_ONLY_MEMBERS_CAN_PROPOSE) - ); - }); - } - - #[test] - fn cannot_create_proposal_with_small_stake() { - new_test_ext().execute_with(|| { - let _ = Balances::deposit_creating(&PROPOSER1, initial_balance()); - - assert_eq!( - _create_proposal(None, Some(min_stake() - 1), None, None, None), - Err(MSG_STAKE_IS_TOO_LOW) - ); - - // Check that balances remain unchanged afer a failed attempt to create a proposal: - assert_eq!(Balances::free_balance(PROPOSER1), initial_balance()); - assert_eq!(Balances::reserved_balance(PROPOSER1), 0); - }); - } - - #[test] - fn cannot_create_proposal_when_stake_is_greater_than_balance() { - new_test_ext().execute_with(|| { - let _ = Balances::deposit_creating(&PROPOSER1, initial_balance()); - - assert_eq!( - _create_proposal(None, Some(initial_balance() + 1), None, None, None), - Err(MSG_STAKE_IS_GREATER_THAN_BALANCE) - ); - - // Check that balances remain unchanged afer a failed attempt to create a proposal: - assert_eq!(Balances::free_balance(PROPOSER1), initial_balance()); - assert_eq!(Balances::reserved_balance(PROPOSER1), 0); - }); - } - - #[test] - fn cannot_create_proposal_with_empty_values() { - new_test_ext().execute_with(|| { - let _ = Balances::deposit_creating(&PROPOSER1, initial_balance()); - - // Empty name: - assert_eq!( - _create_proposal(None, None, Some(vec![]), None, None), - Err(MSG_EMPTY_NAME_PROVIDED) - ); - - // Empty description: - assert_eq!( - _create_proposal(None, None, None, Some(vec![]), None), - Err(MSG_EMPTY_DESCRIPTION_PROVIDED) - ); - - // Empty WASM code: - assert_eq!( - _create_proposal(None, None, None, None, Some(vec![])), - Err(MSG_EMPTY_WASM_CODE_PROVIDED) - ); - }); - } - - #[test] - fn cannot_create_proposal_with_too_long_values() { - new_test_ext().execute_with(|| { - let _ = Balances::deposit_creating(&PROPOSER1, initial_balance()); - - // Too long name: - assert_eq!( - _create_proposal(None, None, Some(too_long_name()), None, None), - Err(MSG_TOO_LONG_NAME) - ); - - // Too long description: - assert_eq!( - _create_proposal(None, None, None, Some(too_long_description()), None), - Err(MSG_TOO_LONG_DESCRIPTION) - ); - - // Too long WASM code: - assert_eq!( - _create_proposal(None, None, None, None, Some(too_long_wasm_code())), - Err(MSG_TOO_LONG_WASM_CODE) - ); - }); - } - - fn too_long_name() -> Vec { - vec![65; Proposals::name_max_len() as usize + 1] - } - - fn too_long_description() -> Vec { - vec![65; Proposals::description_max_len() as usize + 1] - } - - fn too_long_wasm_code() -> Vec { - vec![65; Proposals::wasm_code_max_len() as usize + 1] - } - - // ------------------------------------------------------------------- - // Cancellation - - #[test] - fn owner_cancel_proposal() { - new_test_ext().execute_with(|| { - let _ = Balances::deposit_creating(&PROPOSER1, initial_balance()); - - assert_ok!(_create_default_proposal()); - assert_ok!(Proposals::cancel_proposal(Origin::signed(PROPOSER1), 1)); - assert_eq!(Proposals::proposals(1).status, Cancelled); - assert!(Proposals::active_proposal_ids().is_empty()); - - // Check that proposer's balance reduced by cancellation fee and other part of his stake returned to his balance: - assert_eq!( - Balances::free_balance(PROPOSER1), - initial_balance() - cancellation_fee() - ); - assert_eq!(Balances::reserved_balance(PROPOSER1), 0); - - // TODO expect event ProposalCancelled(AccountId, u32) - }); - } - - #[test] - fn owner_cannot_cancel_proposal_if_its_finalized() { - new_test_ext().execute_with(|| { - let _ = Balances::deposit_creating(&PROPOSER1, initial_balance()); - - assert_ok!(_create_default_proposal()); - assert_ok!(Proposals::cancel_proposal(Origin::signed(PROPOSER1), 1)); - assert_eq!(Proposals::proposals(1).status, Cancelled); - - // Get balances updated after cancelling a proposal: - let updated_free_balance = Balances::free_balance(PROPOSER1); - let updated_reserved_balance = Balances::reserved_balance(PROPOSER1); - - assert_eq!( - Proposals::cancel_proposal(Origin::signed(PROPOSER1), 1), - Err(MSG_PROPOSAL_FINALIZED) - ); - - // Check that proposer's balance and locked stake haven't been changed: - assert_eq!(Balances::free_balance(PROPOSER1), updated_free_balance); - assert_eq!( - Balances::reserved_balance(PROPOSER1), - updated_reserved_balance - ); - }); - } - - #[test] - fn not_owner_cannot_cancel_proposal() { - new_test_ext().execute_with(|| { - let _ = Balances::deposit_creating(&PROPOSER1, initial_balance()); - let _ = Balances::deposit_creating(&PROPOSER2, initial_balance()); - assert_ok!(_create_default_proposal()); - assert_eq!( - Proposals::cancel_proposal(Origin::signed(PROPOSER2), 1), - Err(MSG_YOU_DONT_OWN_THIS_PROPOSAL) - ); - }); - } - - // ------------------------------------------------------------------- - // Voting - - #[test] - fn councilor_vote_on_proposal() { - new_test_ext().execute_with(|| { - let _ = Balances::deposit_creating(&PROPOSER1, initial_balance()); - - assert_ok!(_create_default_proposal()); - - assert_ok!(Proposals::vote_on_proposal( - Origin::signed(COUNCILOR1), - 1, - Approve - )); - - // Check that a vote has been saved: - assert_eq!(Proposals::votes_by_proposal(1), vec![(COUNCILOR1, Approve)]); - assert_eq!( - Proposals::vote_by_account_and_proposal((COUNCILOR1, 1)), - Approve - ); - - // TODO expect event Voted(PROPOSER1, 1, Approve) - }); - } - - #[test] - fn councilor_cannot_vote_on_proposal_twice() { - new_test_ext().execute_with(|| { - let _ = Balances::deposit_creating(&PROPOSER1, initial_balance()); - - assert_ok!(_create_default_proposal()); - - assert_ok!(Proposals::vote_on_proposal( - Origin::signed(COUNCILOR1), - 1, - Approve - )); - assert_eq!( - Proposals::vote_on_proposal(Origin::signed(COUNCILOR1), 1, Approve), - Err(MSG_YOU_ALREADY_VOTED) - ); - }); - } - - #[test] - fn autovote_with_approve_when_councilor_creates_proposal() { - new_test_ext().execute_with(|| { - let _ = Balances::deposit_creating(&COUNCILOR1, initial_balance()); - - assert_ok!(_create_proposal(Some(COUNCILOR1), None, None, None, None)); - - // Check that a vote has been sent automatically, - // such as the proposer is a councilor: - assert_eq!(Proposals::votes_by_proposal(1), vec![(COUNCILOR1, Approve)]); - assert_eq!( - Proposals::vote_by_account_and_proposal((COUNCILOR1, 1)), - Approve - ); - }); - } - - #[test] - fn not_councilor_cannot_vote_on_proposal() { - new_test_ext().execute_with(|| { - let _ = Balances::deposit_creating(&PROPOSER1, initial_balance()); - - assert_ok!(_create_default_proposal()); - assert_eq!( - Proposals::vote_on_proposal(Origin::signed(NOT_COUNCILOR), 1, Approve), - Err(MSG_ONLY_COUNCILORS_CAN_VOTE) - ); - }); - } - - #[test] - fn councilor_cannot_vote_on_proposal_if_it_has_been_cancelled() { - new_test_ext().execute_with(|| { - let _ = Balances::deposit_creating(&PROPOSER1, initial_balance()); - - assert_ok!(_create_default_proposal()); - assert_ok!(Proposals::cancel_proposal(Origin::signed(PROPOSER1), 1)); - assert_eq!( - Proposals::vote_on_proposal(Origin::signed(COUNCILOR1), 1, Approve), - Err(MSG_PROPOSAL_FINALIZED) - ); - }); - } - - #[test] - fn councilor_cannot_vote_on_proposal_if_tally_has_been_finalized() { - new_test_ext().execute_with(|| { - let _ = Balances::deposit_creating(&PROPOSER1, initial_balance()); - - assert_ok!(_create_default_proposal()); - - // All councilors vote with 'Approve' on proposal: - let mut expected_votes: Vec<(u64, VoteKind)> = vec![]; - for &councilor in ALL_COUNCILORS.iter() { - expected_votes.push((councilor, Approve)); - assert_ok!(Proposals::vote_on_proposal( - Origin::signed(councilor), - 1, - Approve - )); - assert_eq!( - Proposals::vote_by_account_and_proposal((councilor, 1)), - Approve - ); - } - assert_eq!(Proposals::votes_by_proposal(1), expected_votes); - - System::set_block_number(2); - let _ = Proposals::end_block(2); - - assert!(Proposals::active_proposal_ids().is_empty()); - assert_eq!(Proposals::proposals(1).status, Approved); - - // Try to vote on finalized proposal: - assert_eq!( - Proposals::vote_on_proposal(Origin::signed(COUNCILOR1), 1, Reject), - Err(MSG_PROPOSAL_FINALIZED) - ); - }); - } - - // ------------------------------------------------------------------- - // Tally + Outcome: - - #[test] - fn approve_proposal_when_all_councilors_approved_it() { - new_test_ext().execute_with(|| { - let _ = Balances::deposit_creating(&PROPOSER1, initial_balance()); - - assert_ok!(_create_default_proposal()); - - // All councilors approved: - let mut expected_votes: Vec<(u64, VoteKind)> = vec![]; - for &councilor in ALL_COUNCILORS.iter() { - expected_votes.push((councilor, Approve)); - assert_ok!(Proposals::vote_on_proposal( - Origin::signed(councilor), - 1, - Approve - )); - assert_eq!( - Proposals::vote_by_account_and_proposal((councilor, 1)), - Approve - ); - } - assert_eq!(Proposals::votes_by_proposal(1), expected_votes); - - assert_runtime_code_empty!(); - - System::set_block_number(2); - let _ = Proposals::end_block(2); - - // Check that runtime code has been updated after proposal approved. - assert_runtime_code!(wasm_code()); - - assert!(Proposals::active_proposal_ids().is_empty()); - assert_eq!(Proposals::proposals(1).status, Approved); - assert_eq!( - Proposals::tally_results(1), - TallyResult { - proposal_id: 1, - abstentions: 0, - approvals: ALL_COUNCILORS.len() as u32, - rejections: 0, - slashes: 0, - status: Approved, - finalized_at: 2 - } - ); - - // Check that proposer's stake has been added back to his balance: - assert_eq!(Balances::free_balance(PROPOSER1), initial_balance()); - assert_eq!(Balances::reserved_balance(PROPOSER1), 0); - - // TODO expect event ProposalStatusUpdated(1, Approved) - }); - } - - #[test] - fn approve_proposal_when_all_councilors_voted_and_only_quorum_approved() { - new_test_ext().execute_with(|| { - let _ = Balances::deposit_creating(&PROPOSER1, initial_balance()); - - assert_ok!(_create_default_proposal()); - - // Only a quorum of councilors approved, others rejected: - let councilors = Proposals::councilors_count(); - let approvals = Proposals::approval_quorum_seats(); - let rejections = councilors - approvals; - for i in 0..councilors as usize { - let vote = if (i as u32) < approvals { - Approve - } else { - Reject - }; - assert_ok!(Proposals::vote_on_proposal( - Origin::signed(ALL_COUNCILORS[i]), - 1, - vote - )); - } - assert_eq!(Proposals::votes_by_proposal(1).len() as u32, councilors); - - assert_runtime_code_empty!(); - - System::set_block_number(2); - let _ = Proposals::end_block(2); - - // Check that runtime code has been updated after proposal approved. - assert_runtime_code!(wasm_code()); - - assert!(Proposals::active_proposal_ids().is_empty()); - assert_eq!(Proposals::proposals(1).status, Approved); - assert_eq!( - Proposals::tally_results(1), - TallyResult { - proposal_id: 1, - abstentions: 0, - approvals: approvals, - rejections: rejections, - slashes: 0, - status: Approved, - finalized_at: 2 - } - ); - - // Check that proposer's stake has been added back to his balance: - assert_eq!(Balances::free_balance(PROPOSER1), initial_balance()); - assert_eq!(Balances::reserved_balance(PROPOSER1), 0); - - // TODO expect event ProposalStatusUpdated(1, Approved) - }); - } - - #[test] - fn approve_proposal_when_voting_period_expired_if_only_quorum_voted() { - new_test_ext().execute_with(|| { - let _ = Balances::deposit_creating(&PROPOSER1, initial_balance()); - - assert_ok!(_create_default_proposal()); - - // Only quorum of councilors approved, other councilors didn't vote: - let approvals = Proposals::approval_quorum_seats(); - for i in 0..approvals as usize { - let vote = if (i as u32) < approvals { - Approve - } else { - Slash - }; - assert_ok!(Proposals::vote_on_proposal( - Origin::signed(ALL_COUNCILORS[i]), - 1, - vote - )); - } - assert_eq!(Proposals::votes_by_proposal(1).len() as u32, approvals); - - assert_runtime_code_empty!(); - - let expiration_block = System::block_number() + Proposals::voting_period(); - System::set_block_number(2); - let _ = Proposals::end_block(2); - - // Check that runtime code has NOT been updated yet, - // because not all councilors voted and voting period is not expired yet. - assert_runtime_code_empty!(); - - System::set_block_number(expiration_block); - let _ = Proposals::end_block(expiration_block); - - // Check that runtime code has been updated after proposal approved. - assert_runtime_code!(wasm_code()); - - assert!(Proposals::active_proposal_ids().is_empty()); - assert_eq!(Proposals::proposals(1).status, Approved); - assert_eq!( - Proposals::tally_results(1), - TallyResult { - proposal_id: 1, - abstentions: 0, - approvals: approvals, - rejections: 0, - slashes: 0, - status: Approved, - finalized_at: expiration_block - } - ); - - // Check that proposer's stake has been added back to his balance: - assert_eq!(Balances::free_balance(PROPOSER1), initial_balance()); - assert_eq!(Balances::reserved_balance(PROPOSER1), 0); - - // TODO expect event ProposalStatusUpdated(1, Approved) - }); - } - - #[test] - fn reject_proposal_when_all_councilors_voted_and_quorum_not_reached() { - new_test_ext().execute_with(|| { - let _ = Balances::deposit_creating(&PROPOSER1, initial_balance()); - - assert_ok!(_create_default_proposal()); - - // Less than a quorum of councilors approved, while others abstained: - let councilors = Proposals::councilors_count(); - let approvals = Proposals::approval_quorum_seats() - 1; - let abstentions = councilors - approvals; - for i in 0..councilors as usize { - let vote = if (i as u32) < approvals { - Approve - } else { - Abstain - }; - assert_ok!(Proposals::vote_on_proposal( - Origin::signed(ALL_COUNCILORS[i]), - 1, - vote - )); - } - assert_eq!(Proposals::votes_by_proposal(1).len() as u32, councilors); - - assert_runtime_code_empty!(); - - System::set_block_number(2); - let _ = Proposals::end_block(2); - - // Check that runtime code has NOT been updated after proposal slashed. - assert_runtime_code_empty!(); - - assert!(Proposals::active_proposal_ids().is_empty()); - assert_eq!(Proposals::proposals(1).status, Rejected); - assert_eq!( - Proposals::tally_results(1), - TallyResult { - proposal_id: 1, - abstentions: abstentions, - approvals: approvals, - rejections: 0, - slashes: 0, - status: Rejected, - finalized_at: 2 - } - ); - - // Check that proposer's balance reduced by burnt stake: - assert_eq!( - Balances::free_balance(PROPOSER1), - initial_balance() - rejection_fee() - ); - assert_eq!(Balances::reserved_balance(PROPOSER1), 0); - - // TODO expect event ProposalStatusUpdated(1, Rejected) - }); - } - - #[test] - fn reject_proposal_when_all_councilors_rejected_it() { - new_test_ext().execute_with(|| { - let _ = Balances::deposit_creating(&PROPOSER1, initial_balance()); - - assert_ok!(_create_default_proposal()); - - // All councilors rejected: - let mut expected_votes: Vec<(u64, VoteKind)> = vec![]; - for &councilor in ALL_COUNCILORS.iter() { - expected_votes.push((councilor, Reject)); - assert_ok!(Proposals::vote_on_proposal( - Origin::signed(councilor), - 1, - Reject - )); - assert_eq!( - Proposals::vote_by_account_and_proposal((councilor, 1)), - Reject - ); - } - assert_eq!(Proposals::votes_by_proposal(1), expected_votes); - - assert_runtime_code_empty!(); - - System::set_block_number(2); - let _ = Proposals::end_block(2); - - // Check that runtime code has NOT been updated after proposal rejected. - assert_runtime_code_empty!(); - - assert!(Proposals::active_proposal_ids().is_empty()); - assert_eq!(Proposals::proposals(1).status, Rejected); - assert_eq!( - Proposals::tally_results(1), - TallyResult { - proposal_id: 1, - abstentions: 0, - approvals: 0, - rejections: ALL_COUNCILORS.len() as u32, - slashes: 0, - status: Rejected, - finalized_at: 2 - } - ); - - // Check that proposer's balance reduced by burnt stake: - assert_eq!( - Balances::free_balance(PROPOSER1), - initial_balance() - rejection_fee() - ); - assert_eq!(Balances::reserved_balance(PROPOSER1), 0); - - // TODO expect event ProposalStatusUpdated(1, Rejected) - }); - } - - #[test] - fn slash_proposal_when_all_councilors_slashed_it() { - new_test_ext().execute_with(|| { - let _ = Balances::deposit_creating(&PROPOSER1, initial_balance()); - - assert_ok!(_create_default_proposal()); - - // All councilors slashed: - let mut expected_votes: Vec<(u64, VoteKind)> = vec![]; - for &councilor in ALL_COUNCILORS.iter() { - expected_votes.push((councilor, Slash)); - assert_ok!(Proposals::vote_on_proposal( - Origin::signed(councilor), - 1, - Slash - )); - assert_eq!( - Proposals::vote_by_account_and_proposal((councilor, 1)), - Slash - ); - } - assert_eq!(Proposals::votes_by_proposal(1), expected_votes); - - assert_runtime_code_empty!(); - - System::set_block_number(2); - let _ = Proposals::end_block(2); - - // Check that runtime code has NOT been updated after proposal slashed. - assert_runtime_code_empty!(); - - assert!(Proposals::active_proposal_ids().is_empty()); - assert_eq!(Proposals::proposals(1).status, Slashed); - assert_eq!( - Proposals::tally_results(1), - TallyResult { - proposal_id: 1, - abstentions: 0, - approvals: 0, - rejections: 0, - slashes: ALL_COUNCILORS.len() as u32, - status: Slashed, - finalized_at: 2 - } - ); - - // Check that proposer's balance reduced by burnt stake: - assert_eq!( - Balances::free_balance(PROPOSER1), - initial_balance() - min_stake() - ); - assert_eq!(Balances::reserved_balance(PROPOSER1), 0); - - // TODO expect event ProposalStatusUpdated(1, Slashed) - // TODO fix: event log assertion doesn't work and return empty event in every record - // assert_eq!(*System::events().last().unwrap(), - // EventRecord { - // phase: Phase::ApplyExtrinsic(0), - // event: RawEvent::ProposalStatusUpdated(1, Slashed), - // } - // ); - }); - } - - // In this case a proposal will be marked as 'Expired' - // and it will be processed in the same way as if it has been rejected. - #[test] - fn expire_proposal_when_not_all_councilors_voted_and_quorum_not_reached() { - new_test_ext().execute_with(|| { - let _ = Balances::deposit_creating(&PROPOSER1, initial_balance()); - - assert_ok!(_create_default_proposal()); - - // Less than a quorum of councilors approved: - let approvals = Proposals::approval_quorum_seats() - 1; - for i in 0..approvals as usize { - let vote = if (i as u32) < approvals { - Approve - } else { - Slash - }; - assert_ok!(Proposals::vote_on_proposal( - Origin::signed(ALL_COUNCILORS[i]), - 1, - vote - )); - } - assert_eq!(Proposals::votes_by_proposal(1).len() as u32, approvals); - - assert_runtime_code_empty!(); - - let expiration_block = System::block_number() + Proposals::voting_period(); - System::set_block_number(expiration_block); - let _ = Proposals::end_block(expiration_block); - - // Check that runtime code has NOT been updated after proposal slashed. - assert_runtime_code_empty!(); - - assert!(Proposals::active_proposal_ids().is_empty()); - assert_eq!(Proposals::proposals(1).status, Expired); - assert_eq!( - Proposals::tally_results(1), - TallyResult { - proposal_id: 1, - abstentions: 0, - approvals: approvals, - rejections: 0, - slashes: 0, - status: Expired, - finalized_at: expiration_block - } - ); - - // Check that proposer's balance reduced by burnt stake: - assert_eq!( - Balances::free_balance(PROPOSER1), - initial_balance() - rejection_fee() - ); - assert_eq!(Balances::reserved_balance(PROPOSER1), 0); - - // TODO expect event ProposalStatusUpdated(1, Rejected) - }); - } -} diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 6a5e975d02..9f55ac2220 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -399,7 +399,7 @@ impl finality_tracker::Trait for Runtime { } pub use forum; -use governance::{council, election, proposals}; +use governance::{council, election}; use membership::members; use storage::{data_directory, data_object_storage_registry, data_object_type_registry}; pub use versioned_store; @@ -660,10 +660,6 @@ impl common::currency::GovernanceCurrency for Runtime { type Currency = balances::Module; } -impl governance::proposals::Trait for Runtime { - type Event = Event; -} - impl governance::election::Trait for Runtime { type Event = Event; type CouncilElected = (Council,); @@ -828,7 +824,6 @@ construct_runtime!( RandomnessCollectiveFlip: randomness_collective_flip::{Module, Call, Storage}, Sudo: sudo, // Joystream - Proposals: proposals::{Module, Call, Storage, Event, Config}, CouncilElection: election::{Module, Call, Storage, Event, Config}, Council: council::{Module, Call, Storage, Event, Config}, Memo: memo::{Module, Call, Storage, Event}, From 9b980fb79303808dc56237affc2c2d6b068ea2be Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 17 Mar 2020 16:36:01 +0300 Subject: [PATCH 093/286] Add proposals modules to the runtime --- runtime/Cargo.toml | 18 ++++++++++++++ runtime/src/lib.rs | 60 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+) diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 89bcbe3708..d601e787d2 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -353,3 +353,21 @@ default_features = false package = 'substrate-storage-module' path = '../runtime-modules/storage' version = '1.0.0' + +[dependencies.proposals_engine] +default_features = false +package = 'substrate-proposals-engine-module' +path = '../runtime-modules/proposals/engine' +version = '2.0.0' + +[dependencies.proposals_discussion] +default_features = false +package = 'substrate-proposals-discussion-module' +path = '../runtime-modules/proposals/discussion' +version = '2.0.0' + +[dependencies.proposals_codex] +default_features = false +package = 'substrate-proposals-codex-module' +path = '../runtime-modules/proposals/codex' +version = '2.0.0' \ No newline at end of file diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 9f55ac2220..8e73c5eed4 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -54,6 +54,8 @@ pub use srml_support::{ pub use staking::StakerStatus; pub use timestamp::Call as TimestampCall; +use membership::origin_validator::MembershipOriginValidator; + /// An index to a block. pub type BlockNumber = u32; @@ -800,6 +802,59 @@ impl discovery::Trait for Runtime { type Roles = LookupRoles; } +parameter_types! { + pub const ProposalCancellationFee: u64 = 5; + pub const ProposalRejectionFee: u64 = 3; + pub const ProposalTitleMaxLength: u32 = 100; + pub const ProposalDescriptionMaxLength: u32 = 10000; + pub const ProposalMaxActiveProposalLimit: u32 = 100; +} + +impl proposals_engine::Trait for Runtime { + type Event = Event; + type ProposerOriginValidator = MembershipOriginValidator; + type VoterOriginValidator = proposals_engine::CouncilManager; + type TotalVotersCounter = proposals_engine::CouncilManager; + type ProposalCodeDecoder = proposals_codex::ProposalType; + type ProposalId = u32; + type StakeHandlerProvider = proposals_engine::DefaultStakeHandlerProvider; + type CancellationFee = ProposalCancellationFee; + type RejectionFee = ProposalRejectionFee; + type TitleMaxLength = ProposalTitleMaxLength; + type DescriptionMaxLength = ProposalDescriptionMaxLength; + type MaxActiveProposalLimit = ProposalMaxActiveProposalLimit; +} + +parameter_types! { + pub const ProposalMaxPostEditionNumber: u32 = 5; + pub const ProposalMaxThreadInARowNumber: u32 = 3; + pub const ProposalThreadTitleLengthLimit: u32 = 200; + pub const ProposalPostLengthLimit: u32 = 2000; +} + +impl proposals_discussion::Trait for Runtime { + type Event = Event; + type ThreadAuthorOriginValidator = MembershipOriginValidator; + type PostAuthorOriginValidator = MembershipOriginValidator; + type ThreadId = u32; + type PostId = u32; + type MaxPostEditionNumber = ProposalMaxPostEditionNumber; + type ThreadTitleLengthLimit = ProposalThreadTitleLengthLimit; + type PostLengthLimit = ProposalPostLengthLimit; + type MaxThreadInARowNumber = ProposalMaxThreadInARowNumber; +} + +parameter_types! { + pub const TextProposalMaxLength: u32 = 60_000; + pub const RuntimeUpgradeWasmProposalMaxLength: u32 = 2_000_000; +} + + +impl proposals_codex::Trait for Runtime { + type TextProposalMaxLength = TextProposalMaxLength; + type RuntimeUpgradeWasmProposalMaxLength = RuntimeUpgradeWasmProposalMaxLength; +} + construct_runtime!( pub enum Runtime where Block = Block, @@ -842,6 +897,11 @@ construct_runtime!( RecurringRewards: recurringrewards::{Module, Call, Storage}, Hiring: hiring::{Module, Call, Storage}, ContentWorkingGroup: content_wg::{Module, Call, Storage, Event, Config}, + // --- Proposals + ProposalsEngine: proposals_engine::{Module, Call, Storage, Event}, + ProposalsDiscussion: proposals_discussion::{Module, Call, Storage, Event}, + ProposalsCodex: proposals_codex::{Module, Call, Storage, Error}, + // --- } ); From 5b9fa749834f04fb23e0dd934bfb6e95ba6799ef Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 17 Mar 2020 16:48:29 +0300 Subject: [PATCH 094/286] Fix StakeEventsHandler in the proposals engine --- runtime-modules/proposals/engine/src/types/stakes.rs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/runtime-modules/proposals/engine/src/types/stakes.rs b/runtime-modules/proposals/engine/src/types/stakes.rs index b7a639f246..5741433576 100644 --- a/runtime-modules/proposals/engine/src/types/stakes.rs +++ b/runtime-modules/proposals/engine/src/types/stakes.rs @@ -5,6 +5,7 @@ use rstd::marker::PhantomData; use rstd::rc::Rc; use runtime_primitives::traits::Zero; use srml_support::traits::{Currency, ExistenceRequirement, Imbalance, WithdrawReasons}; +use srml_support::StorageMap; // Mocking dependencies for testing #[cfg(test)] @@ -25,9 +26,13 @@ impl stake::StakingEventsHandler for StakingEventsHandler { _unstaked_amount: BalanceOf, remaining_imbalance: NegativeImbalance, ) -> NegativeImbalance { - >::refund_proposal_stake(*id, remaining_imbalance); + if >::exists(id) { + >::refund_proposal_stake(*id, remaining_imbalance); - >::zero() // all imbalance was consumed + return >::zero() // imbalance was consumed + } + + remaining_imbalance } /// Empty handler for slashing From a326379cc319b87ce5b3e19d157bec188fac9198 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 17 Mar 2020 16:49:17 +0300 Subject: [PATCH 095/286] Integrate proposals StakeEventsHandler - integrate proposals StakeEventsHandler with the ContentWorkingGroupStakingEventHandler --- runtime/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 8e73c5eed4..d9b8a5e5f0 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -582,7 +582,7 @@ parameter_types! { impl stake::Trait for Runtime { type Currency = ::Currency; type StakePoolId = StakePoolId; - type StakingEventsHandler = ContentWorkingGroupStakingEventHandler; + type StakingEventsHandler = (ContentWorkingGroupStakingEventHandler, proposals_engine::StakingEventsHandler); type StakeId = u64; type SlashId = u64; } From fae4e69f56b5327db714da3cd18ea18fe09b4d84 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 17 Mar 2020 17:40:08 +0300 Subject: [PATCH 096/286] Add proposals extrinsics to the proposals codex - add proposals extrinsics to the proposals codex to start conversion from ProposalTypes to proposal extrinsics execution model --- runtime-modules/proposals/codex/src/lib.rs | 57 ++++++++++++++++++- .../proposals/engine/src/types/stakes.rs | 2 +- runtime/src/lib.rs | 6 +- 3 files changed, 60 insertions(+), 5 deletions(-) diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index aefe86b2fa..ce4a6a4c97 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -19,9 +19,10 @@ use codec::Encode; use rstd::clone::Clone; use rstd::marker::PhantomData; use rstd::prelude::*; +use rstd::str::from_utf8; use rstd::vec::Vec; -use srml_support::{decl_error, decl_module, decl_storage, ensure}; -use system::RawOrigin; +use srml_support::{decl_error, decl_module, decl_storage, ensure, print}; +use system::{ensure_root, RawOrigin}; use proposal_engine::*; pub use proposal_types::{ProposalType, RuntimeUpgradeProposalExecutable, TextProposalExecutable}; @@ -61,6 +62,23 @@ decl_error! { /// Provided WASM code for the runtime upgrade proposal is empty RuntimeProposalIsEmpty, + + /// Require root origin in extrinsics + RequireRootOrigin, + } +} + +impl From for Error { + fn from(error: system::Error) -> Self { + match error { + system::Error::Other(msg) => Error::Other(msg), + system::Error::CannotLookup => Error::Other("CannotLookup"), + system::Error::BadSignature => Error::Other("BadSignature"), + system::Error::BlockFull => Error::Other("BlockFull"), + system::Error::RequireSignedOrigin => Error::Other("RequireSignedOrigin"), + system::Error::RequireRootOrigin => Error::RequireRootOrigin, + system::Error::RequireNoOrigin => Error::Other("RequireNoOrigin"), + } } } @@ -167,6 +185,41 @@ decl_module! { >::insert(proposal_id, discussion_thread_id); } + + /// Text proposal extrinsic. Should be used as callable object to pass to the engine module. + fn text_proposal( + origin, + title: Vec, + _description: Vec, + _text: Vec, + ) { + ensure_root(origin)?; + print("Text proposal: "); + let title_string_result = from_utf8(title.as_slice()); + if let Ok(title_string) = title_string_result{ + print(title_string); + } + } + + /// Runtime upgrade proposal extrinsic. + /// Should be used as callable object to pass to the engine module. + fn runtime_upgrade_proposal( + origin, + title: Vec, + _description: Vec, + wasm: Vec, + ) { + let (cloned_origin1, cloned_origin2) = Self::double_origin(origin); + ensure_root(cloned_origin1)?; + + print("Runtime upgrade proposal: "); + let title_string_result = from_utf8(title.as_slice()); + if let Ok(title_string) = title_string_result{ + print(title_string); + } + + >::set_code(cloned_origin2, wasm)?; + } } } diff --git a/runtime-modules/proposals/engine/src/types/stakes.rs b/runtime-modules/proposals/engine/src/types/stakes.rs index 5741433576..1c476c7426 100644 --- a/runtime-modules/proposals/engine/src/types/stakes.rs +++ b/runtime-modules/proposals/engine/src/types/stakes.rs @@ -29,7 +29,7 @@ impl stake::StakingEventsHandler for StakingEventsHandler { if >::exists(id) { >::refund_proposal_stake(*id, remaining_imbalance); - return >::zero() // imbalance was consumed + return >::zero(); // imbalance was consumed } remaining_imbalance diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index d9b8a5e5f0..5060a6eebe 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -582,7 +582,10 @@ parameter_types! { impl stake::Trait for Runtime { type Currency = ::Currency; type StakePoolId = StakePoolId; - type StakingEventsHandler = (ContentWorkingGroupStakingEventHandler, proposals_engine::StakingEventsHandler); + type StakingEventsHandler = ( + ContentWorkingGroupStakingEventHandler, + proposals_engine::StakingEventsHandler, + ); type StakeId = u64; type SlashId = u64; } @@ -849,7 +852,6 @@ parameter_types! { pub const RuntimeUpgradeWasmProposalMaxLength: u32 = 2_000_000; } - impl proposals_codex::Trait for Runtime { type TextProposalMaxLength = TextProposalMaxLength; type RuntimeUpgradeWasmProposalMaxLength = RuntimeUpgradeWasmProposalMaxLength; From e5da8ee9924fb56b93ef2aff62607460361433a3 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 17 Mar 2020 18:19:52 +0300 Subject: [PATCH 097/286] Migrate to the extrinsic execution model --- runtime-modules/proposals/codex/Cargo.toml | 1 + runtime-modules/proposals/codex/src/lib.rs | 25 ++----- .../proposals/codex/src/proposal_types/mod.rs | 72 +++++++------------ .../codex/src/proposal_types/parameters.rs | 27 ------- .../src/proposal_types/runtime_upgrade.rs | 39 ---------- .../codex/src/proposal_types/text_proposal.rs | 38 ---------- .../proposals/discussion/Cargo.toml | 2 + runtime-modules/proposals/engine/Cargo.toml | 18 +++-- runtime-modules/proposals/engine/src/lib.rs | 29 ++++---- .../proposals/engine/src/types/mod.rs | 3 - .../proposals/engine/src/types/stakes.rs | 2 +- runtime/src/lib.rs | 7 +- 12 files changed, 68 insertions(+), 195 deletions(-) delete mode 100644 runtime-modules/proposals/codex/src/proposal_types/parameters.rs delete mode 100644 runtime-modules/proposals/codex/src/proposal_types/runtime_upgrade.rs delete mode 100644 runtime-modules/proposals/codex/src/proposal_types/text_proposal.rs diff --git a/runtime-modules/proposals/codex/Cargo.toml b/runtime-modules/proposals/codex/Cargo.toml index 1abb1d1048..37e17ecda6 100644 --- a/runtime-modules/proposals/codex/Cargo.toml +++ b/runtime-modules/proposals/codex/Cargo.toml @@ -20,6 +20,7 @@ std = [ 'proposal_discussion/std', 'stake/std', 'balances/std', + 'membership/std', ] diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index ce4a6a4c97..fd9ca71d8f 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -17,7 +17,6 @@ mod tests; use codec::Encode; use rstd::clone::Clone; -use rstd::marker::PhantomData; use rstd::prelude::*; use rstd::str::from_utf8; use rstd::vec::Vec; @@ -25,7 +24,6 @@ use srml_support::{decl_error, decl_module, decl_storage, ensure, print}; use system::{ensure_root, RawOrigin}; use proposal_engine::*; -pub use proposal_types::{ProposalType, RuntimeUpgradeProposalExecutable, TextProposalExecutable}; /// 'Proposals codex' substrate module Trait pub trait Trait: @@ -112,12 +110,7 @@ decl_module! { ensure!(text.len() as u32 <= T::TextProposalMaxLength::get(), Error::TextProposalSizeExceeded); - let text_proposal = TextProposalExecutable{ - title: title.clone(), - description: description.clone(), - text, - }; - let proposal_code = text_proposal.encode(); + let proposal_code = >::text_proposal(title.clone(), description.clone(), text); let (cloned_origin1, cloned_origin2) = Self::double_origin(origin); @@ -134,8 +127,7 @@ decl_module! { title, description, stake_balance, - text_proposal.proposal_type(), - proposal_code, + proposal_code.encode(), )?; >::insert(proposal_id, discussion_thread_id); @@ -156,13 +148,7 @@ decl_module! { ensure!(wasm.len() as u32 <= T::RuntimeUpgradeWasmProposalMaxLength::get(), Error::RuntimeProposalSizeExceeded); - let proposal = RuntimeUpgradeProposalExecutable{ - title: title.clone(), - description: description.clone(), - wasm, - marker : PhantomData:: - }; - let proposal_code = proposal.encode(); + let proposal_code = >::text_proposal(title.clone(), description.clone(), wasm); let (cloned_origin1, cloned_origin2) = Self::double_origin(origin); @@ -179,13 +165,14 @@ decl_module! { title, description, stake_balance, - proposal.proposal_type(), - proposal_code, + proposal_code.encode(), )?; >::insert(proposal_id, discussion_thread_id); } +// *************** Extrinsic to execute + /// Text proposal extrinsic. Should be used as callable object to pass to the engine module. fn text_proposal( origin, diff --git a/runtime-modules/proposals/codex/src/proposal_types/mod.rs b/runtime-modules/proposals/codex/src/proposal_types/mod.rs index b089fcb9b7..d58cb7b037 100644 --- a/runtime-modules/proposals/codex/src/proposal_types/mod.rs +++ b/runtime-modules/proposals/codex/src/proposal_types/mod.rs @@ -1,53 +1,31 @@ -use codec::Decode; -use num_enum::{IntoPrimitive, TryFromPrimitive}; -use rstd::convert::TryFrom; -use rstd::prelude::*; +pub(crate) mod parameters { + use crate::{BalanceOf, ProposalParameters}; -use crate::{ProposalCodeDecoder, ProposalExecutable}; - -pub mod parameters; -mod runtime_upgrade; -mod text_proposal; - -pub use runtime_upgrade::RuntimeUpgradeProposalExecutable; -pub use text_proposal::TextProposalExecutable; - -/// Defines allowed proposals types. Integer value serves as proposal_type_id. -#[derive(Debug, Eq, PartialEq, TryFromPrimitive, IntoPrimitive)] -#[repr(u32)] -pub enum ProposalType { - /// Text(signal) proposal type - Text = 1, - - /// Runtime upgrade proposal type - RuntimeUpgrade = 2, -} - -impl ProposalType { - fn compose_executable( - &self, - proposal_data: Vec, - ) -> Result, &'static str> { - match self { - ProposalType::Text => TextProposalExecutable::decode(&mut &proposal_data[..]) - .map_err(|err| err.what()) - .map(|obj| Box::new(obj) as Box), - ProposalType::RuntimeUpgrade => { - >::decode(&mut &proposal_data[..]) - .map_err(|err| err.what()) - .map(|obj| Box::new(obj) as Box) - } + // Proposal parameters for the upgrade runtime proposal + pub(crate) fn upgrade_runtime( + ) -> ProposalParameters> { + ProposalParameters { + voting_period: T::BlockNumber::from(50000u32), + grace_period: T::BlockNumber::from(10000u32), + approval_quorum_percentage: 80, + approval_threshold_percentage: 80, + slashing_quorum_percentage: 80, + slashing_threshold_percentage: 80, + required_stake: Some(>::from(50000u32)), } } -} -impl ProposalCodeDecoder for ProposalType { - fn decode_proposal( - proposal_type: u32, - proposal_code: Vec, - ) -> Result, &'static str> { - Self::try_from(proposal_type) - .map_err(|_| "Unsupported proposal type")? - .compose_executable::(proposal_code) + // Proposal parameters for the text proposal + pub(crate) fn text_proposal( + ) -> ProposalParameters> { + ProposalParameters { + voting_period: T::BlockNumber::from(50000u32), + grace_period: T::BlockNumber::from(10000u32), + approval_quorum_percentage: 40, + approval_threshold_percentage: 51, + slashing_quorum_percentage: 80, + slashing_threshold_percentage: 80, + required_stake: Some(>::from(500u32)), + } } } diff --git a/runtime-modules/proposals/codex/src/proposal_types/parameters.rs b/runtime-modules/proposals/codex/src/proposal_types/parameters.rs deleted file mode 100644 index 5f9db050a3..0000000000 --- a/runtime-modules/proposals/codex/src/proposal_types/parameters.rs +++ /dev/null @@ -1,27 +0,0 @@ -use crate::{BalanceOf, ProposalParameters}; - -// Proposal parameters for the upgrade runtime proposal -pub(crate) fn upgrade_runtime() -> ProposalParameters> -{ - ProposalParameters { - voting_period: T::BlockNumber::from(50000u32), - grace_period: T::BlockNumber::from(10000u32), - approval_quorum_percentage: 80, - approval_threshold_percentage: 80, - slashing_quorum_percentage: 80, - slashing_threshold_percentage: 80, - required_stake: Some(>::from(50000u32)), - } -} -// Proposal parameters for the text proposal -pub(crate) fn text_proposal() -> ProposalParameters> { - ProposalParameters { - voting_period: T::BlockNumber::from(50000u32), - grace_period: T::BlockNumber::from(10000u32), - approval_quorum_percentage: 40, - approval_threshold_percentage: 51, - slashing_quorum_percentage: 80, - slashing_threshold_percentage: 80, - required_stake: Some(>::from(500u32)), - } -} diff --git a/runtime-modules/proposals/codex/src/proposal_types/runtime_upgrade.rs b/runtime-modules/proposals/codex/src/proposal_types/runtime_upgrade.rs deleted file mode 100644 index 107b558d56..0000000000 --- a/runtime-modules/proposals/codex/src/proposal_types/runtime_upgrade.rs +++ /dev/null @@ -1,39 +0,0 @@ -use codec::{Decode, Encode}; -use rstd::marker::PhantomData; -use rstd::prelude::*; - -use runtime_primitives::traits::ModuleDispatchError; -use srml_support::dispatch; - -use crate::{ProposalExecutable, ProposalType}; - -/// Text (signal) proposal executable code wrapper. Prints its content on execution. -#[derive(Encode, Decode, Clone, PartialEq, Eq, Debug, Default)] -pub struct RuntimeUpgradeProposalExecutable { - /// Proposal title - pub title: Vec, - - /// Proposal description - pub description: Vec, - - /// Text proposal main text - pub wasm: Vec, - - /// Marker for the system::Trait. Required to execute runtime upgrade proposal on exact runtime. - pub marker: PhantomData, -} - -impl RuntimeUpgradeProposalExecutable { - /// Converts runtime proposal type to proposal_type_id - pub fn proposal_type(&self) -> u32 { - ProposalType::RuntimeUpgrade.into() - } -} - -impl ProposalExecutable for RuntimeUpgradeProposalExecutable { - fn execute(&self) -> dispatch::Result { - // Update wasm code of node's runtime: - >::set_code(system::RawOrigin::Root.into(), self.wasm.clone()) - .map_err(|err| err.as_str()) - } -} diff --git a/runtime-modules/proposals/codex/src/proposal_types/text_proposal.rs b/runtime-modules/proposals/codex/src/proposal_types/text_proposal.rs deleted file mode 100644 index c663ce2a59..0000000000 --- a/runtime-modules/proposals/codex/src/proposal_types/text_proposal.rs +++ /dev/null @@ -1,38 +0,0 @@ -use codec::{Decode, Encode}; -use rstd::prelude::*; - -use rstd::str::from_utf8; -use srml_support::{dispatch, print}; - -use crate::{ProposalExecutable, ProposalType}; - -/// Text (signal) proposal executable code wrapper. Prints its content on execution. -#[derive(Encode, Decode, Clone, PartialEq, Eq, Debug, Default)] -pub struct TextProposalExecutable { - /// Text proposal title - pub title: Vec, - - /// Text proposal description - pub description: Vec, - - /// Text proposal main text - pub text: Vec, -} - -impl TextProposalExecutable { - /// Converts text proposal type to proposal_type_id - pub fn proposal_type(&self) -> u32 { - ProposalType::Text.into() - } -} - -impl ProposalExecutable for TextProposalExecutable { - fn execute(&self) -> dispatch::Result { - print("Proposal: "); - print(from_utf8(self.title.as_slice()).unwrap()); - print("Description:"); - print(from_utf8(self.description.as_slice()).unwrap()); - - Ok(()) - } -} diff --git a/runtime-modules/proposals/discussion/Cargo.toml b/runtime-modules/proposals/discussion/Cargo.toml index e443fa7229..8220297ce6 100644 --- a/runtime-modules/proposals/discussion/Cargo.toml +++ b/runtime-modules/proposals/discussion/Cargo.toml @@ -16,6 +16,8 @@ std = [ 'system/std', 'timestamp/std', 'serde', + 'membership/std', + 'common/std', ] diff --git a/runtime-modules/proposals/engine/Cargo.toml b/runtime-modules/proposals/engine/Cargo.toml index 2ab26e8fa2..bf5ab3a83a 100644 --- a/runtime-modules/proposals/engine/Cargo.toml +++ b/runtime-modules/proposals/engine/Cargo.toml @@ -12,12 +12,16 @@ std = [ 'rstd/std', 'srml-support/std', 'primitives/std', - 'runtime-primitives/std', 'system/std', 'timestamp/std', 'serde', 'stake/std', 'balances/std', + 'sr-primitives/std', + 'governance/std', + 'membership/std', + 'common/std', + ] @@ -48,12 +52,6 @@ git = 'https://github.com/paritytech/substrate.git' package = 'sr-std' rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' -[dependencies.runtime-primitives] -default_features = false -git = 'https://github.com/paritytech/substrate.git' -package = 'sr-primitives' -rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' - [dependencies.srml-support] default_features = false git = 'https://github.com/paritytech/substrate.git' @@ -78,6 +76,12 @@ default-features = false git = 'https://github.com/paritytech/substrate.git' rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' +[dependencies.sr-primitives] +default_features = false +git = 'https://github.com/paritytech/substrate.git' +package = 'sr-primitives' +rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' + [dependencies.stake] default_features = false package = 'substrate-stake-module' diff --git a/runtime-modules/proposals/engine/src/lib.rs b/runtime-modules/proposals/engine/src/lib.rs index 05332271b3..db9e1c607a 100644 --- a/runtime-modules/proposals/engine/src/lib.rs +++ b/runtime-modules/proposals/engine/src/lib.rs @@ -41,17 +41,19 @@ pub(crate) mod types; #[cfg(test)] mod tests; +use codec::Decode; use rstd::prelude::*; - -use runtime_primitives::traits::Zero; +use sr_primitives::traits::Zero; +use sr_primitives::DispatchError; use srml_support::traits::{Currency, Get}; use srml_support::{ decl_event, decl_module, decl_storage, dispatch, ensure, Parameter, StorageDoubleMap, }; -use system::ensure_root; +use system::{ensure_root, RawOrigin}; use common::origin_validator::ActorOriginValidator; use membership::origin_validator::MemberId; +use srml_support::dispatch::Dispatchable; /// Proposals engine trait. pub trait Trait: @@ -77,9 +79,6 @@ pub trait Trait: /// Provides data for voting. Defines maximum voters count for the proposal. type TotalVotersCounter: VotersParameters; - /// Converts proposal code binary to executable representation - type ProposalCodeDecoder: ProposalCodeDecoder; - /// Proposal Id type type ProposalId: From + Parameter + Default + Copy; @@ -100,6 +99,11 @@ pub trait Trait: /// Defines max simultaneous active proposals number. type MaxActiveProposalLimit: Get; + + /// Proposals executable code. Can be instantiated by external module Call enum members. + type ProposalCode: Parameter + + Dispatchable + + Default; } decl_event!( @@ -262,7 +266,6 @@ impl Module { title: Vec, description: Vec, stake_balance: Option>, - proposal_type: u32, proposal_code: Vec, ) -> Result { let account_id = @@ -306,7 +309,6 @@ impl Module { title, description, proposer_id: proposer_id.clone(), - proposal_type, status: ProposalStatus::Active, voting_results: VotingResults::default(), stake_data, @@ -366,18 +368,19 @@ impl Module { if let ProposalStatus::Finalized(finalized_status) = proposal.status.clone() { let proposal_code = Self::proposal_codes(proposal_id); - let proposal_code_result = - T::ProposalCodeDecoder::decode_proposal(proposal.proposal_type, proposal_code); + let proposal_code_result = T::ProposalCode::decode(&mut &proposal_code[..]); let approved_proposal_status = match proposal_code_result { Ok(proposal_code) => { - if let Err(error) = proposal_code.execute() { - ApprovedProposalStatus::failed_execution(error) + if let Err(error) = proposal_code.dispatch(T::Origin::from(RawOrigin::Root)) { + ApprovedProposalStatus::failed_execution( + error.message.unwrap_or("Dispatch error"), + ) } else { ApprovedProposalStatus::Executed } } - Err(error) => ApprovedProposalStatus::failed_execution(error), + Err(error) => ApprovedProposalStatus::failed_execution(error.what()), }; let proposal_execution_status = diff --git a/runtime-modules/proposals/engine/src/types/mod.rs b/runtime-modules/proposals/engine/src/types/mod.rs index 420bbea49d..d1c1f4a943 100644 --- a/runtime-modules/proposals/engine/src/types/mod.rs +++ b/runtime-modules/proposals/engine/src/types/mod.rs @@ -131,9 +131,6 @@ pub struct StakeData { #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] #[derive(Encode, Decode, Default, Clone, PartialEq, Eq, Debug)] pub struct Proposal { - /// Proposal type id - pub proposal_type: u32, - /// Proposals parameter, characterize different proposal types. pub parameters: ProposalParameters, diff --git a/runtime-modules/proposals/engine/src/types/stakes.rs b/runtime-modules/proposals/engine/src/types/stakes.rs index 1c476c7426..6f0e97902c 100644 --- a/runtime-modules/proposals/engine/src/types/stakes.rs +++ b/runtime-modules/proposals/engine/src/types/stakes.rs @@ -3,7 +3,7 @@ use crate::Trait; use rstd::convert::From; use rstd::marker::PhantomData; use rstd::rc::Rc; -use runtime_primitives::traits::Zero; +use sr_primitives::traits::Zero; use srml_support::traits::{Currency, ExistenceRequirement, Imbalance, WithdrawReasons}; use srml_support::StorageMap; diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 5060a6eebe..003d84a60f 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -818,7 +818,6 @@ impl proposals_engine::Trait for Runtime { type ProposerOriginValidator = MembershipOriginValidator; type VoterOriginValidator = proposals_engine::CouncilManager; type TotalVotersCounter = proposals_engine::CouncilManager; - type ProposalCodeDecoder = proposals_codex::ProposalType; type ProposalId = u32; type StakeHandlerProvider = proposals_engine::DefaultStakeHandlerProvider; type CancellationFee = ProposalCancellationFee; @@ -826,6 +825,12 @@ impl proposals_engine::Trait for Runtime { type TitleMaxLength = ProposalTitleMaxLength; type DescriptionMaxLength = ProposalDescriptionMaxLength; type MaxActiveProposalLimit = ProposalMaxActiveProposalLimit; + type ProposalCode = Call; +} +impl Default for Call { + fn default() -> Self { + panic!("shouldn't call default for Call"); + } } parameter_types! { From 39dafdfb8629aca1992afc3ce4c9da84e9184699 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 17 Mar 2020 20:40:47 +0300 Subject: [PATCH 098/286] Restore tests for the extrinsic execution model - delete custom proposal types - create test extrinsic - change ProposalCode type --- .../proposals/codex/src/tests/mock.rs | 10 +- runtime-modules/proposals/engine/src/lib.rs | 7 +- .../engine/src/tests/mock/balance_manager.rs | 2 +- .../proposals/engine/src/tests/mock/mod.rs | 34 ++++--- .../engine/src/tests/mock/proposals.rs | 94 +++---------------- .../proposals/engine/src/tests/mod.rs | 39 ++++---- 6 files changed, 63 insertions(+), 123 deletions(-) diff --git a/runtime-modules/proposals/codex/src/tests/mock.rs b/runtime-modules/proposals/codex/src/tests/mock.rs index 839daf5127..63f6c129dc 100644 --- a/runtime-modules/proposals/codex/src/tests/mock.rs +++ b/runtime-modules/proposals/codex/src/tests/mock.rs @@ -7,7 +7,7 @@ pub use runtime_primitives::{ testing::{Digest, DigestItem, Header, UintAuthorityId}, traits::{BlakeTwo256, Convert, IdentityLookup, OnFinalize}, weights::Weight, - BuildStorage, Perbill, + BuildStorage, DispatchError, Perbill, }; use proposal_engine::VotersParameters; @@ -93,7 +93,6 @@ impl proposal_engine::Trait for Test { type ProposerOriginValidator = (); type VoterOriginValidator = (); type TotalVotersCounter = MockVotersParameters; - type ProposalCodeDecoder = crate::ProposalType; type ProposalId = u32; type StakeHandlerProvider = proposal_engine::DefaultStakeHandlerProvider; type CancellationFee = CancellationFee; @@ -101,6 +100,13 @@ impl proposal_engine::Trait for Test { type TitleMaxLength = TitleMaxLength; type DescriptionMaxLength = DescriptionMaxLength; type MaxActiveProposalLimit = MaxActiveProposalLimit; + type ProposalCode = crate::Call; +} + +impl Default for crate::Call { + fn default() -> Self { + panic!("shouldn't call default for Call"); + } } impl governance::council::Trait for Test { diff --git a/runtime-modules/proposals/engine/src/lib.rs b/runtime-modules/proposals/engine/src/lib.rs index db9e1c607a..379aeb20f9 100644 --- a/runtime-modules/proposals/engine/src/lib.rs +++ b/runtime-modules/proposals/engine/src/lib.rs @@ -44,7 +44,6 @@ mod tests; use codec::Decode; use rstd::prelude::*; use sr_primitives::traits::Zero; -use sr_primitives::DispatchError; use srml_support::traits::{Currency, Get}; use srml_support::{ decl_event, decl_module, decl_storage, dispatch, ensure, Parameter, StorageDoubleMap, @@ -101,9 +100,7 @@ pub trait Trait: type MaxActiveProposalLimit: Get; /// Proposals executable code. Can be instantiated by external module Call enum members. - type ProposalCode: Parameter - + Dispatchable - + Default; + type ProposalCode: Parameter + Dispatchable + Default; } decl_event!( @@ -374,7 +371,7 @@ impl Module { Ok(proposal_code) => { if let Err(error) = proposal_code.dispatch(T::Origin::from(RawOrigin::Root)) { ApprovedProposalStatus::failed_execution( - error.message.unwrap_or("Dispatch error"), + error.into().message.unwrap_or("Dispatch error"), ) } else { ApprovedProposalStatus::Executed diff --git a/runtime-modules/proposals/engine/src/tests/mock/balance_manager.rs b/runtime-modules/proposals/engine/src/tests/mock/balance_manager.rs index b605a98e51..3116ed4ca1 100644 --- a/runtime-modules/proposals/engine/src/tests/mock/balance_manager.rs +++ b/runtime-modules/proposals/engine/src/tests/mock/balance_manager.rs @@ -1,6 +1,6 @@ #![cfg(test)] -pub use runtime_primitives::traits::Zero; +pub use sr_primitives::traits::Zero; use srml_support::traits::{Currency, Imbalance}; use super::*; diff --git a/runtime-modules/proposals/engine/src/tests/mock/mod.rs b/runtime-modules/proposals/engine/src/tests/mock/mod.rs index 6ebd7691eb..a674f40ddd 100644 --- a/runtime-modules/proposals/engine/src/tests/mock/mod.rs +++ b/runtime-modules/proposals/engine/src/tests/mock/mod.rs @@ -8,17 +8,17 @@ #![cfg(test)] pub use primitives::{Blake2Hasher, H256}; -pub use runtime_primitives::{ +pub use sr_primitives::{ testing::{Digest, DigestItem, Header, UintAuthorityId}, traits::{BlakeTwo256, Convert, IdentityLookup, OnFinalize, Zero}, weights::Weight, - BuildStorage, Perbill, + BuildStorage, DispatchError, Perbill, }; use srml_support::{impl_outer_dispatch, impl_outer_event, impl_outer_origin, parameter_types}; pub use system; mod balance_manager; -mod proposals; +pub(crate) mod proposals; mod stakes; use balance_manager::*; @@ -33,12 +33,6 @@ impl_outer_origin! { pub enum Origin for Test {} } -impl_outer_dispatch! { - pub enum Call for Test where origin: Origin { - proposals::ProposalsEngine, - } -} - mod engine { pub use crate::Event; } @@ -51,6 +45,12 @@ mod council_mod { pub use governance::council::Event; } +// impl_outer_dispatch! { +// pub enum Call for Test where origin: Origin { +// engine::ProposalsEngine, +// } +// } + impl_outer_event! { pub enum TestEvent for Test { balances, @@ -74,10 +74,10 @@ impl balances::Trait for Test { /// What to do if a new account is created. type OnNewAccount = (); - type Event = TestEvent; + type TransferPayment = (); type DustRemoval = (); - type TransferPayment = (); + type Event = TestEvent; type ExistentialDeposit = ExistentialDeposit; type TransferFee = TransferFee; type CreationFee = CreationFee; @@ -92,6 +92,8 @@ impl governance::council::Trait for Test { type CouncilTermEnded = (); } +impl proposals::Trait for Test {} + impl stake::Trait for Test { type Currency = Balances; type StakePoolId = StakePoolId; @@ -122,7 +124,6 @@ impl crate::Trait for Test { type ProposerOriginValidator = (); type VoterOriginValidator = (); type TotalVotersCounter = (); - type ProposalCodeDecoder = ProposalType; type ProposalId = u32; type StakeHandlerProvider = stakes::TestStakeHandlerProvider; type CancellationFee = CancellationFee; @@ -130,6 +131,13 @@ impl crate::Trait for Test { type TitleMaxLength = TitleMaxLength; type DescriptionMaxLength = DescriptionMaxLength; type MaxActiveProposalLimit = MaxActiveProposalLimit; + type ProposalCode = proposals::Call; +} + +impl Default for proposals::Call { + fn default() -> Self { + panic!("shouldn't call default for Call"); + } } impl common::origin_validator::ActorOriginValidator for () { @@ -159,9 +167,9 @@ parameter_types! { impl system::Trait for Test { type Origin = Origin; + type Call = (); type Index = u64; type BlockNumber = u64; - type Call = (); type Hash = H256; type Hashing = BlakeTwo256; type AccountId = u64; diff --git a/runtime-modules/proposals/engine/src/tests/mock/proposals.rs b/runtime-modules/proposals/engine/src/tests/mock/proposals.rs index 4a71933b18..ffcce39b37 100644 --- a/runtime-modules/proposals/engine/src/tests/mock/proposals.rs +++ b/runtime-modules/proposals/engine/src/tests/mock/proposals.rs @@ -1,83 +1,19 @@ -use codec::{Decode, Encode}; -use num_enum::{IntoPrimitive, TryFromPrimitive}; -use rstd::convert::TryFrom; -use rstd::prelude::*; - -use srml_support::dispatch; - -use crate::{ProposalCodeDecoder, ProposalExecutable}; - -use super::*; - -/// Defines allowed proposals types. Integer value serves as proposal_type_id. -#[derive(Debug, Eq, PartialEq, TryFromPrimitive, IntoPrimitive)] -#[repr(u32)] -pub enum ProposalType { - /// Dummy(Text) proposal type - Dummy = 1, - - /// Testing proposal type for faults - Faulty = 10001, -} +//! Contains executable proposal extrinsic mocks -impl ProposalType { - fn compose_executable( - &self, - proposal_data: Vec, - ) -> Result, &'static str> { - match self { - ProposalType::Dummy => DummyExecutable::decode(&mut &proposal_data[..]) - .map_err(|err| err.what()) - .map(|obj| Box::new(obj) as Box), - ProposalType::Faulty => FaultyExecutable::decode(&mut &proposal_data[..]) - .map_err(|err| err.what()) - .map(|obj| Box::new(obj) as Box), +use rstd::prelude::*; +use rstd::vec::Vec; +use sr_primitives::DispatchError; +use srml_support::decl_module; +pub trait Trait: system::Trait {} + +decl_module! { + pub struct Module for enum Call where origin: T::Origin { + /// Working extrinsic test + pub fn dummy_proposal(_origin, _title: Vec, _description: Vec) {} + + /// Broken extrinsic test + pub fn faulty_proposal(_origin, _title: Vec, _description: Vec,) { + Err("ExecutionFailed")? } } } - -impl ProposalCodeDecoder for ProposalType { - fn decode_proposal( - proposal_type: u32, - proposal_code: Vec, - ) -> Result, &'static str> { - Self::try_from(proposal_type) - .map_err(|_| "Unsupported proposal type")? - .compose_executable(proposal_code) - } -} - -/// Testing proposal type -#[derive(Encode, Decode, Clone, PartialEq, Eq, Debug, Default)] -pub struct DummyExecutable { - pub title: Vec, - pub description: Vec, -} - -impl DummyExecutable { - pub fn proposal_type(&self) -> u32 { - ProposalType::Dummy.into() - } -} - -impl ProposalExecutable for DummyExecutable { - fn execute(&self) -> dispatch::Result { - Ok(()) - } -} - -/// Faulty proposal executable code wrapper. Used for failed proposal execution tests. -#[derive(Encode, Decode, Clone, PartialEq, Eq, Debug, Default)] -pub struct FaultyExecutable; -impl ProposalExecutable for FaultyExecutable { - fn execute(&self) -> dispatch::Result { - Err("ExecutionFailed") - } -} - -impl FaultyExecutable { - /// Converts faulty proposal type to proposal_type_id - pub fn proposal_type(&self) -> u32 { - ProposalType::Faulty.into() - } -} diff --git a/runtime-modules/proposals/engine/src/tests/mod.rs b/runtime-modules/proposals/engine/src/tests/mod.rs index abf31e6ff0..2b79a076f3 100644 --- a/runtime-modules/proposals/engine/src/tests/mod.rs +++ b/runtime-modules/proposals/engine/src/tests/mod.rs @@ -5,7 +5,7 @@ use mock::*; use codec::Encode; use rstd::rc::Rc; -use runtime_primitives::traits::{OnFinalize, OnInitialize}; +use sr_primitives::traits::{OnFinalize, OnInitialize}; use srml_support::{dispatch, StorageMap, StorageValue}; use system::RawOrigin; use system::{EventRecord, Phase}; @@ -60,7 +60,6 @@ struct DummyProposalFixture { parameters: ProposalParameters, origin: RawOrigin, proposer_id: u64, - proposal_type: u32, proposal_code: Vec, title: Vec, description: Vec, @@ -69,10 +68,12 @@ struct DummyProposalFixture { impl Default for DummyProposalFixture { fn default() -> Self { - let dummy_proposal = DummyExecutable { - title: b"title".to_vec(), - description: b"description".to_vec(), - }; + let title = b"title".to_vec(); + let description = b"description".to_vec(); + let dummy_proposal = mock::proposals::Call::::dummy_proposal( + title.clone(), + description.clone(), + ); DummyProposalFixture { parameters: ProposalParameters { @@ -86,10 +87,9 @@ impl Default for DummyProposalFixture { }, origin: RawOrigin::Signed(1), proposer_id: 1, - proposal_type: dummy_proposal.proposal_type(), proposal_code: dummy_proposal.encode(), - title: dummy_proposal.title, - description: dummy_proposal.description, + title, + description, stake_balance: None, } } @@ -119,9 +119,8 @@ impl DummyProposalFixture { } } - fn with_proposal_type_and_code(self, proposal_type: u32, proposal_code: Vec) -> Self { + fn with_proposal_code(self, proposal_code: Vec) -> Self { DummyProposalFixture { - proposal_type, proposal_code, ..self } @@ -135,7 +134,6 @@ impl DummyProposalFixture { self.title, self.description, self.stake_balance, - self.proposal_type, self.proposal_code, ); assert_eq!(proposal_id_result, result); @@ -340,7 +338,6 @@ fn proposal_execution_succeeds() { assert_eq!( proposal, Proposal { - proposal_type: 1, parameters: parameters_fixture.params(), proposer_id: 1, created_at: 1, @@ -366,11 +363,15 @@ fn proposal_execution_succeeds() { fn proposal_execution_failed() { initial_test_ext().execute_with(|| { let parameters_fixture = ProposalParametersFixture::default(); - let faulty_proposal = FaultyExecutable; + + let faulty_proposal = mock::proposals::Call::::faulty_proposal( + b"title".to_vec(), + b"description".to_vec(), + ); let dummy_proposal = DummyProposalFixture::default() .with_parameters(parameters_fixture.params()) - .with_proposal_type_and_code(faulty_proposal.proposal_type(), faulty_proposal.encode()); + .with_proposal_code(faulty_proposal.encode()); let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); @@ -387,7 +388,6 @@ fn proposal_execution_failed() { assert_eq!( proposal, Proposal { - proposal_type: faulty_proposal.proposal_type(), parameters: parameters_fixture.params(), proposer_id: 1, created_at: 1, @@ -579,7 +579,6 @@ fn cancel_proposal_succeeds() { assert_eq!( proposal, Proposal { - proposal_type: 1, parameters: parameters_fixture.params(), proposer_id: 1, created_at: 1, @@ -649,7 +648,6 @@ fn veto_proposal_succeeds() { assert_eq!( proposal, Proposal { - proposal_type: 1, parameters: parameters_fixture.params(), proposer_id: 1, created_at: 1, @@ -781,7 +779,6 @@ fn create_proposal_and_expire_it() { assert_eq!( proposal, Proposal { - proposal_type: 1, parameters: parameters_fixture.params(), proposer_id: 1, created_at: 1, @@ -823,7 +820,6 @@ fn proposal_execution_postponed_because_of_grace_period() { assert_eq!( proposal, Proposal { - proposal_type: 1, parameters: parameters_fixture.params(), proposer_id: 1, created_at: 1, @@ -866,7 +862,6 @@ fn proposal_execution_succeeds_after_the_grace_period() { let mut proposal = >::get(proposal_id); let mut expected_proposal = Proposal { - proposal_type: 1, parameters: parameters_fixture.params(), proposer_id: 1, created_at: 1, @@ -970,7 +965,6 @@ fn create_dummy_proposal_succeeds_with_stake() { assert_eq!( proposal, Proposal { - proposal_type: 1, parameters: parameters_fixture.params(), proposer_id: 1, created_at: 1, @@ -1231,7 +1225,6 @@ fn finalize_proposal_using_stake_mocks_failed() { assert_eq!( proposal, Proposal { - proposal_type: 1, parameters: parameters_fixture.params(), proposer_id: 1, created_at: 1, From 14842a11474f8af3c109c80188f225d2d8027ada Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Wed, 18 Mar 2020 11:17:23 +0300 Subject: [PATCH 099/286] Migrate proposals engine to decl_error! macro - introduce errors in decl_error! macro for the crate - delete errors module - fix tests --- .../proposals/codex/src/tests/mod.rs | 8 +- runtime-modules/proposals/engine/src/lib.rs | 115 ++++++++++++++---- .../proposals/engine/src/tests/mock/mod.rs | 2 +- .../engine/src/tests/mock/proposals.rs | 5 +- .../proposals/engine/src/tests/mod.rs | 58 +++++---- 5 files changed, 126 insertions(+), 62 deletions(-) diff --git a/runtime-modules/proposals/codex/src/tests/mod.rs b/runtime-modules/proposals/codex/src/tests/mod.rs index b5c17538bb..dc90276582 100644 --- a/runtime-modules/proposals/codex/src/tests/mod.rs +++ b/runtime-modules/proposals/codex/src/tests/mod.rs @@ -47,7 +47,7 @@ fn create_text_proposal_codex_call_fails_with_invalid_stake() { b"text".to_vec(), None, ), - Err(Error::Other("Stake cannot be empty with this proposal")) + Err(Error::Other("EmptyStake")) ); let invalid_stake = Some(>::from(5000u32)); @@ -61,7 +61,7 @@ fn create_text_proposal_codex_call_fails_with_invalid_stake() { b"text".to_vec(), invalid_stake, ), - Err(Error::Other("Stake differs from the proposal requirements")) + Err(Error::Other("StakeDiffersFromRequired")) ); }); } @@ -177,7 +177,7 @@ fn create_runtime_upgrade_proposal_codex_call_fails_with_invalid_stake() { b"wasm".to_vec(), None, ), - Err(Error::Other("Stake cannot be empty with this proposal")) + Err(Error::Other("EmptyStake")) ); let invalid_stake = Some(>::from(500u32)); @@ -191,7 +191,7 @@ fn create_runtime_upgrade_proposal_codex_call_fails_with_invalid_stake() { b"wasm".to_vec(), invalid_stake, ), - Err(Error::Other("Stake differs from the proposal requirements")) + Err(Error::Other("StakeDiffersFromRequired")) ); }); } diff --git a/runtime-modules/proposals/engine/src/lib.rs b/runtime-modules/proposals/engine/src/lib.rs index 379aeb20f9..b4e04fdba9 100644 --- a/runtime-modules/proposals/engine/src/lib.rs +++ b/runtime-modules/proposals/engine/src/lib.rs @@ -35,7 +35,6 @@ pub use types::{DefaultStakeHandlerProvider, StakeHandler, StakeHandlerProvider} pub use types::{ProposalCodeDecoder, ProposalExecutable}; pub use types::{VoteKind, VotersParameters}; -mod errors; pub(crate) mod types; #[cfg(test)] @@ -43,10 +42,10 @@ mod tests; use codec::Decode; use rstd::prelude::*; -use sr_primitives::traits::Zero; +use sr_primitives::traits::{DispatchResult, Zero}; use srml_support::traits::{Currency, Get}; use srml_support::{ - decl_event, decl_module, decl_storage, dispatch, ensure, Parameter, StorageDoubleMap, + decl_error, decl_event, decl_module, decl_storage, ensure, Parameter, StorageDoubleMap, }; use system::{ensure_root, RawOrigin}; @@ -132,6 +131,72 @@ decl_event!( } ); +decl_error! { + pub enum Error { + /// Proposal cannot have an empty title" + EmptyTitleProvided, + + /// Proposal cannot have an empty body + EmptyDescriptionProvided, + + /// Title is too long + TitleIsTooLong, + + /// Description is too long + DescriptionIsTooLong, + + /// The proposal does not exist + ProposalNotFound, + + /// Proposal is finalized already + ProposalFinalized, + + /// The proposal have been already voted on + AlreadyVoted, + + /// Not an author + NotAuthor, + + /// Max active proposals number exceeded + MaxActiveProposalNumberExceeded, + + /// Stake cannot be empty with this proposal + EmptyStake, + + /// Stake should be empty for this proposal + StakeShouldBeEmpty, + + /// Stake differs from the proposal requirements + StakeDiffersFromRequired, + + /// Approval threshold cannot be zero + InvalidParameterApprovalThreshold, + + /// Slashing threshold cannot be zero + InvalidParameterSlashingThreshold, + + /// Require signed origin in extrinsics + RequireSignedOrigin, + + /// Require root origin in extrinsics + RequireRootOrigin, + } +} + +impl From for Error { + fn from(error: system::Error) -> Self { + match error { + system::Error::Other(msg) => Error::Other(msg), + system::Error::CannotLookup => Error::Other("CannotLookup"), + system::Error::BadSignature => Error::Other("BadSignature"), + system::Error::BlockFull => Error::Other("BlockFull"), + system::Error::RequireSignedOrigin => Error::RequireSignedOrigin, + system::Error::RequireRootOrigin => Error::RequireRootOrigin, + system::Error::RequireNoOrigin => Error::Other("RequireNoOrigin"), + } + } +} + // Storage for the proposals engine module decl_storage! { pub trait Store for Module as ProposalEngine{ @@ -165,6 +230,8 @@ decl_storage! { decl_module! { /// 'Proposal engine' substrate module pub struct Module for enum Call where origin: T::Origin { + /// Predefined errors + type Error = Error; /// Emits an event. Default substrate implementation. fn deposit_event() = default; @@ -176,17 +243,17 @@ decl_module! { voter_id.clone(), )?; - ensure!(>::exists(proposal_id), errors::MSG_PROPOSAL_NOT_FOUND); + ensure!(>::exists(proposal_id), Error::ProposalNotFound); let mut proposal = Self::proposals(proposal_id); - ensure!(proposal.status == ProposalStatus::Active, errors::MSG_PROPOSAL_FINALIZED); + ensure!(proposal.status == ProposalStatus::Active, Error::ProposalFinalized); let did_not_vote_before = !>::exists( proposal_id, voter_id.clone(), ); - ensure!(did_not_vote_before, errors::MSG_YOU_ALREADY_VOTED); + ensure!(did_not_vote_before, Error::AlreadyVoted); proposal.voting_results.add_vote(vote.clone()); @@ -204,11 +271,11 @@ decl_module! { proposer_id.clone(), )?; - ensure!(>::exists(proposal_id), errors::MSG_PROPOSAL_NOT_FOUND); + ensure!(>::exists(proposal_id), Error::ProposalNotFound); let proposal = Self::proposals(proposal_id); - ensure!(proposer_id == proposal.proposer_id, errors::MSG_YOU_DONT_OWN_THIS_PROPOSAL); - ensure!(proposal.status == ProposalStatus::Active, errors::MSG_PROPOSAL_FINALIZED); + ensure!(proposer_id == proposal.proposer_id, Error::NotAuthor); + ensure!(proposal.status == ProposalStatus::Active, Error::ProposalFinalized); // mutation @@ -219,10 +286,10 @@ decl_module! { pub fn veto_proposal(origin, proposal_id: T::ProposalId) { ensure_root(origin)?; - ensure!(>::exists(proposal_id), errors::MSG_PROPOSAL_NOT_FOUND); + ensure!(>::exists(proposal_id), Error::ProposalNotFound); let proposal = Self::proposals(proposal_id); - ensure!(proposal.status == ProposalStatus::Active, errors::MSG_PROPOSAL_FINALIZED); + ensure!(proposal.status == ProposalStatus::Active, Error::ProposalFinalized); // mutation @@ -512,34 +579,34 @@ impl Module { fn ensure_create_proposal_parameters_are_valid( parameters: &ProposalParameters>, title: &[u8], - body: &[u8], + description: &[u8], stake_balance: Option>, - ) -> dispatch::Result { - ensure!(!title.is_empty(), errors::MSG_EMPTY_TITLE_PROVIDED); + ) -> DispatchResult { + ensure!(!title.is_empty(), Error::EmptyTitleProvided); ensure!( title.len() as u32 <= T::TitleMaxLength::get(), - errors::MSG_TOO_LONG_TITLE + Error::TitleIsTooLong ); - ensure!(!body.is_empty(), errors::MSG_EMPTY_BODY_PROVIDED); + ensure!(!description.is_empty(), Error::EmptyDescriptionProvided); ensure!( - body.len() as u32 <= T::DescriptionMaxLength::get(), - errors::MSG_TOO_LONG_BODY + description.len() as u32 <= T::DescriptionMaxLength::get(), + Error::DescriptionIsTooLong ); ensure!( (Self::active_proposal_count()) < T::MaxActiveProposalLimit::get(), - errors::MSG_MAX_ACTIVE_PROPOSAL_NUMBER_EXCEEDED + Error::MaxActiveProposalNumberExceeded ); ensure!( parameters.approval_threshold_percentage > 0, - errors::MSG_INVALID_PARAMETER_APPROVAL_THRESHOLD + Error::InvalidParameterApprovalThreshold ); ensure!( parameters.slashing_threshold_percentage > 0, - errors::MSG_INVALID_PARAMETER_SLASHING_THRESHOLD + Error::InvalidParameterSlashingThreshold ); // check stake parameters @@ -547,15 +614,15 @@ impl Module { if let Some(staked_balance) = stake_balance { ensure!( required_stake == staked_balance, - errors::MSG_STAKE_DIFFERS_FROM_REQUIRED + Error::StakeDiffersFromRequired ); } else { - return Err(errors::MSG_STAKE_IS_EMPTY); + return Err(Error::EmptyStake); } } if stake_balance.is_some() && parameters.required_stake.is_none() { - return Err(errors::MSG_STAKE_SHOULD_BE_EMPTY); + return Err(Error::StakeShouldBeEmpty); } Ok(()) diff --git a/runtime-modules/proposals/engine/src/tests/mock/mod.rs b/runtime-modules/proposals/engine/src/tests/mock/mod.rs index a674f40ddd..f7ed9fabdf 100644 --- a/runtime-modules/proposals/engine/src/tests/mock/mod.rs +++ b/runtime-modules/proposals/engine/src/tests/mock/mod.rs @@ -14,7 +14,7 @@ pub use sr_primitives::{ weights::Weight, BuildStorage, DispatchError, Perbill, }; -use srml_support::{impl_outer_dispatch, impl_outer_event, impl_outer_origin, parameter_types}; +use srml_support::{impl_outer_event, impl_outer_origin, parameter_types}; pub use system; mod balance_manager; diff --git a/runtime-modules/proposals/engine/src/tests/mock/proposals.rs b/runtime-modules/proposals/engine/src/tests/mock/proposals.rs index ffcce39b37..b8b8cc6675 100644 --- a/runtime-modules/proposals/engine/src/tests/mock/proposals.rs +++ b/runtime-modules/proposals/engine/src/tests/mock/proposals.rs @@ -2,16 +2,15 @@ use rstd::prelude::*; use rstd::vec::Vec; -use sr_primitives::DispatchError; use srml_support::decl_module; pub trait Trait: system::Trait {} decl_module! { pub struct Module for enum Call where origin: T::Origin { - /// Working extrinsic test + /// Working extrinsic test pub fn dummy_proposal(_origin, _title: Vec, _description: Vec) {} - /// Broken extrinsic test + /// Broken extrinsic test pub fn faulty_proposal(_origin, _title: Vec, _description: Vec,) { Err("ExecutionFailed")? } diff --git a/runtime-modules/proposals/engine/src/tests/mod.rs b/runtime-modules/proposals/engine/src/tests/mod.rs index 2b79a076f3..2b6ab70bbd 100644 --- a/runtime-modules/proposals/engine/src/tests/mod.rs +++ b/runtime-modules/proposals/engine/src/tests/mod.rs @@ -5,8 +5,8 @@ use mock::*; use codec::Encode; use rstd::rc::Rc; -use sr_primitives::traits::{OnFinalize, OnInitialize}; -use srml_support::{dispatch, StorageMap, StorageValue}; +use sr_primitives::traits::{DispatchResult, OnFinalize, OnInitialize}; +use srml_support::{StorageMap, StorageValue}; use system::RawOrigin; use system::{EventRecord, Phase}; @@ -70,10 +70,8 @@ impl Default for DummyProposalFixture { fn default() -> Self { let title = b"title".to_vec(); let description = b"description".to_vec(); - let dummy_proposal = mock::proposals::Call::::dummy_proposal( - title.clone(), - description.clone(), - ); + let dummy_proposal = + mock::proposals::Call::::dummy_proposal(title.clone(), description.clone()); DummyProposalFixture { parameters: ProposalParameters { @@ -168,7 +166,7 @@ impl CancelProposalFixture { } } - fn cancel_and_assert(self, expected_result: dispatch::Result) { + fn cancel_and_assert(self, expected_result: DispatchResult) { assert_eq!( ProposalsEngine::cancel_proposal( self.origin.into(), @@ -196,7 +194,7 @@ impl VetoProposalFixture { VetoProposalFixture { origin, ..self } } - fn veto_and_assert(self, expected_result: dispatch::Result) { + fn veto_and_assert(self, expected_result: DispatchResult) { assert_eq!( ProposalsEngine::veto_proposal(self.origin.into(), self.proposal_id,), expected_result @@ -224,11 +222,11 @@ impl VoteGenerator { self.vote_and_assert(vote_kind, Ok(())); } - fn vote_and_assert(&mut self, vote_kind: VoteKind, expected_result: dispatch::Result) { + fn vote_and_assert(&mut self, vote_kind: VoteKind, expected_result: DispatchResult) { assert_eq!(self.vote(vote_kind.clone()), expected_result); } - fn vote(&mut self, vote_kind: VoteKind) -> dispatch::Result { + fn vote(&mut self, vote_kind: VoteKind) -> DispatchResult { if self.auto_increment_voter_id { self.current_account_id += 1; self.current_voter_id += 1; @@ -289,7 +287,7 @@ fn create_dummy_proposal_succeeds() { fn create_dummy_proposal_fails_with_insufficient_rights() { initial_test_ext().execute_with(|| { let dummy_proposal = DummyProposalFixture::default().with_origin(RawOrigin::None); - dummy_proposal.create_proposal_and_assert(Err("RequireSignedOrigin")); + dummy_proposal.create_proposal_and_assert(Err(Error::RequireSignedOrigin.into())); }); } @@ -309,7 +307,7 @@ fn vote_fails_with_insufficient_rights() { initial_test_ext().execute_with(|| { assert_eq!( ProposalsEngine::vote(system::RawOrigin::None.into(), 1, 1, VoteKind::Approve), - Err("RequireSignedOrigin") + Err(Error::Other("RequireSignedOrigin")) ); }); } @@ -487,21 +485,21 @@ fn create_proposal_fails_with_invalid_body_or_title() { initial_test_ext().execute_with(|| { let mut dummy_proposal = DummyProposalFixture::default().with_title_and_body(Vec::new(), b"body".to_vec()); - dummy_proposal.create_proposal_and_assert(Err("Proposal cannot have an empty title")); + dummy_proposal.create_proposal_and_assert(Err(Error::EmptyTitleProvided.into())); dummy_proposal = DummyProposalFixture::default().with_title_and_body(b"title".to_vec(), Vec::new()); - dummy_proposal.create_proposal_and_assert(Err("Proposal cannot have an empty body")); + dummy_proposal.create_proposal_and_assert(Err(Error::EmptyDescriptionProvided.into())); let too_long_title = vec![0; 200]; dummy_proposal = DummyProposalFixture::default().with_title_and_body(too_long_title, b"body".to_vec()); - dummy_proposal.create_proposal_and_assert(Err("Title is too long")); + dummy_proposal.create_proposal_and_assert(Err(Error::TitleIsTooLong.into())); let too_long_body = vec![0; 11000]; dummy_proposal = DummyProposalFixture::default().with_title_and_body(b"title".to_vec(), too_long_body); - dummy_proposal.create_proposal_and_assert(Err("Body is too long")); + dummy_proposal.create_proposal_and_assert(Err(Error::DescriptionIsTooLong.into())); }); } @@ -514,7 +512,7 @@ fn vote_fails_with_expired_voting_period() { run_to_block_and_finalize(6); let mut vote_generator = VoteGenerator::new(proposal_id); - vote_generator.vote_and_assert(VoteKind::Approve, Err("Proposal is finalized already")); + vote_generator.vote_and_assert(VoteKind::Approve, Err(Error::ProposalFinalized)); }); } @@ -534,7 +532,7 @@ fn vote_fails_with_not_active_proposal() { let mut vote_generator_to_fail = VoteGenerator::new(proposal_id); vote_generator_to_fail - .vote_and_assert(VoteKind::Approve, Err("Proposal is finalized already")); + .vote_and_assert(VoteKind::Approve, Err(Error::ProposalFinalized)); }); } @@ -542,7 +540,7 @@ fn vote_fails_with_not_active_proposal() { fn vote_fails_with_absent_proposal() { initial_test_ext().execute_with(|| { let mut vote_generator = VoteGenerator::new(2); - vote_generator.vote_and_assert(VoteKind::Approve, Err("This proposal does not exist")); + vote_generator.vote_and_assert(VoteKind::Approve, Err(Error::ProposalNotFound)); }); } @@ -558,7 +556,7 @@ fn vote_fails_on_double_voting() { vote_generator.vote_and_assert_ok(VoteKind::Approve); vote_generator.vote_and_assert( VoteKind::Approve, - Err("You have already voted on this proposal"), + Err(Error::AlreadyVoted), ); }); } @@ -601,7 +599,7 @@ fn cancel_proposal_fails_with_not_active_proposal() { run_to_block_and_finalize(6); let cancel_proposal = CancelProposalFixture::new(proposal_id); - cancel_proposal.cancel_and_assert(Err("Proposal is finalized already")); + cancel_proposal.cancel_and_assert(Err(Error::ProposalFinalized)); }); } @@ -609,7 +607,7 @@ fn cancel_proposal_fails_with_not_active_proposal() { fn cancel_proposal_fails_with_not_existing_proposal() { initial_test_ext().execute_with(|| { let cancel_proposal = CancelProposalFixture::new(2); - cancel_proposal.cancel_and_assert(Err("This proposal does not exist")); + cancel_proposal.cancel_and_assert(Err(Error::ProposalNotFound)); }); } @@ -622,7 +620,7 @@ fn cancel_proposal_fails_with_insufficient_rights() { let cancel_proposal = CancelProposalFixture::new(proposal_id) .with_origin(RawOrigin::Signed(2)) .with_proposer(2); - cancel_proposal.cancel_and_assert(Err("You do not own this proposal")); + cancel_proposal.cancel_and_assert(Err(Error::NotAuthor)); }); } @@ -673,7 +671,7 @@ fn veto_proposal_fails_with_not_active_proposal() { run_to_block_and_finalize(6); let veto_proposal = VetoProposalFixture::new(proposal_id); - veto_proposal.veto_and_assert(Err("Proposal is finalized already")); + veto_proposal.veto_and_assert(Err(Error::ProposalFinalized)); }); } @@ -681,7 +679,7 @@ fn veto_proposal_fails_with_not_active_proposal() { fn veto_proposal_fails_with_not_existing_proposal() { initial_test_ext().execute_with(|| { let veto_proposal = VetoProposalFixture::new(2); - veto_proposal.veto_and_assert(Err("This proposal does not exist")); + veto_proposal.veto_and_assert(Err(Error::ProposalNotFound)); }); } @@ -692,7 +690,7 @@ fn veto_proposal_fails_with_insufficient_rights() { let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); let veto_proposal = VetoProposalFixture::new(proposal_id).with_origin(RawOrigin::Signed(2)); - veto_proposal.veto_and_assert(Err("RequireRootOrigin")); + veto_proposal.veto_and_assert(Err(Error::RequireRootOrigin)); }); } @@ -905,7 +903,7 @@ fn create_proposal_fails_on_exceeding_max_active_proposals_count() { } let dummy_proposal = DummyProposalFixture::default(); - dummy_proposal.create_proposal_and_assert(Err("Max active proposals number exceeded")); + dummy_proposal.create_proposal_and_assert(Err(Error::MaxActiveProposalNumberExceeded.into())); // internal active proposal counter check assert_eq!(::get(), 100); }); @@ -1007,13 +1005,13 @@ fn create_proposal_fais_with_invalid_stake_parameters() { .with_parameters(parameters_fixture.params()) .with_stake(200); - dummy_proposal.create_proposal_and_assert(Err("Stake should be empty for this proposal")); + dummy_proposal.create_proposal_and_assert(Err(Error::StakeShouldBeEmpty.into())); let parameters_fixture_stake_200 = parameters_fixture.with_required_stake(200); dummy_proposal = DummyProposalFixture::default().with_parameters(parameters_fixture_stake_200.params()); - dummy_proposal.create_proposal_and_assert(Err("Stake cannot be empty with this proposal")); + dummy_proposal.create_proposal_and_assert(Err(Error::EmptyStake.into())); let parameters_fixture_stake_300 = parameters_fixture.with_required_stake(300); dummy_proposal = DummyProposalFixture::default() @@ -1021,7 +1019,7 @@ fn create_proposal_fais_with_invalid_stake_parameters() { .with_stake(200); dummy_proposal - .create_proposal_and_assert(Err("Stake differs from the proposal requirements")); + .create_proposal_and_assert(Err(Error::StakeDiffersFromRequired.into())); }); } /* TODO: restore after the https://github.com/Joystream/substrate-runtime-joystream/issues/161 From a133506097a4dda8facea5976dc210384f82d708 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Wed, 18 Mar 2020 13:44:41 +0300 Subject: [PATCH 100/286] Migrate proposals to decl_error! macro - migrate discussions - create codex errors conversion helpers - update tests --- runtime-modules/proposals/codex/src/lib.rs | 31 +++++-- .../proposals/discussion/Cargo.toml | 5 +- .../proposals/discussion/src/errors.rs | 10 --- .../proposals/discussion/src/lib.rs | 82 +++++++++++++++---- .../proposals/discussion/src/tests/mock.rs | 2 +- .../proposals/discussion/src/tests/mod.rs | 39 +++++---- runtime-modules/proposals/engine/src/lib.rs | 11 +-- .../proposals/engine/src/tests/mod.rs | 6 +- 8 files changed, 116 insertions(+), 70 deletions(-) delete mode 100644 runtime-modules/proposals/discussion/src/errors.rs diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index fd9ca71d8f..2717401abf 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -23,7 +23,7 @@ use rstd::vec::Vec; use srml_support::{decl_error, decl_module, decl_storage, ensure, print}; use system::{ensure_root, RawOrigin}; -use proposal_engine::*; +use proposal_engine::{ProposalParameters}; /// 'Proposals codex' substrate module Trait pub trait Trait: @@ -63,6 +63,9 @@ decl_error! { /// Require root origin in extrinsics RequireRootOrigin, + + /// Errors from the proposal engine + ProposalsEngineError } } @@ -70,16 +73,32 @@ impl From for Error { fn from(error: system::Error) -> Self { match error { system::Error::Other(msg) => Error::Other(msg), - system::Error::CannotLookup => Error::Other("CannotLookup"), - system::Error::BadSignature => Error::Other("BadSignature"), - system::Error::BlockFull => Error::Other("BlockFull"), - system::Error::RequireSignedOrigin => Error::Other("RequireSignedOrigin"), system::Error::RequireRootOrigin => Error::RequireRootOrigin, - system::Error::RequireNoOrigin => Error::Other("RequireNoOrigin"), + _ => Error::Other(error.into()), + } + } +} + +impl From for Error { + fn from(error: proposal_engine::Error) -> Self { + match error { + proposal_engine::Error::Other(msg) => Error::Other(msg), + proposal_engine::Error::RequireRootOrigin => Error::RequireRootOrigin, + _ => Error::Other(error.into()), } } } +impl From for Error { + fn from(error: proposal_discussion::Error) -> Self { + match error { + proposal_discussion::Error::Other(msg) => Error::Other(msg), + proposal_discussion::Error::RequireRootOrigin => Error::RequireRootOrigin, + _ => Error::Other(error.into()), + } + } +} + // Storage for the proposals codex module decl_storage! { pub trait Store for Module as ProposalCodex{ diff --git a/runtime-modules/proposals/discussion/Cargo.toml b/runtime-modules/proposals/discussion/Cargo.toml index 8220297ce6..c5bad3b951 100644 --- a/runtime-modules/proposals/discussion/Cargo.toml +++ b/runtime-modules/proposals/discussion/Cargo.toml @@ -12,7 +12,7 @@ std = [ 'rstd/std', 'srml-support/std', 'primitives/std', - 'runtime-primitives/std', + 'sr-primitives/std', 'system/std', 'timestamp/std', 'serde', @@ -20,7 +20,6 @@ std = [ 'common/std', ] - [dependencies.num_enum] default_features = false version = "0.4.2" @@ -48,7 +47,7 @@ git = 'https://github.com/paritytech/substrate.git' package = 'sr-std' rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' -[dependencies.runtime-primitives] +[dependencies.sr-primitives] default_features = false git = 'https://github.com/paritytech/substrate.git' package = 'sr-primitives' diff --git a/runtime-modules/proposals/discussion/src/errors.rs b/runtime-modules/proposals/discussion/src/errors.rs deleted file mode 100644 index e375743df4..0000000000 --- a/runtime-modules/proposals/discussion/src/errors.rs +++ /dev/null @@ -1,10 +0,0 @@ -pub(crate) const MSG_NOT_AUTHOR: &str = "Author should match the post creator"; -pub(crate) const MSG_POST_EDITION_NUMBER_EXCEEDED: &str = "Post edition limit reached."; -pub(crate) const MSG_EMPTY_TITLE_PROVIDED: &str = "Discussion cannot have an empty title"; -pub(crate) const MSG_TOO_LONG_TITLE: &str = "Title is too long"; -pub(crate) const MSG_THREAD_DOESNT_EXIST: &str = "Thread doesn't exist"; -pub(crate) const MSG_POST_DOESNT_EXIST: &str = "Post doesn't exist"; -pub(crate) const MSG_EMPTY_POST_PROVIDED: &str = "Post cannot be empty"; -pub(crate) const MSG_TOO_LONG_POST: &str = "Post is too long"; -pub(crate) const MSG_MAX_THREAD_IN_A_ROW_LIMIT_EXCEEDED: &str = - "Max number of threads by same author in a row limit exceeded"; diff --git a/runtime-modules/proposals/discussion/src/lib.rs b/runtime-modules/proposals/discussion/src/lib.rs index 9c262a047b..72781953d5 100644 --- a/runtime-modules/proposals/discussion/src/lib.rs +++ b/runtime-modules/proposals/discussion/src/lib.rs @@ -15,7 +15,6 @@ // Do not delete! Cannot be uncommented by default, because of Parity decl_module! issue. //#![warn(missing_docs)] -mod errors; #[cfg(test)] mod tests; mod types; @@ -23,16 +22,14 @@ mod types; use rstd::clone::Clone; use rstd::prelude::*; use rstd::vec::Vec; -use srml_support::{decl_event, decl_module, decl_storage, ensure, Parameter}; +use srml_support::{decl_event, decl_module, decl_error, decl_storage, ensure, Parameter}; -use srml_support::traits::Get; +use srml_support::traits::{Get}; use types::{Post, Thread, ThreadCounter}; use common::origin_validator::ActorOriginValidator; use membership::origin_validator::MemberId; -// TODO: move errors to decl_error macro (after substrate version upgrade) - decl_event!( /// Proposals engine events pub enum Event @@ -90,6 +87,53 @@ pub trait Trait: system::Trait + membership::members::Trait { type MaxThreadInARowNumber: Get; } +decl_error! { + pub enum Error { + /// The size of the provided text for text proposal exceeded the limit + TextProposalSizeExceeded, + + /// Author should match the post creator + NotAuthor, + + /// Post edition limit reached + PostEditionNumberExceeded, + + /// Discussion cannot have an empty title + EmptyTitleProvided, + + /// Title is too long + TitleIsTooLong, + + /// Thread doesn't exist + ThreadDoesntExist, + + /// Post doesn't exist + PostDoesntExist, + + /// Post cannot be empty + EmptyPostProvided, + + /// Post is too long + PostIsTooLong, + + /// Max number of threads by same author in a row limit exceeded + MaxThreadInARowLimitExceeded, + + /// Require root origin in extrinsics + RequireRootOrigin, + } +} + +impl From for Error { + fn from(error: system::Error) -> Self { + match error { + system::Error::Other(msg) => Error::Other(msg), + system::Error::RequireRootOrigin => Error::RequireRootOrigin, + _ => Error::Other(error.into()), + } + } +} + // Storage for the proposals discussion module decl_storage! { pub trait Store for Module as ProposalDiscussion { @@ -116,6 +160,8 @@ decl_storage! { decl_module! { /// 'Proposal discussion' substrate module pub struct Module for enum Call where origin: T::Origin { + /// Predefined errors + type Error = Error; /// Emits an event. Default substrate implementation. fn deposit_event() = default; @@ -131,12 +177,12 @@ decl_module! { origin, post_author_id.clone(), )?; - ensure!(>::exists(thread_id), errors::MSG_THREAD_DOESNT_EXIST); + ensure!(>::exists(thread_id), Error::ThreadDoesntExist); - ensure!(!text.is_empty(), errors::MSG_EMPTY_POST_PROVIDED); + ensure!(!text.is_empty(),Error::EmptyPostProvided); ensure!( text.len() as u32 <= T::PostLengthLimit::get(), - errors::MSG_TOO_LONG_POST + Error::PostIsTooLong ); // mutation @@ -172,20 +218,20 @@ decl_module! { post_author_id.clone(), )?; - ensure!(>::exists(thread_id), errors::MSG_THREAD_DOESNT_EXIST); - ensure!(>::exists(thread_id, post_id), errors::MSG_POST_DOESNT_EXIST); + ensure!(>::exists(thread_id), Error::ThreadDoesntExist); + ensure!(>::exists(thread_id, post_id), Error::PostDoesntExist); - ensure!(!text.is_empty(), errors::MSG_EMPTY_POST_PROVIDED); + ensure!(!text.is_empty(), Error::EmptyPostProvided); ensure!( text.len() as u32 <= T::PostLengthLimit::get(), - errors::MSG_TOO_LONG_POST + Error::PostIsTooLong ); let post = >::get(&thread_id, &post_id); - ensure!(post.author_id == post_author_id, errors::MSG_NOT_AUTHOR); + ensure!(post.author_id == post_author_id, Error::NotAuthor); ensure!(post.edition_number < T::MaxPostEditionNumber::get(), - errors::MSG_POST_EDITION_NUMBER_EXCEEDED); + Error::PostEditionNumberExceeded); let new_post = Post { text, @@ -214,13 +260,13 @@ impl Module { origin: T::Origin, thread_author_id: MemberId, title: Vec, - ) -> Result { + ) -> Result { T::ThreadAuthorOriginValidator::ensure_actor_origin(origin, thread_author_id.clone())?; - ensure!(!title.is_empty(), errors::MSG_EMPTY_TITLE_PROVIDED); + ensure!(!title.is_empty(), Error::EmptyTitleProvided); ensure!( title.len() as u32 <= T::ThreadTitleLengthLimit::get(), - errors::MSG_TOO_LONG_TITLE + Error::TitleIsTooLong ); // get new 'threads in a row' counter for the author @@ -228,7 +274,7 @@ impl Module { ensure!( current_thread_counter.counter as u32 <= T::MaxThreadInARowNumber::get(), - errors::MSG_MAX_THREAD_IN_A_ROW_LIMIT_EXCEEDED + Error::MaxThreadInARowLimitExceeded ); let next_thread_count_value = Self::thread_count() + 1; diff --git a/runtime-modules/proposals/discussion/src/tests/mock.rs b/runtime-modules/proposals/discussion/src/tests/mock.rs index fbc916255d..a8bb9117aa 100644 --- a/runtime-modules/proposals/discussion/src/tests/mock.rs +++ b/runtime-modules/proposals/discussion/src/tests/mock.rs @@ -3,7 +3,7 @@ pub use system; pub use primitives::{Blake2Hasher, H256}; -pub use runtime_primitives::{ +pub use sr_primitives::{ testing::{Digest, DigestItem, Header, UintAuthorityId}, traits::{BlakeTwo256, Convert, IdentityLookup, OnFinalize}, weights::Weight, diff --git a/runtime-modules/proposals/discussion/src/tests/mod.rs b/runtime-modules/proposals/discussion/src/tests/mod.rs index cc2da35d09..3d3748c836 100644 --- a/runtime-modules/proposals/discussion/src/tests/mod.rs +++ b/runtime-modules/proposals/discussion/src/tests/mod.rs @@ -2,7 +2,6 @@ mod mock; use mock::*; -use crate::errors::*; use crate::*; use system::RawOrigin; use system::{EventRecord, Phase}; @@ -93,7 +92,7 @@ impl DiscussionFixture { } } - fn create_discussion_and_assert(&self, result: Result) -> Option { + fn create_discussion_and_assert(&self, result: Result) -> Option { let create_discussion_result = Discussions::create_thread( self.origin.clone().into(), self.author_id, @@ -148,7 +147,7 @@ impl PostFixture { } } - fn add_post_and_assert(&mut self, result: Result<(), &'static str>) -> Option { + fn add_post_and_assert(&mut self, result: Result<(), Error>) -> Option { let add_post_result = Discussions::add_post( self.origin.clone().into(), self.author_id, @@ -168,7 +167,7 @@ impl PostFixture { fn update_post_with_text_and_assert( &mut self, new_text: Vec, - result: Result<(), &'static str>, + result: Result<(), Error>, ) { let add_post_result = Discussions::update_post( self.origin.clone().into(), @@ -181,7 +180,7 @@ impl PostFixture { assert_eq!(add_post_result, result); } - fn update_post_and_assert(&mut self, result: Result<(), &'static str>) { + fn update_post_and_assert(&mut self, result: Result<(), Error>) { self.update_post_with_text_and_assert(self.text.clone(), result); } } @@ -249,7 +248,7 @@ fn update_post_call_failes_because_of_post_edition_limit() { post_fixture.update_post_and_assert(Ok(())); } - post_fixture.update_post_and_assert(Err(MSG_POST_EDITION_NUMBER_EXCEEDED)); + post_fixture.update_post_and_assert(Err(Error::PostEditionNumberExceeded)); }); } @@ -268,11 +267,11 @@ fn update_post_call_failes_because_of_the_wrong_author() { post_fixture = post_fixture.with_author(2); - post_fixture.update_post_and_assert(Err("Invalid author")); + post_fixture.update_post_and_assert(Err(Error::Other("Invalid author"))); post_fixture = post_fixture.with_origin(RawOrigin::None).with_author(2); - post_fixture.update_post_and_assert(Err(MSG_NOT_AUTHOR)); + post_fixture.update_post_and_assert(Err(Error::NotAuthor)); }); } @@ -317,10 +316,10 @@ fn thread_content_check_succeeded() { fn create_discussion_call_with_bad_title_failed() { initial_test_ext().execute_with(|| { let mut discussion_fixture = DiscussionFixture::default().with_title(Vec::new()); - discussion_fixture.create_discussion_and_assert(Err(MSG_EMPTY_TITLE_PROVIDED)); + discussion_fixture.create_discussion_and_assert(Err(Error::EmptyTitleProvided)); discussion_fixture = DiscussionFixture::default().with_title([0; 201].to_vec()); - discussion_fixture.create_discussion_and_assert(Err(MSG_TOO_LONG_TITLE)); + discussion_fixture.create_discussion_and_assert(Err(Error::TitleIsTooLong)); }); } @@ -333,7 +332,7 @@ fn add_post_call_with_invalid_thread_failed() { .unwrap(); let mut post_fixture = PostFixture::default_for_thread(2); - post_fixture.add_post_and_assert(Err(MSG_THREAD_DOESNT_EXIST)); + post_fixture.add_post_and_assert(Err(Error::ThreadDoesntExist)); }); } @@ -349,7 +348,7 @@ fn update_post_call_with_invalid_post_failed() { post_fixture1.add_post_and_assert(Ok(())).unwrap(); let mut post_fixture2 = post_fixture1.change_post_id(2); - post_fixture2.update_post_and_assert(Err(MSG_POST_DOESNT_EXIST)); + post_fixture2.update_post_and_assert(Err(Error::PostDoesntExist)); }); } @@ -365,7 +364,7 @@ fn update_post_call_with_invalid_thread_failed() { post_fixture1.add_post_and_assert(Ok(())).unwrap(); let mut post_fixture2 = post_fixture1.change_thread_id(2); - post_fixture2.update_post_and_assert(Err(MSG_THREAD_DOESNT_EXIST)); + post_fixture2.update_post_and_assert(Err(Error::ThreadDoesntExist)); }); } @@ -378,11 +377,11 @@ fn add_post_call_with_invalid_text_failed() { .unwrap(); let mut post_fixture1 = PostFixture::default_for_thread(thread_id).with_text(Vec::new()); - post_fixture1.add_post_and_assert(Err(MSG_EMPTY_POST_PROVIDED)); + post_fixture1.add_post_and_assert(Err(Error::EmptyPostProvided)); let mut post_fixture2 = PostFixture::default_for_thread(thread_id).with_text([0; 2001].to_vec()); - post_fixture2.add_post_and_assert(Err(MSG_TOO_LONG_POST)); + post_fixture2.add_post_and_assert(Err(Error::PostIsTooLong)); }); } @@ -398,10 +397,10 @@ fn update_post_call_with_invalid_text_failed() { post_fixture1.add_post_and_assert(Ok(())); let mut post_fixture2 = post_fixture1.with_text(Vec::new()); - post_fixture2.update_post_and_assert(Err(MSG_EMPTY_POST_PROVIDED)); + post_fixture2.update_post_and_assert(Err(Error::EmptyPostProvided)); let mut post_fixture3 = post_fixture2.with_text([0; 2001].to_vec()); - post_fixture3.update_post_and_assert(Err(MSG_TOO_LONG_POST)); + post_fixture3.update_post_and_assert(Err(Error::PostIsTooLong)); }); } @@ -416,7 +415,7 @@ fn add_discussion_thread_fails_because_of_max_thread_by_same_author_in_a_row_lim } discussion_fixture - .create_discussion_and_assert(Err(MSG_MAX_THREAD_IN_A_ROW_LIMIT_EXCEEDED)); + .create_discussion_and_assert(Err(Error::MaxThreadInARowLimitExceeded)); }); } @@ -424,11 +423,11 @@ fn add_discussion_thread_fails_because_of_max_thread_by_same_author_in_a_row_lim fn add_discussion_thread_fails_because_of_invalid_author_origin() { initial_test_ext().execute_with(|| { let discussion_fixture = DiscussionFixture::default().with_author(2); - discussion_fixture.create_discussion_and_assert(Err("Invalid author")); + discussion_fixture.create_discussion_and_assert(Err(Error::Other("Invalid author"))); let discussion_fixture = DiscussionFixture::default() .with_origin(RawOrigin::Signed(3)) .with_author(2); - discussion_fixture.create_discussion_and_assert(Err("Invalid author")); + discussion_fixture.create_discussion_and_assert(Err(Error::Other("Invalid author"))); }); } diff --git a/runtime-modules/proposals/engine/src/lib.rs b/runtime-modules/proposals/engine/src/lib.rs index b4e04fdba9..7a5a827c8f 100644 --- a/runtime-modules/proposals/engine/src/lib.rs +++ b/runtime-modules/proposals/engine/src/lib.rs @@ -175,9 +175,6 @@ decl_error! { /// Slashing threshold cannot be zero InvalidParameterSlashingThreshold, - /// Require signed origin in extrinsics - RequireSignedOrigin, - /// Require root origin in extrinsics RequireRootOrigin, } @@ -187,12 +184,8 @@ impl From for Error { fn from(error: system::Error) -> Self { match error { system::Error::Other(msg) => Error::Other(msg), - system::Error::CannotLookup => Error::Other("CannotLookup"), - system::Error::BadSignature => Error::Other("BadSignature"), - system::Error::BlockFull => Error::Other("BlockFull"), - system::Error::RequireSignedOrigin => Error::RequireSignedOrigin, system::Error::RequireRootOrigin => Error::RequireRootOrigin, - system::Error::RequireNoOrigin => Error::Other("RequireNoOrigin"), + _ => Error::Other(error.into()), } } } @@ -331,7 +324,7 @@ impl Module { description: Vec, stake_balance: Option>, proposal_code: Vec, - ) -> Result { + ) -> Result { let account_id = T::ProposerOriginValidator::ensure_actor_origin(origin, proposer_id.clone())?; diff --git a/runtime-modules/proposals/engine/src/tests/mod.rs b/runtime-modules/proposals/engine/src/tests/mod.rs index 2b6ab70bbd..5bf8fce618 100644 --- a/runtime-modules/proposals/engine/src/tests/mod.rs +++ b/runtime-modules/proposals/engine/src/tests/mod.rs @@ -124,7 +124,7 @@ impl DummyProposalFixture { } } - fn create_proposal_and_assert(self, result: Result) -> Option { + fn create_proposal_and_assert(self, result: Result) -> Option { let proposal_id_result = ProposalsEngine::create_proposal( self.origin.into(), self.proposer_id, @@ -287,7 +287,7 @@ fn create_dummy_proposal_succeeds() { fn create_dummy_proposal_fails_with_insufficient_rights() { initial_test_ext().execute_with(|| { let dummy_proposal = DummyProposalFixture::default().with_origin(RawOrigin::None); - dummy_proposal.create_proposal_and_assert(Err(Error::RequireSignedOrigin.into())); + dummy_proposal.create_proposal_and_assert(Err(Error::Other("RequireSignedOrigin"))); }); } @@ -992,7 +992,7 @@ fn create_dummy_proposal_fail_with_stake_on_empty_account() { .with_origin(RawOrigin::Signed(account_id)) .with_stake(required_stake); - dummy_proposal.create_proposal_and_assert(Err("too few free funds in account")); + dummy_proposal.create_proposal_and_assert(Err(Error::Other("too few free funds in account"))); }); } From bcd36e7a9a58e87eb9baf0e31ce1d13f3496a805 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Wed, 18 Mar 2020 16:36:43 +0300 Subject: [PATCH 101/286] Apply cargo fmt --- runtime-modules/proposals/codex/src/lib.rs | 6 +++--- runtime-modules/proposals/discussion/src/lib.rs | 4 ++-- .../proposals/discussion/src/tests/mod.rs | 9 ++------- .../proposals/engine/src/tests/mod.rs | 17 +++++++---------- 4 files changed, 14 insertions(+), 22 deletions(-) diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index 2717401abf..5122589fba 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -23,7 +23,7 @@ use rstd::vec::Vec; use srml_support::{decl_error, decl_module, decl_storage, ensure, print}; use system::{ensure_root, RawOrigin}; -use proposal_engine::{ProposalParameters}; +use proposal_engine::ProposalParameters; /// 'Proposals codex' substrate module Trait pub trait Trait: @@ -90,13 +90,13 @@ impl From for Error { } impl From for Error { - fn from(error: proposal_discussion::Error) -> Self { + fn from(error: proposal_discussion::Error) -> Self { match error { proposal_discussion::Error::Other(msg) => Error::Other(msg), proposal_discussion::Error::RequireRootOrigin => Error::RequireRootOrigin, _ => Error::Other(error.into()), } - } + } } // Storage for the proposals codex module diff --git a/runtime-modules/proposals/discussion/src/lib.rs b/runtime-modules/proposals/discussion/src/lib.rs index 72781953d5..c856f7c24e 100644 --- a/runtime-modules/proposals/discussion/src/lib.rs +++ b/runtime-modules/proposals/discussion/src/lib.rs @@ -22,9 +22,9 @@ mod types; use rstd::clone::Clone; use rstd::prelude::*; use rstd::vec::Vec; -use srml_support::{decl_event, decl_module, decl_error, decl_storage, ensure, Parameter}; +use srml_support::{decl_error, decl_event, decl_module, decl_storage, ensure, Parameter}; -use srml_support::traits::{Get}; +use srml_support::traits::Get; use types::{Post, Thread, ThreadCounter}; use common::origin_validator::ActorOriginValidator; diff --git a/runtime-modules/proposals/discussion/src/tests/mod.rs b/runtime-modules/proposals/discussion/src/tests/mod.rs index 3d3748c836..205cda7897 100644 --- a/runtime-modules/proposals/discussion/src/tests/mod.rs +++ b/runtime-modules/proposals/discussion/src/tests/mod.rs @@ -164,11 +164,7 @@ impl PostFixture { self.post_id } - fn update_post_with_text_and_assert( - &mut self, - new_text: Vec, - result: Result<(), Error>, - ) { + fn update_post_with_text_and_assert(&mut self, new_text: Vec, result: Result<(), Error>) { let add_post_result = Discussions::update_post( self.origin.clone().into(), self.author_id, @@ -414,8 +410,7 @@ fn add_discussion_thread_fails_because_of_max_thread_by_same_author_in_a_row_lim .unwrap(); } - discussion_fixture - .create_discussion_and_assert(Err(Error::MaxThreadInARowLimitExceeded)); + discussion_fixture.create_discussion_and_assert(Err(Error::MaxThreadInARowLimitExceeded)); }); } diff --git a/runtime-modules/proposals/engine/src/tests/mod.rs b/runtime-modules/proposals/engine/src/tests/mod.rs index 5bf8fce618..b8ff491528 100644 --- a/runtime-modules/proposals/engine/src/tests/mod.rs +++ b/runtime-modules/proposals/engine/src/tests/mod.rs @@ -531,8 +531,7 @@ fn vote_fails_with_not_active_proposal() { run_to_block_and_finalize(2); let mut vote_generator_to_fail = VoteGenerator::new(proposal_id); - vote_generator_to_fail - .vote_and_assert(VoteKind::Approve, Err(Error::ProposalFinalized)); + vote_generator_to_fail.vote_and_assert(VoteKind::Approve, Err(Error::ProposalFinalized)); }); } @@ -554,10 +553,7 @@ fn vote_fails_on_double_voting() { vote_generator.auto_increment_voter_id = false; vote_generator.vote_and_assert_ok(VoteKind::Approve); - vote_generator.vote_and_assert( - VoteKind::Approve, - Err(Error::AlreadyVoted), - ); + vote_generator.vote_and_assert(VoteKind::Approve, Err(Error::AlreadyVoted)); }); } @@ -903,7 +899,8 @@ fn create_proposal_fails_on_exceeding_max_active_proposals_count() { } let dummy_proposal = DummyProposalFixture::default(); - dummy_proposal.create_proposal_and_assert(Err(Error::MaxActiveProposalNumberExceeded.into())); + dummy_proposal + .create_proposal_and_assert(Err(Error::MaxActiveProposalNumberExceeded.into())); // internal active proposal counter check assert_eq!(::get(), 100); }); @@ -992,7 +989,8 @@ fn create_dummy_proposal_fail_with_stake_on_empty_account() { .with_origin(RawOrigin::Signed(account_id)) .with_stake(required_stake); - dummy_proposal.create_proposal_and_assert(Err(Error::Other("too few free funds in account"))); + dummy_proposal + .create_proposal_and_assert(Err(Error::Other("too few free funds in account"))); }); } @@ -1018,8 +1016,7 @@ fn create_proposal_fais_with_invalid_stake_parameters() { .with_parameters(parameters_fixture_stake_300.params()) .with_stake(200); - dummy_proposal - .create_proposal_and_assert(Err(Error::StakeDiffersFromRequired.into())); + dummy_proposal.create_proposal_and_assert(Err(Error::StakeDiffersFromRequired.into())); }); } /* TODO: restore after the https://github.com/Joystream/substrate-runtime-joystream/issues/161 From 4cd3cae098bdce0bf5a32b72b8c5e41958cc66ff Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Thu, 19 Mar 2020 13:57:29 +0300 Subject: [PATCH 102/286] Update runtime version to 6.9.0 --- runtime/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index de4f5fce1b..d796798592 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -5,7 +5,7 @@ edition = '2018' name = 'joystream-node-runtime' # Follow convention: https://github.com/Joystream/substrate-runtime-joystream/issues/1 # {Authoring}.{Spec}.{Impl} of the RuntimeVersion -version = '6.8.1' +version = '6.9.0' [features] default = ['std'] From ac4ed69159caf66255cc6df3af9419d9bd6d8e99 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Thu, 19 Mar 2020 14:13:33 +0300 Subject: [PATCH 103/286] Fix stake module API change issues --- .../proposals/engine/src/tests/mock/balance_manager.rs | 2 +- runtime-modules/proposals/engine/src/types/stakes.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime-modules/proposals/engine/src/tests/mock/balance_manager.rs b/runtime-modules/proposals/engine/src/tests/mock/balance_manager.rs index 3116ed4ca1..663bebd7a4 100644 --- a/runtime-modules/proposals/engine/src/tests/mock/balance_manager.rs +++ b/runtime-modules/proposals/engine/src/tests/mock/balance_manager.rs @@ -23,7 +23,7 @@ impl stake::StakingEventsHandler for BalanceManagerStakingEventsHandler { fn slashed( _id: &u64, - _slash_id: &u64, + _slash_id: Option<::SlashId>, slashed_amount: stake::BalanceOf, _remaining_stake: stake::BalanceOf, _imbalance: stake::NegativeImbalance, diff --git a/runtime-modules/proposals/engine/src/types/stakes.rs b/runtime-modules/proposals/engine/src/types/stakes.rs index 6f0e97902c..49b6019f05 100644 --- a/runtime-modules/proposals/engine/src/types/stakes.rs +++ b/runtime-modules/proposals/engine/src/types/stakes.rs @@ -38,7 +38,7 @@ impl stake::StakingEventsHandler for StakingEventsHandler { /// Empty handler for slashing fn slashed( _: &::StakeId, - _: &::SlashId, + _: Option<::SlashId>, _: BalanceOf, _: BalanceOf, remaining_imbalance: NegativeImbalance, From 8161ab4c7441257feb1fbf2fcf243e9451addf49 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Thu, 19 Mar 2020 14:25:05 +0300 Subject: [PATCH 104/286] Migrate proposals to the new stake module API - use slash_immediate() instead of initiate_slashing() --- .../proposals/engine/src/types/stakes.rs | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/runtime-modules/proposals/engine/src/types/stakes.rs b/runtime-modules/proposals/engine/src/types/stakes.rs index 49b6019f05..e4c833c0e1 100644 --- a/runtime-modules/proposals/engine/src/types/stakes.rs +++ b/runtime-modules/proposals/engine/src/types/stakes.rs @@ -139,8 +139,9 @@ impl StakeHandler for DefaultStakeHandler { stake_id: ::StakeId, slash_balance: BalanceOf, ) -> Result<(), &'static str> { - let _slash_id = - stake::Module::::initiate_slashing(&stake_id, slash_balance, T::BlockNumber::zero()) + + let _ignored_successful_result = + stake::Module::::slash_immediate(&stake_id, slash_balance, false) .map_err(WrappedError)?; Ok(()) @@ -264,3 +265,20 @@ impl From>> f } } } + +// error conversion for the Wrapped StakeActionError with the inner ImmediateSlashingError +impl From>> for &str { + fn from(wrapper: WrappedError>) -> Self { + { + match wrapper.0 { + stake::StakeActionError::StakeNotFound => "StakeNotFound", + stake::StakeActionError::Error(err) => match err { + stake::ImmediateSlashingError::NotStaked => "NotStaked", + stake::ImmediateSlashingError::SlashAmountShouldBeGreaterThanZero => { + "SlashAmountShouldBeGreaterThanZero" + } + } + } + } + } +} From 6da44c146f049f998a87f54efeee0d6b47af0f97 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Thu, 19 Mar 2020 17:47:09 +0300 Subject: [PATCH 105/286] Restore commented RejectionFee slashing test --- .../engine/src/tests/mock/balance_manager.rs | 11 +++------ .../proposals/engine/src/tests/mod.rs | 24 +++++++++---------- .../proposals/engine/src/types/stakes.rs | 7 ++---- 3 files changed, 17 insertions(+), 25 deletions(-) diff --git a/runtime-modules/proposals/engine/src/tests/mock/balance_manager.rs b/runtime-modules/proposals/engine/src/tests/mock/balance_manager.rs index 663bebd7a4..6c3cef6be1 100644 --- a/runtime-modules/proposals/engine/src/tests/mock/balance_manager.rs +++ b/runtime-modules/proposals/engine/src/tests/mock/balance_manager.rs @@ -24,15 +24,10 @@ impl stake::StakingEventsHandler for BalanceManagerStakingEventsHandler { fn slashed( _id: &u64, _slash_id: Option<::SlashId>, - slashed_amount: stake::BalanceOf, + _slashed_amount: stake::BalanceOf, _remaining_stake: stake::BalanceOf, - _imbalance: stake::NegativeImbalance, + imbalance: stake::NegativeImbalance, ) -> stake::NegativeImbalance { - let default_account_id = 1; - - let (remaining_imbalance, _) = - ::Currency::slash(&default_account_id, slashed_amount); - - remaining_imbalance + imbalance } } diff --git a/runtime-modules/proposals/engine/src/tests/mod.rs b/runtime-modules/proposals/engine/src/tests/mod.rs index b8ff491528..d2ebd725a6 100644 --- a/runtime-modules/proposals/engine/src/tests/mod.rs +++ b/runtime-modules/proposals/engine/src/tests/mod.rs @@ -1019,7 +1019,7 @@ fn create_proposal_fais_with_invalid_stake_parameters() { dummy_proposal.create_proposal_and_assert(Err(Error::StakeDiffersFromRequired.into())); }); } -/* TODO: restore after the https://github.com/Joystream/substrate-runtime-joystream/issues/161 +// TODO: restore after the https://github.com/Joystream/substrate-runtime-joystream/issues/161 // issue will be fixed: "Fix stake module and allow slashing and unstaking in the same block." #[test] fn finalize_expired_proposal_and_check_stake_removing_with_balance_checks_succeeds() { @@ -1050,7 +1050,7 @@ fn finalize_expired_proposal_and_check_stake_removing_with_balance_checks_succee account_balance ); - let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(())).unwrap(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); assert_eq!( ::Currency::total_balance(&account_id), account_balance - stake_amount @@ -1059,17 +1059,17 @@ fn finalize_expired_proposal_and_check_stake_removing_with_balance_checks_succee let mut proposal = >::get(proposal_id); let mut expected_proposal = Proposal { - proposal_type: 1, parameters, proposer_id: 1, created_at: 1, status: ProposalStatus::Active, title: b"title".to_vec(), - body: b"body".to_vec(), - approved_at: None, + description: b"description".to_vec(), voting_results: VotingResults::default(), - finalized_at: None, - stake_id: Some(0), // valid stake_id + stake_data: Some(StakeData { + stake_id: 0, + source_account_id: 1, + }), }; assert_eq!(proposal, expected_proposal); @@ -1078,23 +1078,23 @@ fn finalize_expired_proposal_and_check_stake_removing_with_balance_checks_succee proposal = >::get(proposal_id); - expected_proposal.stake_id = None; - expected_proposal.finalized_at = Some(4); - expected_proposal.status = ProposalStatus::Finalized(FinalizationStatus { + expected_proposal.status = ProposalStatus::Finalized(FinalizationData { proposal_status: ProposalDecisionStatus::Expired, + finalized_at: 4, finalization_error: None, }); + expected_proposal.stake_data = None; assert_eq!(proposal, expected_proposal); - let rejection_fee = >::get(); + let rejection_fee = RejectionFee::get(); assert_eq!( ::Currency::total_balance(&account_id), account_balance - rejection_fee ); }); } -*/ + #[test] fn finalize_proposal_using_stake_mocks_succeeds() { handle_mock(|| { diff --git a/runtime-modules/proposals/engine/src/types/stakes.rs b/runtime-modules/proposals/engine/src/types/stakes.rs index e4c833c0e1..79d4897336 100644 --- a/runtime-modules/proposals/engine/src/types/stakes.rs +++ b/runtime-modules/proposals/engine/src/types/stakes.rs @@ -3,7 +3,6 @@ use crate::Trait; use rstd::convert::From; use rstd::marker::PhantomData; use rstd::rc::Rc; -use sr_primitives::traits::Zero; use srml_support::traits::{Currency, ExistenceRequirement, Imbalance, WithdrawReasons}; use srml_support::StorageMap; @@ -127,8 +126,7 @@ impl StakeHandler for DefaultStakeHandler { /// Execute unstaking fn unstake(&self, stake_id: ::StakeId) -> Result<(), &'static str> { - stake::Module::::initiate_unstaking(&stake_id, Some(T::BlockNumber::zero())) - .map_err(WrappedError)?; + stake::Module::::initiate_unstaking(&stake_id, None).map_err(WrappedError)?; Ok(()) } @@ -139,7 +137,6 @@ impl StakeHandler for DefaultStakeHandler { stake_id: ::StakeId, slash_balance: BalanceOf, ) -> Result<(), &'static str> { - let _ignored_successful_result = stake::Module::::slash_immediate(&stake_id, slash_balance, false) .map_err(WrappedError)?; @@ -277,7 +274,7 @@ impl From>> stake::ImmediateSlashingError::SlashAmountShouldBeGreaterThanZero => { "SlashAmountShouldBeGreaterThanZero" } - } + }, } } } From 269519e53c974d2554eab83b2f9567a3565b98a7 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Mon, 23 Mar 2020 17:44:50 +0300 Subject: [PATCH 106/286] Add runtime proposals integration test --- runtime-modules/proposals/engine/src/lib.rs | 3 - .../proposals/engine/src/tests/mod.rs | 79 +++++- runtime/src/lib.rs | 5 +- runtime/src/test/mod.rs | 5 + runtime/src/test/proposals_integration.rs | 236 ++++++++++++++++++ 5 files changed, 322 insertions(+), 6 deletions(-) create mode 100644 runtime/src/test/mod.rs create mode 100644 runtime/src/test/proposals_integration.rs diff --git a/runtime-modules/proposals/engine/src/lib.rs b/runtime-modules/proposals/engine/src/lib.rs index 7a5a827c8f..b256ab065b 100644 --- a/runtime-modules/proposals/engine/src/lib.rs +++ b/runtime-modules/proposals/engine/src/lib.rs @@ -17,9 +17,6 @@ // Do not delete! Cannot be uncommented by default, because of Parity decl_module! issue. //#![warn(missing_docs)] -// TODO: Test module after the https://github.com/Joystream/substrate-runtime-joystream/issues/161 -// issue will be fixed: "Fix stake module and allow slashing and unstaking in the same block." -// TODO: Test cancellation, rejection fees // TODO: Test StakingEventHandler // TODO: Test refund_proposal_stake() diff --git a/runtime-modules/proposals/engine/src/tests/mod.rs b/runtime-modules/proposals/engine/src/tests/mod.rs index d2ebd725a6..31b59669e9 100644 --- a/runtime-modules/proposals/engine/src/tests/mod.rs +++ b/runtime-modules/proposals/engine/src/tests/mod.rs @@ -1019,8 +1019,7 @@ fn create_proposal_fais_with_invalid_stake_parameters() { dummy_proposal.create_proposal_and_assert(Err(Error::StakeDiffersFromRequired.into())); }); } -// TODO: restore after the https://github.com/Joystream/substrate-runtime-joystream/issues/161 -// issue will be fixed: "Fix stake module and allow slashing and unstaking in the same block." + #[test] fn finalize_expired_proposal_and_check_stake_removing_with_balance_checks_succeeds() { initial_test_ext().execute_with(|| { @@ -1095,6 +1094,82 @@ fn finalize_expired_proposal_and_check_stake_removing_with_balance_checks_succee }); } +#[test] +fn proposal_cancellation_with_slashes_with_balance_checks_succeeds() { + initial_test_ext().execute_with(|| { + let account_id = 1; + + let stake_amount = 200; + let parameters = ProposalParameters { + voting_period: 3, + approval_quorum_percentage: 50, + approval_threshold_percentage: 60, + slashing_quorum_percentage: 60, + slashing_threshold_percentage: 60, + grace_period: 5, + required_stake: Some(stake_amount), + }; + let dummy_proposal = DummyProposalFixture::default() + .with_parameters(parameters) + .with_origin(RawOrigin::Signed(account_id)) + .with_stake(stake_amount); + + let account_balance = 500; + let _imbalance = + ::Currency::deposit_creating(&account_id, account_balance); + + assert_eq!( + ::Currency::total_balance(&account_id), + account_balance + ); + + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); + assert_eq!( + ::Currency::total_balance(&account_id), + account_balance - stake_amount + ); + + let mut proposal = >::get(proposal_id); + + let mut expected_proposal = Proposal { + parameters, + proposer_id: 1, + created_at: 1, + status: ProposalStatus::Active, + title: b"title".to_vec(), + description: b"description".to_vec(), + voting_results: VotingResults::default(), + stake_data: Some(StakeData { + stake_id: 0, + source_account_id: 1, + }), + }; + + assert_eq!(proposal, expected_proposal); + + let cancel_proposal_fixture = CancelProposalFixture::new(proposal_id); + + cancel_proposal_fixture.cancel_and_assert(Ok(())); + + proposal = >::get(proposal_id); + + expected_proposal.status = ProposalStatus::Finalized(FinalizationData { + proposal_status: ProposalDecisionStatus::Canceled, + finalized_at: 1, + finalization_error: None, + }); + expected_proposal.stake_data = None; + + assert_eq!(proposal, expected_proposal); + + let cancellation_fee = CancellationFee::get(); + assert_eq!( + ::Currency::total_balance(&account_id), + account_balance - cancellation_fee + ); + }); +} + #[test] fn finalize_proposal_using_stake_mocks_succeeds() { handle_mock(|| { diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 376a9def01..9aa7a17b83 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -1,4 +1,4 @@ -//! The Substrate Node Template runtime. This can be compiled with `#[no_std]`, ready for Wasm. +//! The Joystream Substrate Node runtime. #![cfg_attr(not(feature = "std"), no_std)] // `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256. @@ -7,6 +7,9 @@ // TODO: remove after post-Rome substrate upgrade #![allow(array_into_iter)] +// Runtime integration tests +mod test; + // Make the WASM binary available. // This is required only by the node build. // A dummy wasm_binary.rs will be built for the IDE. diff --git a/runtime/src/test/mod.rs b/runtime/src/test/mod.rs new file mode 100644 index 0000000000..46c37939e8 --- /dev/null +++ b/runtime/src/test/mod.rs @@ -0,0 +1,5 @@ +//! The Joystream Substrate Node runtime integration tests. + +#![cfg(test)] + +mod proposals_integration; diff --git a/runtime/src/test/proposals_integration.rs b/runtime/src/test/proposals_integration.rs new file mode 100644 index 0000000000..de160b7471 --- /dev/null +++ b/runtime/src/test/proposals_integration.rs @@ -0,0 +1,236 @@ +//! Proposals integration tests - with stake, membership, governance modules. + +#![cfg(test)] + +use crate::{ProposalCancellationFee, Runtime}; +use codec::Encode; +use membership::members; +use proposals_engine::{ + BalanceOf, Error, FinalizationData, Proposal, ProposalDecisionStatus, ProposalParameters, + ProposalStatus, StakeData, VotingResults, +}; +use sr_primitives::traits::DispatchResult; +use sr_primitives::AccountId32; +use srml_support::traits::Currency; +use system::RawOrigin; + +fn initial_test_ext() -> runtime_io::TestExternalities { + let t = system::GenesisConfig::default() + .build_storage::() + .unwrap(); + + t.into() +} + +type Membership = membership::members::Module; +type ProposalsEngine = proposals_engine::Module; + +#[derive(Clone)] +struct DummyProposalFixture { + parameters: ProposalParameters, + origin: RawOrigin, + proposer_id: u64, + proposal_code: Vec, + title: Vec, + description: Vec, + stake_balance: Option>, +} + +impl Default for DummyProposalFixture { + fn default() -> Self { + let title = b"title".to_vec(); + let description = b"description".to_vec(); + let dummy_proposal = proposals_codex::Call::::text_proposal( + title.clone(), + description.clone(), + b"text".to_vec(), + ); + + DummyProposalFixture { + parameters: ProposalParameters { + voting_period: 3, + approval_quorum_percentage: 60, + approval_threshold_percentage: 60, + slashing_quorum_percentage: 60, + slashing_threshold_percentage: 60, + grace_period: 0, + required_stake: None, + }, + origin: RawOrigin::Signed(::AccountId::default()), + proposer_id: 0, + proposal_code: dummy_proposal.encode(), + title, + description, + stake_balance: None, + } + } +} + +impl DummyProposalFixture { + fn with_parameters(self, parameters: ProposalParameters) -> Self { + DummyProposalFixture { parameters, ..self } + } + + fn with_origin(self, origin: RawOrigin) -> Self { + DummyProposalFixture { origin, ..self } + } + + fn with_stake(self, stake_balance: BalanceOf) -> Self { + DummyProposalFixture { + stake_balance: Some(stake_balance), + ..self + } + } + + fn with_proposer(self, proposer_id: u64) -> Self { + DummyProposalFixture { + proposer_id, + ..self + } + } + + fn create_proposal_and_assert(self, result: Result) -> Option { + let proposal_id_result = ProposalsEngine::create_proposal( + self.origin.into(), + self.proposer_id, + self.parameters, + self.title, + self.description, + self.stake_balance, + self.proposal_code, + ); + assert_eq!(proposal_id_result, result); + + proposal_id_result.ok() + } +} + +struct CancelProposalFixture { + origin: RawOrigin, + proposal_id: u32, + proposer_id: u64, +} + +impl CancelProposalFixture { + fn new(proposal_id: u32) -> Self { + let account_id = ::AccountId::default(); + CancelProposalFixture { + proposal_id, + origin: RawOrigin::Signed(account_id), + proposer_id: 0, + } + } + + fn with_proposer(self, proposer_id: u64) -> Self { + CancelProposalFixture { + proposer_id, + ..self + } + } + + fn cancel_and_assert(self, expected_result: DispatchResult) { + assert_eq!( + ProposalsEngine::cancel_proposal( + self.origin.into(), + self.proposer_id, + self.proposal_id + ), + expected_result + ); + } +} + + +/// Main purpose of this integration test: check balance of the member on proposal finalization (cancellation) +/// It tests StakingEventsHandler integration. Also, membership module is tested during the proposal creation (ActorOriginValidator). +#[test] +fn proposal_cancellation_with_slashes_with_balance_checks_succeeds() { + initial_test_ext().execute_with(|| { + let account_id = ::AccountId::default(); + + Membership::set_screening_authority(RawOrigin::Root.into(), account_id.clone()).unwrap(); + + Membership::add_screened_member( + RawOrigin::Signed(account_id.clone()).into(), + account_id.clone(), + members::UserInfo { + handle: Some(b"handle".to_vec()), + avatar_uri: None, + about: None, + }, + ) + .unwrap(); + let member_id = 0; // newly created member_id + + let stake_amount = 200u128; + let parameters = ProposalParameters { + voting_period: 3, + approval_quorum_percentage: 50, + approval_threshold_percentage: 60, + slashing_quorum_percentage: 60, + slashing_threshold_percentage: 60, + grace_period: 5, + required_stake: Some(stake_amount), + }; + let dummy_proposal = DummyProposalFixture::default() + .with_parameters(parameters) + .with_origin(RawOrigin::Signed(account_id.clone())) + .with_stake(stake_amount) + .with_proposer(member_id); + + let account_balance = 500; + let _imbalance = + ::Currency::deposit_creating(&account_id, account_balance); + + assert_eq!( + ::Currency::total_balance(&account_id), + account_balance + ); + + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); + assert_eq!( + ::Currency::total_balance(&account_id), + account_balance - stake_amount + ); + + let mut proposal = ProposalsEngine::proposals(proposal_id); + + let mut expected_proposal = Proposal { + parameters, + proposer_id: member_id, + created_at: 1, + status: ProposalStatus::Active, + title: b"title".to_vec(), + description: b"description".to_vec(), + voting_results: VotingResults::default(), + stake_data: Some(StakeData { + stake_id: 0, + source_account_id: account_id.clone(), + }), + }; + + assert_eq!(proposal, expected_proposal); + + let cancel_proposal_fixture = + CancelProposalFixture::new(proposal_id).with_proposer(member_id); + + cancel_proposal_fixture.cancel_and_assert(Ok(())); + + proposal = ProposalsEngine::proposals(proposal_id); + + expected_proposal.status = ProposalStatus::Finalized(FinalizationData { + proposal_status: ProposalDecisionStatus::Canceled, + finalized_at: 1, + finalization_error: None, + }); + expected_proposal.stake_data = None; + + assert_eq!(proposal, expected_proposal); + + let cancellation_fee = ProposalCancellationFee::get() as u128; + assert_eq!( + ::Currency::total_balance(&account_id), + account_balance - cancellation_fee + ); + }); +} From 8771c93a2004b88be117a2e5a006400503f59488 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 24 Mar 2020 19:13:50 +0300 Subject: [PATCH 107/286] Move origin validators to the runtime Move CouncilManager, MemberhipOriginValidator to the runtime. Issue link: https://github.com/Joystream/substrate-runtime-joystream/issues/226 --- runtime-modules/membership/src/lib.rs | 1 - runtime-modules/proposals/codex/src/lib.rs | 2 +- runtime-modules/proposals/discussion/src/lib.rs | 3 ++- runtime-modules/proposals/engine/Cargo.toml | 6 ------ runtime-modules/proposals/engine/src/lib.rs | 5 ++--- runtime-modules/proposals/engine/src/types/mod.rs | 3 --- runtime/src/integration/mod.rs | 1 + .../proposals}/council_origin_validator.rs | 13 +++++++------ .../proposals/membership_origin_validator.rs | 0 runtime/src/integration/proposals/mod.rs | 5 +++++ runtime/src/lib.rs | 8 +++++--- 11 files changed, 23 insertions(+), 24 deletions(-) create mode 100644 runtime/src/integration/mod.rs rename {runtime-modules/proposals/engine/src/types => runtime/src/integration/proposals}/council_origin_validator.rs (94%) rename runtime-modules/membership/src/origin_validator.rs => runtime/src/integration/proposals/membership_origin_validator.rs (100%) create mode 100644 runtime/src/integration/proposals/mod.rs diff --git a/runtime-modules/membership/src/lib.rs b/runtime-modules/membership/src/lib.rs index 2606e34df5..f3259534d5 100644 --- a/runtime-modules/membership/src/lib.rs +++ b/runtime-modules/membership/src/lib.rs @@ -3,7 +3,6 @@ pub mod genesis; pub mod members; -pub mod origin_validator; pub mod role_types; pub(crate) mod mock; diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index 5122589fba..1e6fa6d2b1 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -45,7 +45,7 @@ pub type BalanceOf = pub type NegativeImbalance = <::Currency as Currency<::AccountId>>::NegativeImbalance; -use membership::origin_validator::MemberId; +type MemberId = ::MemberId; decl_error! { pub enum Error { diff --git a/runtime-modules/proposals/discussion/src/lib.rs b/runtime-modules/proposals/discussion/src/lib.rs index c856f7c24e..22f5af5444 100644 --- a/runtime-modules/proposals/discussion/src/lib.rs +++ b/runtime-modules/proposals/discussion/src/lib.rs @@ -28,7 +28,8 @@ use srml_support::traits::Get; use types::{Post, Thread, ThreadCounter}; use common::origin_validator::ActorOriginValidator; -use membership::origin_validator::MemberId; + +type MemberId = ::MemberId; decl_event!( /// Proposals engine events diff --git a/runtime-modules/proposals/engine/Cargo.toml b/runtime-modules/proposals/engine/Cargo.toml index bf5ab3a83a..19f3027feb 100644 --- a/runtime-modules/proposals/engine/Cargo.toml +++ b/runtime-modules/proposals/engine/Cargo.toml @@ -18,7 +18,6 @@ std = [ 'stake/std', 'balances/std', 'sr-primitives/std', - 'governance/std', 'membership/std', 'common/std', @@ -97,11 +96,6 @@ default_features = false package = 'substrate-common-module' path = '../../common' -[dependencies.governance] -default_features = false -package = 'substrate-governance-module' -path = '../../governance' - [dev-dependencies] mockall = "0.6.0" diff --git a/runtime-modules/proposals/engine/src/lib.rs b/runtime-modules/proposals/engine/src/lib.rs index 7a5a827c8f..39ee5b25d2 100644 --- a/runtime-modules/proposals/engine/src/lib.rs +++ b/runtime-modules/proposals/engine/src/lib.rs @@ -23,7 +23,6 @@ // TODO: Test StakingEventHandler // TODO: Test refund_proposal_stake() -pub use types::CouncilManager; use types::FinalizedProposalData; use types::ProposalStakeManager; pub use types::{ @@ -50,16 +49,16 @@ use srml_support::{ use system::{ensure_root, RawOrigin}; use common::origin_validator::ActorOriginValidator; -use membership::origin_validator::MemberId; use srml_support::dispatch::Dispatchable; +type MemberId = ::MemberId; + /// Proposals engine trait. pub trait Trait: system::Trait + timestamp::Trait + stake::Trait + membership::members::Trait - + governance::council::Trait { /// Engine event type. type Event: From> + Into<::Event>; diff --git a/runtime-modules/proposals/engine/src/types/mod.rs b/runtime-modules/proposals/engine/src/types/mod.rs index d1c1f4a943..46baf075cb 100644 --- a/runtime-modules/proposals/engine/src/types/mod.rs +++ b/runtime-modules/proposals/engine/src/types/mod.rs @@ -11,12 +11,9 @@ use serde::{Deserialize, Serialize}; use srml_support::dispatch; use srml_support::traits::Currency; -mod council_origin_validator; mod proposal_statuses; mod stakes; -pub use council_origin_validator::CouncilManager; - pub use proposal_statuses::{ ApprovedProposalStatus, FinalizationData, ProposalDecisionStatus, ProposalStatus, }; diff --git a/runtime/src/integration/mod.rs b/runtime/src/integration/mod.rs new file mode 100644 index 0000000000..6ac240fd16 --- /dev/null +++ b/runtime/src/integration/mod.rs @@ -0,0 +1 @@ +pub mod proposals; \ No newline at end of file diff --git a/runtime-modules/proposals/engine/src/types/council_origin_validator.rs b/runtime/src/integration/proposals/council_origin_validator.rs similarity index 94% rename from runtime-modules/proposals/engine/src/types/council_origin_validator.rs rename to runtime/src/integration/proposals/council_origin_validator.rs index 6ae22964d5..0829b80c5d 100644 --- a/runtime-modules/proposals/engine/src/types/council_origin_validator.rs +++ b/runtime/src/integration/proposals/council_origin_validator.rs @@ -1,8 +1,9 @@ use rstd::marker::PhantomData; -use crate::VotersParameters; +use proposals_engine::VotersParameters; use common::origin_validator::ActorOriginValidator; -use membership::origin_validator::{MemberId, MembershipOriginValidator}; + +use super::{MembershipOriginValidator, MemberId}; /// Handles work with the council. /// Provides implementations for ActorOriginValidator and VotersParameters. @@ -10,7 +11,7 @@ pub struct CouncilManager { marker: PhantomData, } -impl +impl ActorOriginValidator<::Origin, MemberId, ::AccountId> for CouncilManager { @@ -30,7 +31,7 @@ impl } } -impl VotersParameters for CouncilManager { +impl VotersParameters for CouncilManager { /// Implement total_voters_count() as council size fn total_voters_count() -> u32 { >::active_council().len() as u32 @@ -40,8 +41,8 @@ impl VotersParameters for CouncilManager { #[cfg(test)] mod tests { use crate::tests::mock::{initial_test_ext, Test}; - use crate::CouncilManager; - use crate::VotersParameters; + use super::CouncilManager; + use proposals_engine::VotersParameters; use common::origin_validator::ActorOriginValidator; use membership::members::UserInfo; use system::RawOrigin; diff --git a/runtime-modules/membership/src/origin_validator.rs b/runtime/src/integration/proposals/membership_origin_validator.rs similarity index 100% rename from runtime-modules/membership/src/origin_validator.rs rename to runtime/src/integration/proposals/membership_origin_validator.rs diff --git a/runtime/src/integration/proposals/mod.rs b/runtime/src/integration/proposals/mod.rs new file mode 100644 index 0000000000..95d237b3c7 --- /dev/null +++ b/runtime/src/integration/proposals/mod.rs @@ -0,0 +1,5 @@ +mod membership_origin_validator; +mod council_origin_validator; + +pub use council_origin_validator::CouncilManager; +pub use membership_origin_validator::{MembershipOriginValidator, MemberId}; \ No newline at end of file diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 003d84a60f..07ecc89a74 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -13,6 +13,8 @@ #[cfg(feature = "std")] include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs")); +mod integration; + use authority_discovery_primitives::{ AuthorityId as EncodedAuthorityId, Signature as EncodedSignature, }; @@ -54,7 +56,7 @@ pub use srml_support::{ pub use staking::StakerStatus; pub use timestamp::Call as TimestampCall; -use membership::origin_validator::MembershipOriginValidator; +use integration::proposals::{MembershipOriginValidator, CouncilManager}; /// An index to a block. pub type BlockNumber = u32; @@ -816,8 +818,8 @@ parameter_types! { impl proposals_engine::Trait for Runtime { type Event = Event; type ProposerOriginValidator = MembershipOriginValidator; - type VoterOriginValidator = proposals_engine::CouncilManager; - type TotalVotersCounter = proposals_engine::CouncilManager; + type VoterOriginValidator = CouncilManager; + type TotalVotersCounter = CouncilManager; type ProposalId = u32; type StakeHandlerProvider = proposals_engine::DefaultStakeHandlerProvider; type CancellationFee = ProposalCancellationFee; From 522dd9e269a0a92ef09b7a1304a4158933df5385 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 24 Mar 2020 19:47:51 +0300 Subject: [PATCH 108/286] Fix integration tests Fix tests for moved CouncilManager and MemberhipOriginValidator in the runtime proposal integration --- runtime-modules/proposals/codex/src/lib.rs | 2 +- .../proposals/discussion/src/lib.rs | 2 +- runtime-modules/proposals/engine/src/lib.rs | 7 +- .../proposals/engine/src/tests/mock/mod.rs | 16 --- runtime/src/integration/mod.rs | 2 +- .../proposals/council_origin_validator.rs | 105 ++++++++++++------ .../proposals/membership_origin_validator.rs | 55 +++++---- runtime/src/integration/proposals/mod.rs | 4 +- runtime/src/lib.rs | 2 +- 9 files changed, 114 insertions(+), 81 deletions(-) diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index 1e6fa6d2b1..37e34a490d 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -45,7 +45,7 @@ pub type BalanceOf = pub type NegativeImbalance = <::Currency as Currency<::AccountId>>::NegativeImbalance; -type MemberId = ::MemberId; +type MemberId = ::MemberId; decl_error! { pub enum Error { diff --git a/runtime-modules/proposals/discussion/src/lib.rs b/runtime-modules/proposals/discussion/src/lib.rs index 22f5af5444..2478741954 100644 --- a/runtime-modules/proposals/discussion/src/lib.rs +++ b/runtime-modules/proposals/discussion/src/lib.rs @@ -29,7 +29,7 @@ use types::{Post, Thread, ThreadCounter}; use common::origin_validator::ActorOriginValidator; -type MemberId = ::MemberId; +type MemberId = ::MemberId; decl_event!( /// Proposals engine events diff --git a/runtime-modules/proposals/engine/src/lib.rs b/runtime-modules/proposals/engine/src/lib.rs index 39ee5b25d2..430ee1ba94 100644 --- a/runtime-modules/proposals/engine/src/lib.rs +++ b/runtime-modules/proposals/engine/src/lib.rs @@ -51,14 +51,11 @@ use system::{ensure_root, RawOrigin}; use common::origin_validator::ActorOriginValidator; use srml_support::dispatch::Dispatchable; -type MemberId = ::MemberId; +type MemberId = ::MemberId; /// Proposals engine trait. pub trait Trait: - system::Trait - + timestamp::Trait - + stake::Trait - + membership::members::Trait + system::Trait + timestamp::Trait + stake::Trait + membership::members::Trait { /// Engine event type. type Event: From> + Into<::Event>; diff --git a/runtime-modules/proposals/engine/src/tests/mock/mod.rs b/runtime-modules/proposals/engine/src/tests/mock/mod.rs index f7ed9fabdf..09f60b290d 100644 --- a/runtime-modules/proposals/engine/src/tests/mock/mod.rs +++ b/runtime-modules/proposals/engine/src/tests/mock/mod.rs @@ -41,22 +41,11 @@ mod membership_mod { pub use membership::members::Event; } -mod council_mod { - pub use governance::council::Event; -} - -// impl_outer_dispatch! { -// pub enum Call for Test where origin: Origin { -// engine::ProposalsEngine, -// } -// } - impl_outer_event! { pub enum TestEvent for Test { balances, engine, membership_mod, - council_mod, } } @@ -87,11 +76,6 @@ impl common::currency::GovernanceCurrency for Test { type Currency = balances::Module; } -impl governance::council::Trait for Test { - type Event = TestEvent; - type CouncilTermEnded = (); -} - impl proposals::Trait for Test {} impl stake::Trait for Test { diff --git a/runtime/src/integration/mod.rs b/runtime/src/integration/mod.rs index 6ac240fd16..8d18108be0 100644 --- a/runtime/src/integration/mod.rs +++ b/runtime/src/integration/mod.rs @@ -1 +1 @@ -pub mod proposals; \ No newline at end of file +pub mod proposals; diff --git a/runtime/src/integration/proposals/council_origin_validator.rs b/runtime/src/integration/proposals/council_origin_validator.rs index 0829b80c5d..74fc4fa769 100644 --- a/runtime/src/integration/proposals/council_origin_validator.rs +++ b/runtime/src/integration/proposals/council_origin_validator.rs @@ -1,9 +1,9 @@ use rstd::marker::PhantomData; -use proposals_engine::VotersParameters; use common::origin_validator::ActorOriginValidator; +use proposals_engine::VotersParameters; -use super::{MembershipOriginValidator, MemberId}; +use super::{MemberId, MembershipOriginValidator}; /// Handles work with the council. /// Provides implementations for ActorOriginValidator and VotersParameters. @@ -40,25 +40,36 @@ impl VotersParameters for CouncilManager { #[cfg(test)] mod tests { - use crate::tests::mock::{initial_test_ext, Test}; use super::CouncilManager; - use proposals_engine::VotersParameters; + use crate::Runtime; use common::origin_validator::ActorOriginValidator; use membership::members::UserInfo; + use proposals_engine::VotersParameters; + use sr_primitives::AccountId32; use system::RawOrigin; - type Membership = membership::members::Module; - type Council = governance::council::Module; + type Council = governance::council::Module; + + fn initial_test_ext() -> runtime_io::TestExternalities { + let t = system::GenesisConfig::default() + .build_storage::() + .unwrap(); + + t.into() + } + + type Membership = membership::members::Module; + type ProposalsEngine = proposals_engine::Module; #[test] fn council_origin_validator_fails_with_unregistered_member() { initial_test_ext().execute_with(|| { - let origin = RawOrigin::Signed(1); + let origin = RawOrigin::Signed(AccountId32::default()); let member_id = 1; let error = "Membership validation failed: cannot find a profile for a member"; let validation_result = - CouncilManager::::ensure_actor_origin(origin.into(), member_id); + CouncilManager::::ensure_actor_origin(origin.into(), member_id); assert_eq!(validation_result, Err(error)); }); @@ -67,17 +78,28 @@ mod tests { #[test] fn council_origin_validator_succeeds() { initial_test_ext().execute_with(|| { - assert!(Council::set_council(system::RawOrigin::Root.into(), vec![1, 2, 3]).is_ok()); + let councilor1 = AccountId32::default(); + let councilor2: [u8; 32] = [2; 32]; + let councilor3: [u8; 32] = [3; 32]; - let account_id = 1; - let origin = RawOrigin::Signed(account_id); - let authority_account_id = 10; - Membership::set_screening_authority(RawOrigin::Root.into(), authority_account_id) - .unwrap(); + assert!(Council::set_council( + system::RawOrigin::Root.into(), + vec![councilor1, councilor2.into(), councilor3.into()] + ) + .is_ok()); + + let account_id = AccountId32::default(); + let origin = RawOrigin::Signed(account_id.clone()); + let authority_account_id = AccountId32::default(); + Membership::set_screening_authority( + RawOrigin::Root.into(), + authority_account_id.clone(), + ) + .unwrap(); Membership::add_screened_member( RawOrigin::Signed(authority_account_id).into(), - account_id, + account_id.clone(), UserInfo { handle: Some(b"handle".to_vec()), avatar_uri: None, @@ -88,7 +110,7 @@ mod tests { let member_id = 0; // newly created member_id let validation_result = - CouncilManager::::ensure_actor_origin(origin.into(), member_id); + CouncilManager::::ensure_actor_origin(origin.into(), member_id); assert_eq!(validation_result, Ok(account_id)); }); @@ -97,16 +119,19 @@ mod tests { #[test] fn council_origin_validator_fails_with_incompatible_account_id_and_member_id() { initial_test_ext().execute_with(|| { - let account_id = 1; + let account_id = AccountId32::default(); let error = "Membership validation failed: given account doesn't match with profile accounts"; - let authority_account_id = 10; - Membership::set_screening_authority(RawOrigin::Root.into(), authority_account_id) - .unwrap(); + let authority_account_id = AccountId32::default(); + Membership::set_screening_authority( + RawOrigin::Root.into(), + authority_account_id.clone(), + ) + .unwrap(); Membership::add_screened_member( RawOrigin::Signed(authority_account_id).into(), - account_id, + account_id.clone(), UserInfo { handle: Some(b"handle".to_vec()), avatar_uri: None, @@ -116,9 +141,9 @@ mod tests { .unwrap(); let member_id = 0; // newly created member_id - let invalid_account_id = 2; - let validation_result = CouncilManager::::ensure_actor_origin( - RawOrigin::Signed(invalid_account_id).into(), + let invalid_account_id: [u8; 32] = [2; 32]; + let validation_result = CouncilManager::::ensure_actor_origin( + RawOrigin::Signed(invalid_account_id.into()).into(), member_id, ); @@ -129,12 +154,15 @@ mod tests { #[test] fn council_origin_validator_fails_with_not_council_account_id() { initial_test_ext().execute_with(|| { - let account_id = 1; - let origin = RawOrigin::Signed(account_id); + let account_id = AccountId32::default(); + let origin = RawOrigin::Signed(account_id.clone()); let error = "Council validation failed: account id doesn't belong to a council member"; - let authority_account_id = 10; - Membership::set_screening_authority(RawOrigin::Root.into(), authority_account_id) - .unwrap(); + let authority_account_id = AccountId32::default(); + Membership::set_screening_authority( + RawOrigin::Root.into(), + authority_account_id.clone(), + ) + .unwrap(); Membership::add_screened_member( RawOrigin::Signed(authority_account_id).into(), @@ -149,7 +177,7 @@ mod tests { let member_id = 0; // newly created member_id let validation_result = - CouncilManager::::ensure_actor_origin(origin.into(), member_id); + CouncilManager::::ensure_actor_origin(origin.into(), member_id); assert_eq!(validation_result, Err(error)); }); @@ -158,9 +186,22 @@ mod tests { #[test] fn council_size_calculation_aka_total_voters_count_succeeds() { initial_test_ext().execute_with(|| { - assert!(Council::set_council(system::RawOrigin::Root.into(), vec![1, 2, 3, 7]).is_ok()); + let councilor1 = AccountId32::default(); + let councilor2: [u8; 32] = [2; 32]; + let councilor3: [u8; 32] = [3; 32]; + let councilor4: [u8; 32] = [4; 32]; + assert!(Council::set_council( + system::RawOrigin::Root.into(), + vec![ + councilor1, + councilor2.into(), + councilor3.into(), + councilor4.into() + ] + ) + .is_ok()); - assert_eq!(CouncilManager::::total_voters_count(), 4) + assert_eq!(CouncilManager::::total_voters_count(), 4) }); } } diff --git a/runtime/src/integration/proposals/membership_origin_validator.rs b/runtime/src/integration/proposals/membership_origin_validator.rs index dbe4655871..03576853b9 100644 --- a/runtime/src/integration/proposals/membership_origin_validator.rs +++ b/runtime/src/integration/proposals/membership_origin_validator.rs @@ -42,27 +42,32 @@ impl #[cfg(test)] mod tests { - use crate::members::UserInfo; - use crate::mock::{Test, TestExternalitiesBuilder}; - use crate::origin_validator::MembershipOriginValidator; + use super::MembershipOriginValidator; + use crate::Runtime; use common::origin_validator::ActorOriginValidator; + use membership::members::UserInfo; + use sr_primitives::AccountId32; use system::RawOrigin; - type Membership = crate::members::Module; + type Membership = crate::members::Module; - pub fn initial_test_ext() -> runtime_io::TestExternalities { - TestExternalitiesBuilder::::default().build() + fn initial_test_ext() -> runtime_io::TestExternalities { + let t = system::GenesisConfig::default() + .build_storage::() + .unwrap(); + + t.into() } #[test] fn membership_origin_validator_fails_with_unregistered_member() { initial_test_ext().execute_with(|| { - let origin = RawOrigin::Signed(1); + let origin = RawOrigin::Signed(AccountId32::default()); let member_id = 1; let error = "Membership validation failed: cannot find a profile for a member"; let validation_result = - MembershipOriginValidator::::ensure_actor_origin(origin.into(), member_id); + MembershipOriginValidator::::ensure_actor_origin(origin.into(), member_id); assert_eq!(validation_result, Err(error)); }); @@ -71,15 +76,18 @@ mod tests { #[test] fn membership_origin_validator_succeeds() { initial_test_ext().execute_with(|| { - let account_id = 1; - let origin = RawOrigin::Signed(account_id); - let authority_account_id = 10; - Membership::set_screening_authority(RawOrigin::Root.into(), authority_account_id) - .unwrap(); + let account_id = AccountId32::default(); + let origin = RawOrigin::Signed(account_id.clone()); + let authority_account_id = AccountId32::default(); + Membership::set_screening_authority( + RawOrigin::Root.into(), + authority_account_id.clone(), + ) + .unwrap(); Membership::add_screened_member( RawOrigin::Signed(authority_account_id).into(), - account_id, + account_id.clone(), UserInfo { handle: Some(b"handle".to_vec()), avatar_uri: None, @@ -90,7 +98,7 @@ mod tests { let member_id = 0; // newly created member_id let validation_result = - MembershipOriginValidator::::ensure_actor_origin(origin.into(), member_id); + MembershipOriginValidator::::ensure_actor_origin(origin.into(), member_id); assert_eq!(validation_result, Ok(account_id)); }); @@ -99,12 +107,15 @@ mod tests { #[test] fn membership_origin_validator_fails_with_incompatible_account_id_and_member_id() { initial_test_ext().execute_with(|| { - let account_id = 1; + let account_id = AccountId32::default(); let error = "Membership validation failed: given account doesn't match with profile accounts"; - let authority_account_id = 10; - Membership::set_screening_authority(RawOrigin::Root.into(), authority_account_id) - .unwrap(); + let authority_account_id = AccountId32::default(); + Membership::set_screening_authority( + RawOrigin::Root.into(), + authority_account_id.clone(), + ) + .unwrap(); Membership::add_screened_member( RawOrigin::Signed(authority_account_id).into(), @@ -118,9 +129,9 @@ mod tests { .unwrap(); let member_id = 0; // newly created member_id - let invalid_account_id = 2; - let validation_result = MembershipOriginValidator::::ensure_actor_origin( - RawOrigin::Signed(invalid_account_id).into(), + let invalid_account_id: [u8; 32] = [2; 32]; + let validation_result = MembershipOriginValidator::::ensure_actor_origin( + RawOrigin::Signed(invalid_account_id.into()).into(), member_id, ); diff --git a/runtime/src/integration/proposals/mod.rs b/runtime/src/integration/proposals/mod.rs index 95d237b3c7..95ccc25a6b 100644 --- a/runtime/src/integration/proposals/mod.rs +++ b/runtime/src/integration/proposals/mod.rs @@ -1,5 +1,5 @@ -mod membership_origin_validator; mod council_origin_validator; +mod membership_origin_validator; pub use council_origin_validator::CouncilManager; -pub use membership_origin_validator::{MembershipOriginValidator, MemberId}; \ No newline at end of file +pub use membership_origin_validator::{MemberId, MembershipOriginValidator}; diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 07ecc89a74..172f0aae32 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -56,7 +56,7 @@ pub use srml_support::{ pub use staking::StakerStatus; pub use timestamp::Call as TimestampCall; -use integration::proposals::{MembershipOriginValidator, CouncilManager}; +use integration::proposals::{CouncilManager, MembershipOriginValidator}; /// An index to a block. pub type BlockNumber = u32; From d96083329e0688820c4026cc1b6afda2554350a7 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Wed, 25 Mar 2020 10:36:09 +0300 Subject: [PATCH 109/286] Move StakingEventsHandler to the runtime - move StakingEventsHandler to the runtime integration folder from the proposals engine module. --- runtime-modules/proposals/engine/src/lib.rs | 4 +- .../proposals/engine/src/types/mod.rs | 2 +- .../proposals/engine/src/types/stakes.rs | 37 +-------------- .../proposals/council_origin_validator.rs | 1 - runtime/src/integration/proposals/mod.rs | 2 + .../proposals/staking_events_handler.rs | 45 +++++++++++++++++++ runtime/src/lib.rs | 2 +- 7 files changed, 52 insertions(+), 41 deletions(-) create mode 100644 runtime/src/integration/proposals/staking_events_handler.rs diff --git a/runtime-modules/proposals/engine/src/lib.rs b/runtime-modules/proposals/engine/src/lib.rs index 430ee1ba94..3954f0d280 100644 --- a/runtime-modules/proposals/engine/src/lib.rs +++ b/runtime-modules/proposals/engine/src/lib.rs @@ -27,7 +27,7 @@ use types::FinalizedProposalData; use types::ProposalStakeManager; pub use types::{ ApprovedProposalStatus, FinalizationData, Proposal, ProposalDecisionStatus, ProposalParameters, - ProposalStatus, StakeData, StakingEventsHandler, VotingResults, + ProposalStatus, StakeData, VotingResults, }; pub use types::{BalanceOf, CurrencyOf, NegativeImbalance}; pub use types::{DefaultStakeHandlerProvider, StakeHandler, StakeHandlerProvider}; @@ -619,7 +619,7 @@ impl Module { //TODO: candidate for invariant break or error saving to the state /// Callback from StakingEventsHandler. Refunds unstaked imbalance back to the source account - pub(crate) fn refund_proposal_stake(stake_id: T::StakeId, imbalance: NegativeImbalance) { + pub fn refund_proposal_stake(stake_id: T::StakeId, imbalance: NegativeImbalance) { if >::exists(stake_id) { //TODO: handle non existence diff --git a/runtime-modules/proposals/engine/src/types/mod.rs b/runtime-modules/proposals/engine/src/types/mod.rs index 46baf075cb..74cf8e8f1e 100644 --- a/runtime-modules/proposals/engine/src/types/mod.rs +++ b/runtime-modules/proposals/engine/src/types/mod.rs @@ -19,7 +19,7 @@ pub use proposal_statuses::{ }; pub(crate) use stakes::ProposalStakeManager; pub use stakes::{ - DefaultStakeHandlerProvider, StakeHandler, StakeHandlerProvider, StakingEventsHandler, + DefaultStakeHandlerProvider, StakeHandler, StakeHandlerProvider, }; #[cfg(test)] diff --git a/runtime-modules/proposals/engine/src/types/stakes.rs b/runtime-modules/proposals/engine/src/types/stakes.rs index 6f0e97902c..94a4134829 100644 --- a/runtime-modules/proposals/engine/src/types/stakes.rs +++ b/runtime-modules/proposals/engine/src/types/stakes.rs @@ -4,8 +4,7 @@ use rstd::convert::From; use rstd::marker::PhantomData; use rstd::rc::Rc; use sr_primitives::traits::Zero; -use srml_support::traits::{Currency, ExistenceRequirement, Imbalance, WithdrawReasons}; -use srml_support::StorageMap; +use srml_support::traits::{Currency, ExistenceRequirement, WithdrawReasons}; // Mocking dependencies for testing #[cfg(test)] @@ -13,40 +12,6 @@ use mockall::predicate::*; #[cfg(test)] use mockall::*; -/// Proposal implementation of the staking event handler from the stake module. -/// 'marker' responsible for the 'Trait' binding. -pub struct StakingEventsHandler { - pub marker: PhantomData, -} - -impl stake::StakingEventsHandler for StakingEventsHandler { - /// Unstake remaining sum back to the source_account_id - fn unstaked( - id: &::StakeId, - _unstaked_amount: BalanceOf, - remaining_imbalance: NegativeImbalance, - ) -> NegativeImbalance { - if >::exists(id) { - >::refund_proposal_stake(*id, remaining_imbalance); - - return >::zero(); // imbalance was consumed - } - - remaining_imbalance - } - - /// Empty handler for slashing - fn slashed( - _: &::StakeId, - _: &::SlashId, - _: BalanceOf, - _: BalanceOf, - remaining_imbalance: NegativeImbalance, - ) -> NegativeImbalance { - remaining_imbalance - } -} - /// Returns registered stake handler. This is scaffolds for the mocking of the stake module. pub trait StakeHandlerProvider { /// Returns stake logic handler diff --git a/runtime/src/integration/proposals/council_origin_validator.rs b/runtime/src/integration/proposals/council_origin_validator.rs index 74fc4fa769..95428ca6b2 100644 --- a/runtime/src/integration/proposals/council_origin_validator.rs +++ b/runtime/src/integration/proposals/council_origin_validator.rs @@ -59,7 +59,6 @@ mod tests { } type Membership = membership::members::Module; - type ProposalsEngine = proposals_engine::Module; #[test] fn council_origin_validator_fails_with_unregistered_member() { diff --git a/runtime/src/integration/proposals/mod.rs b/runtime/src/integration/proposals/mod.rs index 95ccc25a6b..528a7c6488 100644 --- a/runtime/src/integration/proposals/mod.rs +++ b/runtime/src/integration/proposals/mod.rs @@ -1,5 +1,7 @@ mod council_origin_validator; mod membership_origin_validator; +mod staking_events_handler; pub use council_origin_validator::CouncilManager; pub use membership_origin_validator::{MemberId, MembershipOriginValidator}; +pub use staking_events_handler::StakingEventsHandler; \ No newline at end of file diff --git a/runtime/src/integration/proposals/staking_events_handler.rs b/runtime/src/integration/proposals/staking_events_handler.rs new file mode 100644 index 0000000000..d76d97c77e --- /dev/null +++ b/runtime/src/integration/proposals/staking_events_handler.rs @@ -0,0 +1,45 @@ +use rstd::marker::PhantomData; +use srml_support::traits::{Currency, Imbalance}; +use srml_support::StorageMap; + +// Balance alias +type BalanceOf = +<::Currency as Currency<::AccountId>>::Balance; + +// Balance alias for staking +type NegativeImbalance = +<::Currency as Currency<::AccountId>>::NegativeImbalance; + +/// Proposal implementation of the staking event handler from the stake module. +/// 'marker' responsible for the 'Trait' binding. +pub struct StakingEventsHandler { + pub marker: PhantomData, +} + +impl stake::StakingEventsHandler for StakingEventsHandler { + /// Unstake remaining sum back to the source_account_id + fn unstaked( + id: &::StakeId, + _unstaked_amount: BalanceOf, + remaining_imbalance: NegativeImbalance, + ) -> NegativeImbalance { + if >::exists(id) { + >::refund_proposal_stake(*id, remaining_imbalance); + + return >::zero(); // imbalance was consumed + } + + remaining_imbalance + } + + /// Empty handler for slashing + fn slashed( + _: &::StakeId, + _: &::SlashId, + _: BalanceOf, + _: BalanceOf, + remaining_imbalance: NegativeImbalance, + ) -> NegativeImbalance { + remaining_imbalance + } +} \ No newline at end of file diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 172f0aae32..acd70b0445 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -586,7 +586,7 @@ impl stake::Trait for Runtime { type StakePoolId = StakePoolId; type StakingEventsHandler = ( ContentWorkingGroupStakingEventHandler, - proposals_engine::StakingEventsHandler, + crate::integration::proposals::StakingEventsHandler, ); type StakeId = u64; type SlashId = u64; From 6ae86f241d356b66191ff5f809a8d2da5ba76c80 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Wed, 25 Mar 2020 10:49:58 +0300 Subject: [PATCH 110/286] Refactor proposals engine module - rename StakeData to the ActiveStake - rename ProposalCode to the DispatchableCallCode - rename ProposalObject to the ProposalOf --- .../proposals/codex/src/tests/mock.rs | 2 +- runtime-modules/proposals/engine/src/lib.rs | 20 +++++++++---------- .../proposals/engine/src/tests/mock/mod.rs | 2 +- .../proposals/engine/src/tests/mod.rs | 4 ++-- .../proposals/engine/src/types/mod.rs | 4 ++-- runtime/src/lib.rs | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/runtime-modules/proposals/codex/src/tests/mock.rs b/runtime-modules/proposals/codex/src/tests/mock.rs index 63f6c129dc..2bfc9d61bf 100644 --- a/runtime-modules/proposals/codex/src/tests/mock.rs +++ b/runtime-modules/proposals/codex/src/tests/mock.rs @@ -100,7 +100,7 @@ impl proposal_engine::Trait for Test { type TitleMaxLength = TitleMaxLength; type DescriptionMaxLength = DescriptionMaxLength; type MaxActiveProposalLimit = MaxActiveProposalLimit; - type ProposalCode = crate::Call; + type DispatchableCallCode = crate::Call; } impl Default for crate::Call { diff --git a/runtime-modules/proposals/engine/src/lib.rs b/runtime-modules/proposals/engine/src/lib.rs index 3954f0d280..386878b449 100644 --- a/runtime-modules/proposals/engine/src/lib.rs +++ b/runtime-modules/proposals/engine/src/lib.rs @@ -27,7 +27,7 @@ use types::FinalizedProposalData; use types::ProposalStakeManager; pub use types::{ ApprovedProposalStatus, FinalizationData, Proposal, ProposalDecisionStatus, ProposalParameters, - ProposalStatus, StakeData, VotingResults, + ProposalStatus, ActiveStake, VotingResults, }; pub use types::{BalanceOf, CurrencyOf, NegativeImbalance}; pub use types::{DefaultStakeHandlerProvider, StakeHandler, StakeHandlerProvider}; @@ -95,7 +95,7 @@ pub trait Trait: type MaxActiveProposalLimit: Get; /// Proposals executable code. Can be instantiated by external module Call enum members. - type ProposalCode: Parameter + Dispatchable + Default; + type DispatchableCallCode: Parameter + Dispatchable + Default; } decl_event!( @@ -190,13 +190,13 @@ impl From for Error { decl_storage! { pub trait Store for Module as ProposalEngine{ /// Map proposal by its id. - pub Proposals get(fn proposals): map T::ProposalId => ProposalObject; + pub Proposals get(fn proposals): map T::ProposalId => ProposalOf; /// Count of all proposals that have been created. pub ProposalCount get(fn proposal_count): u32; /// Map proposal executable code by proposal id. - pub ProposalCode get(fn proposal_codes): map T::ProposalId => Vec; + pub DispatchableCallCode get(fn proposal_codes): map T::ProposalId => Vec; /// Count of active proposals. pub ActiveProposalCount get(fn active_proposal_count): u32; @@ -319,7 +319,7 @@ impl Module { title: Vec, description: Vec, stake_balance: Option>, - proposal_code: Vec, + encoded_dispatchable_call_code: Vec, ) -> Result { let account_id = T::ProposerOriginValidator::ensure_actor_origin(origin, proposer_id.clone())?; @@ -348,7 +348,7 @@ impl Module { let mut stake_data = None; if let Some(stake_id) = stake_id_result { - stake_data = Some(StakeData { + stake_data = Some(ActiveStake { stake_id, source_account_id: account_id, }); @@ -368,7 +368,7 @@ impl Module { }; >::insert(proposal_id, new_proposal); - >::insert(proposal_id, proposal_code); + >::insert(proposal_id, encoded_dispatchable_call_code); >::insert(proposal_id, ()); ProposalCount::put(next_proposal_count_value); Self::increase_active_proposal_counter(); @@ -421,7 +421,7 @@ impl Module { if let ProposalStatus::Finalized(finalized_status) = proposal.status.clone() { let proposal_code = Self::proposal_codes(proposal_id); - let proposal_code_result = T::ProposalCode::decode(&mut &proposal_code[..]); + let proposal_code_result = T::DispatchableCallCode::decode(&mut &proposal_code[..]); let approved_proposal_status = match proposal_code_result { Ok(proposal_code) => { @@ -494,7 +494,7 @@ impl Module { // Slashes the stake and perform unstake only in case of existing stake fn slash_and_unstake( - current_stake_data: Option>, + current_stake_data: Option>, slash_balance: BalanceOf, ) -> Result<(), &'static str> { // only if stake exists @@ -651,7 +651,7 @@ type FinalizedProposal = FinalizedProposalData< >; // Simplification of the 'Proposal' type -type ProposalObject = Proposal< +type ProposalOf = Proposal< ::BlockNumber, MemberId, types::BalanceOf, diff --git a/runtime-modules/proposals/engine/src/tests/mock/mod.rs b/runtime-modules/proposals/engine/src/tests/mock/mod.rs index 09f60b290d..5dd0ac9c60 100644 --- a/runtime-modules/proposals/engine/src/tests/mock/mod.rs +++ b/runtime-modules/proposals/engine/src/tests/mock/mod.rs @@ -115,7 +115,7 @@ impl crate::Trait for Test { type TitleMaxLength = TitleMaxLength; type DescriptionMaxLength = DescriptionMaxLength; type MaxActiveProposalLimit = MaxActiveProposalLimit; - type ProposalCode = proposals::Call; + type DispatchableCallCode = proposals::Call; } impl Default for proposals::Call { diff --git a/runtime-modules/proposals/engine/src/tests/mod.rs b/runtime-modules/proposals/engine/src/tests/mod.rs index b8ff491528..b853b4c19a 100644 --- a/runtime-modules/proposals/engine/src/tests/mod.rs +++ b/runtime-modules/proposals/engine/src/tests/mod.rs @@ -967,7 +967,7 @@ fn create_dummy_proposal_succeeds_with_stake() { title: b"title".to_vec(), description: b"description".to_vec(), voting_results: VotingResults::default(), - stake_data: Some(StakeData { + stake_data: Some(ActiveStake { stake_id: 0, // valid stake_id source_account_id: 1 }), @@ -1231,7 +1231,7 @@ fn finalize_proposal_using_stake_mocks_failed() { title: b"title".to_vec(), description: b"description".to_vec(), voting_results: VotingResults::default(), - stake_data: Some(StakeData { + stake_data: Some(ActiveStake { stake_id: 1, source_account_id: 1 }), diff --git a/runtime-modules/proposals/engine/src/types/mod.rs b/runtime-modules/proposals/engine/src/types/mod.rs index 74cf8e8f1e..b43e68be8a 100644 --- a/runtime-modules/proposals/engine/src/types/mod.rs +++ b/runtime-modules/proposals/engine/src/types/mod.rs @@ -116,7 +116,7 @@ impl VotingResults { /// Contains created stake id and source account for the stake balance #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] #[derive(Encode, Decode, Default, Clone, Copy, PartialEq, Eq, Debug)] -pub struct StakeData { +pub struct ActiveStake { /// Created stake id for the proposal pub stake_id: StakeId, @@ -150,7 +150,7 @@ pub struct Proposal { pub voting_results: VotingResults, /// Stake data for the proposal - pub stake_data: Option>, + pub stake_data: Option>, } impl diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index acd70b0445..ee42b581cd 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -827,7 +827,7 @@ impl proposals_engine::Trait for Runtime { type TitleMaxLength = ProposalTitleMaxLength; type DescriptionMaxLength = ProposalDescriptionMaxLength; type MaxActiveProposalLimit = ProposalMaxActiveProposalLimit; - type ProposalCode = Call; + type DispatchableCallCode = Call; } impl Default for Call { fn default() -> Self { From 9e8e710c6efea609c0a26094535e4fe1cc772322 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Wed, 25 Mar 2020 14:59:21 +0300 Subject: [PATCH 111/286] Add ensure calls of dependent modules in codex Add calls: - add ensure_create_proposal_parameters_are_valid() call - add ensure_can_create_thread() call to the create_proposals_* extrinsics in the codex --- runtime-modules/proposals/codex/src/lib.rs | 24 ++++++++ .../proposals/discussion/src/lib.rs | 43 +++++++++----- runtime-modules/proposals/engine/src/lib.rs | 16 +++--- .../proposals/engine/src/types/mod.rs | 4 +- .../proposals/membership_origin_validator.rs | 2 +- runtime/src/integration/proposals/mod.rs | 2 +- .../proposals/staking_events_handler.rs | 56 ++++++++++--------- 7 files changed, 94 insertions(+), 53 deletions(-) diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index 37e34a490d..af009f55a0 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -129,6 +129,18 @@ decl_module! { ensure!(text.len() as u32 <= T::TextProposalMaxLength::get(), Error::TextProposalSizeExceeded); + >::ensure_create_proposal_parameters_are_valid( + ¶meters, + &title, + &description, + stake_balance, + )?; + + >::ensure_can_create_thread( + &title, + member_id.clone(), + )?; + let proposal_code = >::text_proposal(title.clone(), description.clone(), text); let (cloned_origin1, cloned_origin2) = Self::double_origin(origin); @@ -167,6 +179,18 @@ decl_module! { ensure!(wasm.len() as u32 <= T::RuntimeUpgradeWasmProposalMaxLength::get(), Error::RuntimeProposalSizeExceeded); + >::ensure_create_proposal_parameters_are_valid( + ¶meters, + &title, + &description, + stake_balance, + )?; + + >::ensure_can_create_thread( + &title, + member_id.clone(), + )?; + let proposal_code = >::text_proposal(title.clone(), description.clone(), wasm); let (cloned_origin1, cloned_origin2) = Self::double_origin(origin); diff --git a/runtime-modules/proposals/discussion/src/lib.rs b/runtime-modules/proposals/discussion/src/lib.rs index 2478741954..aabb02b8af 100644 --- a/runtime-modules/proposals/discussion/src/lib.rs +++ b/runtime-modules/proposals/discussion/src/lib.rs @@ -28,6 +28,7 @@ use srml_support::traits::Get; use types::{Post, Thread, ThreadCounter}; use common::origin_validator::ActorOriginValidator; +use srml_support::dispatch::DispatchResult; type MemberId = ::MemberId; @@ -264,19 +265,7 @@ impl Module { ) -> Result { T::ThreadAuthorOriginValidator::ensure_actor_origin(origin, thread_author_id.clone())?; - ensure!(!title.is_empty(), Error::EmptyTitleProvided); - ensure!( - title.len() as u32 <= T::ThreadTitleLengthLimit::get(), - Error::TitleIsTooLong - ); - - // get new 'threads in a row' counter for the author - let current_thread_counter = Self::get_updated_thread_counter(thread_author_id.clone()); - - ensure!( - current_thread_counter.counter as u32 <= T::MaxThreadInARowNumber::get(), - Error::MaxThreadInARowLimitExceeded - ); + Self::ensure_can_create_thread(&title, thread_author_id.clone())?; let next_thread_count_value = Self::thread_count() + 1; let new_thread_id = next_thread_count_value; @@ -287,6 +276,9 @@ impl Module { author_id: thread_author_id.clone(), }; + // get new 'threads in a row' counter for the author + let current_thread_counter = Self::get_updated_thread_counter(thread_author_id.clone()); + // mutation let thread_id = T::ThreadId::from(new_thread_id); @@ -311,4 +303,29 @@ impl Module { // else return new counter (set with 1 thread number) ThreadCounter::new(author_id) } + + /// Ensures thread can be created. + /// Checks: + /// - title is valid + /// - max thread in a row by the same author + pub fn ensure_can_create_thread( + title: &[u8], + thread_author_id: MemberId, + ) -> DispatchResult { + ensure!(!title.is_empty(), Error::EmptyTitleProvided); + ensure!( + title.len() as u32 <= T::ThreadTitleLengthLimit::get(), + Error::TitleIsTooLong + ); + + // get new 'threads in a row' counter for the author + let current_thread_counter = Self::get_updated_thread_counter(thread_author_id.clone()); + + ensure!( + current_thread_counter.counter as u32 <= T::MaxThreadInARowNumber::get(), + Error::MaxThreadInARowLimitExceeded + ); + + Ok(()) + } } diff --git a/runtime-modules/proposals/engine/src/lib.rs b/runtime-modules/proposals/engine/src/lib.rs index 386878b449..424051fd5f 100644 --- a/runtime-modules/proposals/engine/src/lib.rs +++ b/runtime-modules/proposals/engine/src/lib.rs @@ -26,8 +26,8 @@ use types::FinalizedProposalData; use types::ProposalStakeManager; pub use types::{ - ApprovedProposalStatus, FinalizationData, Proposal, ProposalDecisionStatus, ProposalParameters, - ProposalStatus, ActiveStake, VotingResults, + ActiveStake, ApprovedProposalStatus, FinalizationData, Proposal, ProposalDecisionStatus, + ProposalParameters, ProposalStatus, VotingResults, }; pub use types::{BalanceOf, CurrencyOf, NegativeImbalance}; pub use types::{DefaultStakeHandlerProvider, StakeHandler, StakeHandlerProvider}; @@ -560,12 +560,12 @@ impl Module { }; } - // Performs all checks for the proposal creation: - // - title, body lengths - // - mac active proposal - // - provided parameters: approval_threshold_percentage and slashing_threshold_percentage > 0 - // - provided stake balance and parameters.required_stake are valid - fn ensure_create_proposal_parameters_are_valid( + /// Performs all checks for the proposal creation: + /// - title, body lengths + /// - mac active proposal + /// - provided parameters: approval_threshold_percentage and slashing_threshold_percentage > 0 + /// - provided stake balance and parameters.required_stake are valid + pub fn ensure_create_proposal_parameters_are_valid( parameters: &ProposalParameters>, title: &[u8], description: &[u8], diff --git a/runtime-modules/proposals/engine/src/types/mod.rs b/runtime-modules/proposals/engine/src/types/mod.rs index b43e68be8a..32c4e7b385 100644 --- a/runtime-modules/proposals/engine/src/types/mod.rs +++ b/runtime-modules/proposals/engine/src/types/mod.rs @@ -18,9 +18,7 @@ pub use proposal_statuses::{ ApprovedProposalStatus, FinalizationData, ProposalDecisionStatus, ProposalStatus, }; pub(crate) use stakes::ProposalStakeManager; -pub use stakes::{ - DefaultStakeHandlerProvider, StakeHandler, StakeHandlerProvider, -}; +pub use stakes::{DefaultStakeHandlerProvider, StakeHandler, StakeHandlerProvider}; #[cfg(test)] pub(crate) use stakes::DefaultStakeHandler; diff --git a/runtime/src/integration/proposals/membership_origin_validator.rs b/runtime/src/integration/proposals/membership_origin_validator.rs index 03576853b9..e54c48f52a 100644 --- a/runtime/src/integration/proposals/membership_origin_validator.rs +++ b/runtime/src/integration/proposals/membership_origin_validator.rs @@ -19,7 +19,7 @@ impl /// the membership module fn ensure_actor_origin( origin: ::Origin, - actor_id: MemberId, + actor_id: MemberId, // From ) -> Result<::AccountId, &'static str> { // check valid signed account_id let account_id = ensure_signed(origin)?; diff --git a/runtime/src/integration/proposals/mod.rs b/runtime/src/integration/proposals/mod.rs index 528a7c6488..172923a1ff 100644 --- a/runtime/src/integration/proposals/mod.rs +++ b/runtime/src/integration/proposals/mod.rs @@ -4,4 +4,4 @@ mod staking_events_handler; pub use council_origin_validator::CouncilManager; pub use membership_origin_validator::{MemberId, MembershipOriginValidator}; -pub use staking_events_handler::StakingEventsHandler; \ No newline at end of file +pub use staking_events_handler::StakingEventsHandler; diff --git a/runtime/src/integration/proposals/staking_events_handler.rs b/runtime/src/integration/proposals/staking_events_handler.rs index d76d97c77e..ba8595a095 100644 --- a/runtime/src/integration/proposals/staking_events_handler.rs +++ b/runtime/src/integration/proposals/staking_events_handler.rs @@ -4,42 +4,44 @@ use srml_support::StorageMap; // Balance alias type BalanceOf = -<::Currency as Currency<::AccountId>>::Balance; + <::Currency as Currency<::AccountId>>::Balance; // Balance alias for staking type NegativeImbalance = -<::Currency as Currency<::AccountId>>::NegativeImbalance; + <::Currency as Currency<::AccountId>>::NegativeImbalance; /// Proposal implementation of the staking event handler from the stake module. /// 'marker' responsible for the 'Trait' binding. pub struct StakingEventsHandler { - pub marker: PhantomData, + pub marker: PhantomData, } -impl stake::StakingEventsHandler for StakingEventsHandler { - /// Unstake remaining sum back to the source_account_id - fn unstaked( - id: &::StakeId, - _unstaked_amount: BalanceOf, - remaining_imbalance: NegativeImbalance, - ) -> NegativeImbalance { - if >::exists(id) { - >::refund_proposal_stake(*id, remaining_imbalance); +impl stake::StakingEventsHandler + for StakingEventsHandler +{ + /// Unstake remaining sum back to the source_account_id + fn unstaked( + id: &::StakeId, + _unstaked_amount: BalanceOf, + remaining_imbalance: NegativeImbalance, + ) -> NegativeImbalance { + if >::exists(id) { + >::refund_proposal_stake(*id, remaining_imbalance); - return >::zero(); // imbalance was consumed - } + return >::zero(); // imbalance was consumed + } - remaining_imbalance - } + remaining_imbalance + } - /// Empty handler for slashing - fn slashed( - _: &::StakeId, - _: &::SlashId, - _: BalanceOf, - _: BalanceOf, - remaining_imbalance: NegativeImbalance, - ) -> NegativeImbalance { - remaining_imbalance - } -} \ No newline at end of file + /// Empty handler for slashing + fn slashed( + _: &::StakeId, + _: &::SlashId, + _: BalanceOf, + _: BalanceOf, + remaining_imbalance: NegativeImbalance, + ) -> NegativeImbalance { + remaining_imbalance + } +} From 618f9fcd112bbbb44206fddb7093cea7ab459bc7 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Wed, 25 Mar 2020 15:22:07 +0300 Subject: [PATCH 112/286] Change proposals actor validation - move memberhip validation to the codex proposal creation extrinsics - remove actor validation in the create_proposal (engine) and create_thread(discussion) API methods. --- .../content-working-group/src/lib.rs | 2 +- runtime-modules/proposals/codex/Cargo.toml | 10 +- runtime-modules/proposals/codex/src/lib.rs | 22 ++- .../proposals/codex/src/tests/mock.rs | 2 +- .../proposals/discussion/src/lib.rs | 10 -- .../proposals/discussion/src/tests/mock.rs | 1 - .../proposals/discussion/src/tests/mod.rs | 31 +--- runtime-modules/proposals/engine/src/lib.rs | 163 +++++++++--------- .../proposals/engine/src/tests/mod.rs | 26 +-- runtime/src/lib.rs | 2 +- 10 files changed, 113 insertions(+), 156 deletions(-) diff --git a/runtime-modules/content-working-group/src/lib.rs b/runtime-modules/content-working-group/src/lib.rs index b0c6aeea93..970181b9b9 100755 --- a/runtime-modules/content-working-group/src/lib.rs +++ b/runtime-modules/content-working-group/src/lib.rs @@ -1191,7 +1191,7 @@ decl_module! { // Increment NextChannelId NextChannelId::::mutate(|id| *id += as One>::one()); - /// CREDENTIAL STUFF /// + // CREDENTIAL STUFF // // Dial out to membership module and inform about new role as channe owner. let registered_role = >::register_role_on_member(owner, &member_in_role).is_ok(); diff --git a/runtime-modules/proposals/codex/Cargo.toml b/runtime-modules/proposals/codex/Cargo.toml index 37e17ecda6..ebb6ea31a2 100644 --- a/runtime-modules/proposals/codex/Cargo.toml +++ b/runtime-modules/proposals/codex/Cargo.toml @@ -101,17 +101,17 @@ default_features = false package = 'substrate-proposals-discussion-module' path = '../discussion' +[dependencies.common] +default_features = false +package = 'substrate-common-module' +path = '../../common' + [dev-dependencies.runtime-io] default_features = false git = 'https://github.com/paritytech/substrate.git' package = 'sr-io' rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' -[dev-dependencies.common] -default_features = false -package = 'substrate-common-module' -path = '../../common' - [dev-dependencies.governance] default_features = false package = 'substrate-governance-module' diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index af009f55a0..80ac1e8f18 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -23,6 +23,7 @@ use rstd::vec::Vec; use srml_support::{decl_error, decl_module, decl_storage, ensure, print}; use system::{ensure_root, RawOrigin}; +use common::origin_validator::ActorOriginValidator; use proposal_engine::ProposalParameters; /// 'Proposals codex' substrate module Trait @@ -34,6 +35,13 @@ pub trait Trait: /// Defines max wasm code length of the runtime upgrade proposal. type RuntimeUpgradeWasmProposalMaxLength: Get; + + /// Validates member id and origin combination + type MembershipOriginValidator: ActorOriginValidator< + Self::Origin, + MemberId, + Self::AccountId, + >; } use srml_support::traits::{Currency, Get}; @@ -123,6 +131,8 @@ decl_module! { text: Vec, stake_balance: Option>, ) { + let account_id = T::MembershipOriginValidator::ensure_actor_origin(origin, member_id.clone())?; + let parameters = proposal_types::parameters::text_proposal::(); ensure!(!text.is_empty(), Error::TextProposalIsEmpty); @@ -143,16 +153,13 @@ decl_module! { let proposal_code = >::text_proposal(title.clone(), description.clone(), text); - let (cloned_origin1, cloned_origin2) = Self::double_origin(origin); - let discussion_thread_id = >::create_thread( - cloned_origin1, member_id, title.clone(), )?; let proposal_id = >::create_proposal( - cloned_origin2, + account_id, member_id, parameters, title, @@ -173,6 +180,8 @@ decl_module! { wasm: Vec, stake_balance: Option>, ) { + let account_id = T::MembershipOriginValidator::ensure_actor_origin(origin, member_id.clone())?; + let parameters = proposal_types::parameters::upgrade_runtime::(); ensure!(!wasm.is_empty(), Error::RuntimeProposalIsEmpty); @@ -193,16 +202,13 @@ decl_module! { let proposal_code = >::text_proposal(title.clone(), description.clone(), wasm); - let (cloned_origin1, cloned_origin2) = Self::double_origin(origin); - let discussion_thread_id = >::create_thread( - cloned_origin1, member_id, title.clone(), )?; let proposal_id = >::create_proposal( - cloned_origin2, + account_id, member_id, parameters, title, diff --git a/runtime-modules/proposals/codex/src/tests/mock.rs b/runtime-modules/proposals/codex/src/tests/mock.rs index 2bfc9d61bf..5cc6aa4bcc 100644 --- a/runtime-modules/proposals/codex/src/tests/mock.rs +++ b/runtime-modules/proposals/codex/src/tests/mock.rs @@ -129,7 +129,6 @@ parameter_types! { impl proposal_discussion::Trait for Test { type Event = (); - type ThreadAuthorOriginValidator = (); type PostAuthorOriginValidator = (); type ThreadId = u32; type PostId = u32; @@ -154,6 +153,7 @@ parameter_types! { impl crate::Trait for Test { type TextProposalMaxLength = TextProposalMaxLength; type RuntimeUpgradeWasmProposalMaxLength = RuntimeUpgradeWasmProposalMaxLength; + type MembershipOriginValidator = (); } impl system::Trait for Test { diff --git a/runtime-modules/proposals/discussion/src/lib.rs b/runtime-modules/proposals/discussion/src/lib.rs index aabb02b8af..8edd4f3b6c 100644 --- a/runtime-modules/proposals/discussion/src/lib.rs +++ b/runtime-modules/proposals/discussion/src/lib.rs @@ -56,13 +56,6 @@ pub trait Trait: system::Trait + membership::members::Trait { /// Engine event type. type Event: From> + Into<::Event>; - /// Validates thread author id and origin combination - type ThreadAuthorOriginValidator: ActorOriginValidator< - Self::Origin, - MemberId, - Self::AccountId, - >; - /// Validates post author id and origin combination type PostAuthorOriginValidator: ActorOriginValidator< Self::Origin, @@ -259,12 +252,9 @@ impl Module { /// Create the discussion thread. Cannot add more threads than 'predefined limit = MaxThreadInARowNumber' /// times in a row by the same author. pub fn create_thread( - origin: T::Origin, thread_author_id: MemberId, title: Vec, ) -> Result { - T::ThreadAuthorOriginValidator::ensure_actor_origin(origin, thread_author_id.clone())?; - Self::ensure_can_create_thread(&title, thread_author_id.clone())?; let next_thread_count_value = Self::thread_count() + 1; diff --git a/runtime-modules/proposals/discussion/src/tests/mock.rs b/runtime-modules/proposals/discussion/src/tests/mock.rs index a8bb9117aa..347d43a892 100644 --- a/runtime-modules/proposals/discussion/src/tests/mock.rs +++ b/runtime-modules/proposals/discussion/src/tests/mock.rs @@ -86,7 +86,6 @@ impl membership::members::Trait for Test { impl crate::Trait for Test { type Event = TestEvent; - type ThreadAuthorOriginValidator = (); type PostAuthorOriginValidator = (); type ThreadId = u32; type PostId = u32; diff --git a/runtime-modules/proposals/discussion/src/tests/mod.rs b/runtime-modules/proposals/discussion/src/tests/mod.rs index 205cda7897..a2f51c458a 100644 --- a/runtime-modules/proposals/discussion/src/tests/mod.rs +++ b/runtime-modules/proposals/discussion/src/tests/mod.rs @@ -81,23 +81,9 @@ impl DiscussionFixture { DiscussionFixture { title, ..self } } - fn with_author(self, author_id: u64) -> Self { - DiscussionFixture { author_id, ..self } - } - - fn with_origin(self, origin: RawOrigin) -> Self { - DiscussionFixture { - origin: origin.into(), - ..self - } - } - fn create_discussion_and_assert(&self, result: Result) -> Option { - let create_discussion_result = Discussions::create_thread( - self.origin.clone().into(), - self.author_id, - self.title.clone(), - ); + let create_discussion_result = + Discussions::create_thread(self.author_id, self.title.clone()); assert_eq!(create_discussion_result, result); @@ -413,16 +399,3 @@ fn add_discussion_thread_fails_because_of_max_thread_by_same_author_in_a_row_lim discussion_fixture.create_discussion_and_assert(Err(Error::MaxThreadInARowLimitExceeded)); }); } - -#[test] -fn add_discussion_thread_fails_because_of_invalid_author_origin() { - initial_test_ext().execute_with(|| { - let discussion_fixture = DiscussionFixture::default().with_author(2); - discussion_fixture.create_discussion_and_assert(Err(Error::Other("Invalid author"))); - - let discussion_fixture = DiscussionFixture::default() - .with_origin(RawOrigin::Signed(3)) - .with_author(2); - discussion_fixture.create_discussion_and_assert(Err(Error::Other("Invalid author"))); - }); -} diff --git a/runtime-modules/proposals/engine/src/lib.rs b/runtime-modules/proposals/engine/src/lib.rs index 424051fd5f..79ccb3a874 100644 --- a/runtime-modules/proposals/engine/src/lib.rs +++ b/runtime-modules/proposals/engine/src/lib.rs @@ -313,7 +313,7 @@ decl_module! { impl Module { /// Create proposal. Requires 'proposal origin' membership. pub fn create_proposal( - origin: T::Origin, + account_id: T::AccountId, proposer_id: MemberId, parameters: ProposalParameters>, title: Vec, @@ -321,9 +321,6 @@ impl Module { stake_balance: Option>, encoded_dispatchable_call_code: Vec, ) -> Result { - let account_id = - T::ProposerOriginValidator::ensure_actor_origin(origin, proposer_id.clone())?; - Self::ensure_create_proposal_parameters_are_valid( ¶meters, &title, @@ -377,6 +374,85 @@ impl Module { Ok(proposal_id) } + + /// Performs all checks for the proposal creation: + /// - title, body lengths + /// - mac active proposal + /// - provided parameters: approval_threshold_percentage and slashing_threshold_percentage > 0 + /// - provided stake balance and parameters.required_stake are valid + pub fn ensure_create_proposal_parameters_are_valid( + parameters: &ProposalParameters>, + title: &[u8], + description: &[u8], + stake_balance: Option>, + ) -> DispatchResult { + ensure!(!title.is_empty(), Error::EmptyTitleProvided); + ensure!( + title.len() as u32 <= T::TitleMaxLength::get(), + Error::TitleIsTooLong + ); + + ensure!(!description.is_empty(), Error::EmptyDescriptionProvided); + ensure!( + description.len() as u32 <= T::DescriptionMaxLength::get(), + Error::DescriptionIsTooLong + ); + + ensure!( + (Self::active_proposal_count()) < T::MaxActiveProposalLimit::get(), + Error::MaxActiveProposalNumberExceeded + ); + + ensure!( + parameters.approval_threshold_percentage > 0, + Error::InvalidParameterApprovalThreshold + ); + + ensure!( + parameters.slashing_threshold_percentage > 0, + Error::InvalidParameterSlashingThreshold + ); + + // check stake parameters + if let Some(required_stake) = parameters.required_stake { + if let Some(staked_balance) = stake_balance { + ensure!( + required_stake == staked_balance, + Error::StakeDiffersFromRequired + ); + } else { + return Err(Error::EmptyStake); + } + } + + if stake_balance.is_some() && parameters.required_stake.is_none() { + return Err(Error::StakeShouldBeEmpty); + } + + Ok(()) + } + + //TODO: candidate for invariant break or error saving to the state + /// Callback from StakingEventsHandler. Refunds unstaked imbalance back to the source account + pub fn refund_proposal_stake(stake_id: T::StakeId, imbalance: NegativeImbalance) { + if >::exists(stake_id) { + //TODO: handle non existence + + let proposal_id = Self::stakes_proposals(stake_id); + + if >::exists(proposal_id) { + let proposal = Self::proposals(proposal_id); + + if let Some(stake_data) = proposal.stake_data { + //TODO: handle the result + let _ = CurrencyOf::::resolve_into_existing( + &stake_data.source_account_id, + imbalance, + ); + } + } + } + } } impl Module { @@ -559,85 +635,6 @@ impl Module { ActiveProposalCount::put(next_active_proposal_count_value); }; } - - /// Performs all checks for the proposal creation: - /// - title, body lengths - /// - mac active proposal - /// - provided parameters: approval_threshold_percentage and slashing_threshold_percentage > 0 - /// - provided stake balance and parameters.required_stake are valid - pub fn ensure_create_proposal_parameters_are_valid( - parameters: &ProposalParameters>, - title: &[u8], - description: &[u8], - stake_balance: Option>, - ) -> DispatchResult { - ensure!(!title.is_empty(), Error::EmptyTitleProvided); - ensure!( - title.len() as u32 <= T::TitleMaxLength::get(), - Error::TitleIsTooLong - ); - - ensure!(!description.is_empty(), Error::EmptyDescriptionProvided); - ensure!( - description.len() as u32 <= T::DescriptionMaxLength::get(), - Error::DescriptionIsTooLong - ); - - ensure!( - (Self::active_proposal_count()) < T::MaxActiveProposalLimit::get(), - Error::MaxActiveProposalNumberExceeded - ); - - ensure!( - parameters.approval_threshold_percentage > 0, - Error::InvalidParameterApprovalThreshold - ); - - ensure!( - parameters.slashing_threshold_percentage > 0, - Error::InvalidParameterSlashingThreshold - ); - - // check stake parameters - if let Some(required_stake) = parameters.required_stake { - if let Some(staked_balance) = stake_balance { - ensure!( - required_stake == staked_balance, - Error::StakeDiffersFromRequired - ); - } else { - return Err(Error::EmptyStake); - } - } - - if stake_balance.is_some() && parameters.required_stake.is_none() { - return Err(Error::StakeShouldBeEmpty); - } - - Ok(()) - } - - //TODO: candidate for invariant break or error saving to the state - /// Callback from StakingEventsHandler. Refunds unstaked imbalance back to the source account - pub fn refund_proposal_stake(stake_id: T::StakeId, imbalance: NegativeImbalance) { - if >::exists(stake_id) { - //TODO: handle non existence - - let proposal_id = Self::stakes_proposals(stake_id); - - if >::exists(proposal_id) { - let proposal = Self::proposals(proposal_id); - - if let Some(stake_data) = proposal.stake_data { - //TODO: handle the result - let _ = CurrencyOf::::resolve_into_existing( - &stake_data.source_account_id, - imbalance, - ); - } - } - } - } } // Simplification of the 'FinalizedProposalData' type diff --git a/runtime-modules/proposals/engine/src/tests/mod.rs b/runtime-modules/proposals/engine/src/tests/mod.rs index b853b4c19a..057d2bc466 100644 --- a/runtime-modules/proposals/engine/src/tests/mod.rs +++ b/runtime-modules/proposals/engine/src/tests/mod.rs @@ -58,7 +58,7 @@ impl Default for ProposalParametersFixture { #[derive(Clone)] struct DummyProposalFixture { parameters: ProposalParameters, - origin: RawOrigin, + account_id: u64, proposer_id: u64, proposal_code: Vec, title: Vec, @@ -83,7 +83,7 @@ impl Default for DummyProposalFixture { grace_period: 0, required_stake: None, }, - origin: RawOrigin::Signed(1), + account_id: 1, proposer_id: 1, proposal_code: dummy_proposal.encode(), title, @@ -106,8 +106,8 @@ impl DummyProposalFixture { DummyProposalFixture { parameters, ..self } } - fn with_origin(self, origin: RawOrigin) -> Self { - DummyProposalFixture { origin, ..self } + fn with_account_id(self, account_id: u64) -> Self { + DummyProposalFixture { account_id, ..self } } fn with_stake(self, stake_balance: BalanceOf) -> Self { @@ -126,7 +126,7 @@ impl DummyProposalFixture { fn create_proposal_and_assert(self, result: Result) -> Option { let proposal_id_result = ProposalsEngine::create_proposal( - self.origin.into(), + self.account_id, self.proposer_id, self.parameters, self.title, @@ -283,14 +283,6 @@ fn create_dummy_proposal_succeeds() { }); } -#[test] -fn create_dummy_proposal_fails_with_insufficient_rights() { - initial_test_ext().execute_with(|| { - let dummy_proposal = DummyProposalFixture::default().with_origin(RawOrigin::None); - dummy_proposal.create_proposal_and_assert(Err(Error::Other("RequireSignedOrigin"))); - }); -} - #[test] fn vote_succeeds() { initial_test_ext().execute_with(|| { @@ -948,7 +940,7 @@ fn create_dummy_proposal_succeeds_with_stake() { let dummy_proposal = DummyProposalFixture::default() .with_parameters(parameters_fixture.params()) - .with_origin(RawOrigin::Signed(account_id)) + .with_account_id(account_id) .with_stake(200); let _imbalance = ::Currency::deposit_creating(&account_id, 500); @@ -986,7 +978,7 @@ fn create_dummy_proposal_fail_with_stake_on_empty_account() { ProposalParametersFixture::default().with_required_stake(required_stake); let dummy_proposal = DummyProposalFixture::default() .with_parameters(parameters_fixture.params()) - .with_origin(RawOrigin::Signed(account_id)) + .with_account_id(account_id) .with_stake(required_stake); dummy_proposal @@ -1126,7 +1118,7 @@ fn finalize_proposal_using_stake_mocks_succeeds() { ProposalParametersFixture::default().with_required_stake(stake_amount); let dummy_proposal = DummyProposalFixture::default() .with_parameters(parameters_fixture.params()) - .with_origin(RawOrigin::Signed(account_id)) + .with_account_id(account_id) .with_stake(stake_amount); let _proposal_id = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); @@ -1209,7 +1201,7 @@ fn finalize_proposal_using_stake_mocks_failed() { ProposalParametersFixture::default().with_required_stake(stake_amount); let dummy_proposal = DummyProposalFixture::default() .with_parameters(parameters_fixture.params()) - .with_origin(RawOrigin::Signed(account_id)) + .with_account_id(account_id) .with_stake(stake_amount); let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index ee42b581cd..95138a278b 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -844,7 +844,6 @@ parameter_types! { impl proposals_discussion::Trait for Runtime { type Event = Event; - type ThreadAuthorOriginValidator = MembershipOriginValidator; type PostAuthorOriginValidator = MembershipOriginValidator; type ThreadId = u32; type PostId = u32; @@ -860,6 +859,7 @@ parameter_types! { } impl proposals_codex::Trait for Runtime { + type MembershipOriginValidator = MembershipOriginValidator; type TextProposalMaxLength = TextProposalMaxLength; type RuntimeUpgradeWasmProposalMaxLength = RuntimeUpgradeWasmProposalMaxLength; } From 24fc74fdf5984c7f0208037eeb49863b3cdbccee Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Wed, 25 Mar 2020 16:10:40 +0300 Subject: [PATCH 113/286] Change MembershipOriginValidator in the runtime - remove root_account_id from valid member origin --- .../src/integration/proposals/membership_origin_validator.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/src/integration/proposals/membership_origin_validator.rs b/runtime/src/integration/proposals/membership_origin_validator.rs index e54c48f52a..82bb88cbbb 100644 --- a/runtime/src/integration/proposals/membership_origin_validator.rs +++ b/runtime/src/integration/proposals/membership_origin_validator.rs @@ -19,7 +19,7 @@ impl /// the membership module fn ensure_actor_origin( origin: ::Origin, - actor_id: MemberId, // From + actor_id: MemberId, ) -> Result<::AccountId, &'static str> { // check valid signed account_id let account_id = ensure_signed(origin)?; @@ -29,7 +29,7 @@ impl if let Ok(profile) = profile_result { // whether the account_id belongs to the actor - if profile.root_account == account_id || profile.controller_account == account_id { + if profile.controller_account == account_id { return Ok(account_id); } else { return Err("Membership validation failed: given account doesn't match with profile accounts"); From d4b7da42dda1c0a827716aa05b1173ce6cef0adf Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Wed, 25 Mar 2020 17:20:30 +0300 Subject: [PATCH 114/286] Refactor execute_proposal() in the engine module --- runtime-modules/proposals/engine/src/lib.rs | 87 +++++++++++-------- .../proposals/engine/src/types/mod.rs | 19 ++++ 2 files changed, 70 insertions(+), 36 deletions(-) diff --git a/runtime-modules/proposals/engine/src/lib.rs b/runtime-modules/proposals/engine/src/lib.rs index 79ccb3a874..2466a4d017 100644 --- a/runtime-modules/proposals/engine/src/lib.rs +++ b/runtime-modules/proposals/engine/src/lib.rs @@ -48,6 +48,7 @@ use srml_support::{ }; use system::{ensure_root, RawOrigin}; +use crate::types::ApprovedProposalData; use common::origin_validator::ActorOriginValidator; use srml_support::dispatch::Dispatchable; @@ -299,12 +300,12 @@ decl_module! { Self::finalize_proposal(proposal_data.proposal_id, proposal_data.status); } - let executable_proposal_ids = - Self::get_approved_proposal_with_expired_grace_period_ids(); + let executable_proposals = + Self::get_approved_proposal_with_expired_grace_period(); // Execute approved proposals with expired grace period - for proposal_id in executable_proposal_ids { - Self::execute_proposal(proposal_id); + for approved_proosal in executable_proposals { + Self::execute_proposal(approved_proosal); } } } @@ -490,43 +491,38 @@ impl Module { } // Executes approved proposal code - fn execute_proposal(proposal_id: T::ProposalId) { - let mut proposal = Self::proposals(proposal_id); - - // Execute only proposals with correct status - if let ProposalStatus::Finalized(finalized_status) = proposal.status.clone() { - let proposal_code = Self::proposal_codes(proposal_id); + fn execute_proposal(approved_proposal: ApprovedProposal) { + let proposal_code = Self::proposal_codes(approved_proposal.proposal_id); - let proposal_code_result = T::DispatchableCallCode::decode(&mut &proposal_code[..]); + let proposal_code_result = T::DispatchableCallCode::decode(&mut &proposal_code[..]); - let approved_proposal_status = match proposal_code_result { - Ok(proposal_code) => { - if let Err(error) = proposal_code.dispatch(T::Origin::from(RawOrigin::Root)) { - ApprovedProposalStatus::failed_execution( - error.into().message.unwrap_or("Dispatch error"), - ) - } else { - ApprovedProposalStatus::Executed - } + let approved_proposal_status = match proposal_code_result { + Ok(proposal_code) => { + if let Err(error) = proposal_code.dispatch(T::Origin::from(RawOrigin::Root)) { + ApprovedProposalStatus::failed_execution( + error.into().message.unwrap_or("Dispatch error"), + ) + } else { + ApprovedProposalStatus::Executed } - Err(error) => ApprovedProposalStatus::failed_execution(error.what()), - }; + } + Err(error) => ApprovedProposalStatus::failed_execution(error.what()), + }; - let proposal_execution_status = - finalized_status.create_approved_proposal_status(approved_proposal_status); + let proposal_execution_status = approved_proposal + .finalisation_status_data + .create_approved_proposal_status(approved_proposal_status); - proposal.status = proposal_execution_status.clone(); - >::insert(proposal_id, proposal); + let mut proposal = approved_proposal.proposal; + proposal.status = proposal_execution_status.clone(); + >::insert(approved_proposal.proposal_id, proposal); - Self::deposit_event(RawEvent::ProposalStatusUpdated( - proposal_id, - proposal_execution_status, - )); - } + Self::deposit_event(RawEvent::ProposalStatusUpdated( + approved_proposal.proposal_id, + proposal_execution_status, + )); - // Remove proposals from the 'pending execution' queue even in case of not finalized status - // to prevent eternal cycles. - >::remove(&proposal_id); + >::remove(&approved_proposal.proposal_id); } // Performs all actions on proposal finalization: @@ -606,13 +602,22 @@ impl Module { } // Enumerates approved proposals and checks their grace period expiration - fn get_approved_proposal_with_expired_grace_period_ids() -> Vec { + fn get_approved_proposal_with_expired_grace_period() -> Vec> { >::enumerate() .filter_map(|(proposal_id, _)| { let proposal = Self::proposals(proposal_id); if proposal.is_grace_period_expired(Self::current_block()) { - Some(proposal_id) + // this should be true, because it was tested inside is_grace_period_expired() + if let ProposalStatus::Finalized(finalisation_data) = proposal.status.clone() { + Some(ApprovedProposalData { + proposal_id, + proposal, + finalisation_status_data: finalisation_data, + }) + } else { + None + } } else { None } @@ -647,6 +652,16 @@ type FinalizedProposal = FinalizedProposalData< ::AccountId, >; +// Simplification of the 'ApprovedProposalData' type +type ApprovedProposal = ApprovedProposalData< + ::ProposalId, + ::BlockNumber, + MemberId, + types::BalanceOf, + ::StakeId, + ::AccountId, +>; + // Simplification of the 'Proposal' type type ProposalOf = Proposal< ::BlockNumber, diff --git a/runtime-modules/proposals/engine/src/types/mod.rs b/runtime-modules/proposals/engine/src/types/mod.rs index 32c4e7b385..5720482087 100644 --- a/runtime-modules/proposals/engine/src/types/mod.rs +++ b/runtime-modules/proposals/engine/src/types/mod.rs @@ -337,6 +337,25 @@ pub(crate) struct FinalizedProposalData< pub finalized_at: BlockNumber, } +/// Data container for the approved proposal results +pub(crate) struct ApprovedProposalData< + ProposalId, + BlockNumber, + ProposerId, + Balance, + StakeId, + AccountId, +> { + /// Proposal id + pub proposal_id: ProposalId, + + /// Proposal to be finalized + pub proposal: Proposal, + + /// Proposal finalisation status data + pub finalisation_status_data: FinalizationData, +} + #[cfg(test)] mod tests { use crate::*; From ec698286bc0439bfb3f6779593aed5f67270ef1a Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Wed, 25 Mar 2020 17:42:06 +0300 Subject: [PATCH 115/286] Refactor proposal status finalization_error - rename it to the encoded_unstaking_error_due_to_broken_runtime --- runtime-modules/proposals/engine/src/tests/mod.rs | 4 ++-- .../proposals/engine/src/types/proposal_statuses.rs | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/runtime-modules/proposals/engine/src/tests/mod.rs b/runtime-modules/proposals/engine/src/tests/mod.rs index 057d2bc466..030acad7a0 100644 --- a/runtime-modules/proposals/engine/src/tests/mod.rs +++ b/runtime-modules/proposals/engine/src/tests/mod.rs @@ -726,7 +726,7 @@ fn cancel_proposal_event_emitted() { 1, ProposalStatus::Finalized(FinalizationData { proposal_status: ProposalDecisionStatus::Canceled, - finalization_error: None, + encoded_unstaking_error_due_to_broken_runtime: None, finalized_at: 1, }), ), @@ -1160,7 +1160,7 @@ fn proposal_slashing_succeeds() { proposal.status, ProposalStatus::Finalized(FinalizationData { proposal_status: ProposalDecisionStatus::Slashed, - finalization_error: None, + encoded_unstaking_error_due_to_broken_runtime: None, finalized_at: 1, }), ); diff --git a/runtime-modules/proposals/engine/src/types/proposal_statuses.rs b/runtime-modules/proposals/engine/src/types/proposal_statuses.rs index f9100a48cc..a9d7b5dfda 100644 --- a/runtime-modules/proposals/engine/src/types/proposal_statuses.rs +++ b/runtime-modules/proposals/engine/src/types/proposal_statuses.rs @@ -33,12 +33,13 @@ impl ProposalStatus { /// Creates finalized proposal status with provided ProposalDecisionStatus and error pub fn finalized_with_error( decision_status: ProposalDecisionStatus, - finalization_error: Option<&str>, + encoded_unstaking_error_due_to_broken_runtime: Option<&str>, now: BlockNumber, ) -> ProposalStatus { ProposalStatus::Finalized(FinalizationData { proposal_status: decision_status, - finalization_error: finalization_error.map(|err| err.as_bytes().to_vec()), + encoded_unstaking_error_due_to_broken_runtime: + encoded_unstaking_error_due_to_broken_runtime.map(|err| err.as_bytes().to_vec()), finalized_at: now, }) } @@ -50,7 +51,7 @@ impl ProposalStatus { ) -> ProposalStatus { ProposalStatus::Finalized(FinalizationData { proposal_status: ProposalDecisionStatus::Approved(approved_status), - finalization_error: None, + encoded_unstaking_error_due_to_broken_runtime: None, finalized_at: now, }) } @@ -66,8 +67,8 @@ pub struct FinalizationData { /// Proposal finalization block number pub finalized_at: BlockNumber, - /// Error occured during the proposal finalization - pub finalization_error: Option>, + /// Error occured during the proposal finalization - unstaking failed in the stake module + pub encoded_unstaking_error_due_to_broken_runtime: Option>, } impl FinalizationData { From 1702dcef4ea15ebda6ffb7e6dfc179d503838126 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Wed, 25 Mar 2020 19:11:04 +0300 Subject: [PATCH 116/286] Refactor proposal stakes - move proposal stake data from the proposal to its statuses --- .travis.yml | 2 +- runtime-modules/proposals/engine/src/lib.rs | 71 ++++++++++--------- .../proposals/engine/src/tests/mod.rs | 28 +++----- .../proposals/engine/src/types/mod.rs | 11 +-- .../engine/src/types/proposal_statuses.rs | 35 +++++---- 5 files changed, 76 insertions(+), 71 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8667c5f4f2..6a87108095 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: rust rust: - - 1.41.1 + - 1.42.0 # Caching saves a lot of time but often causes stalled builds... # disabled for now # look into solution here: https://levans.fr/rust_travis_cache.html diff --git a/runtime-modules/proposals/engine/src/lib.rs b/runtime-modules/proposals/engine/src/lib.rs index 2466a4d017..d9bceef0e0 100644 --- a/runtime-modules/proposals/engine/src/lib.rs +++ b/runtime-modules/proposals/engine/src/lib.rs @@ -44,7 +44,7 @@ use rstd::prelude::*; use sr_primitives::traits::{DispatchResult, Zero}; use srml_support::traits::{Currency, Get}; use srml_support::{ - decl_error, decl_event, decl_module, decl_storage, ensure, Parameter, StorageDoubleMap, + decl_error, decl_event, decl_module, decl_storage, ensure, print, Parameter, StorageDoubleMap, }; use system::{ensure_root, RawOrigin}; @@ -106,6 +106,8 @@ decl_event!( ::ProposalId, MemberId = MemberId, ::BlockNumber, + ::AccountId, + ::StakeId, { /// Emits on proposal creation. /// Params: @@ -117,7 +119,7 @@ decl_event!( /// Params: /// - Id of a updated proposal. /// - New proposal status - ProposalStatusUpdated(ProposalId, ProposalStatus), + ProposalStatusUpdated(ProposalId, ProposalStatus), /// Emits on voting for the proposal /// Params: @@ -236,7 +238,7 @@ decl_module! { ensure!(>::exists(proposal_id), Error::ProposalNotFound); let mut proposal = Self::proposals(proposal_id); - ensure!(proposal.status == ProposalStatus::Active, Error::ProposalFinalized); + ensure!(matches!(proposal.status, ProposalStatus::Active{..}), Error::ProposalFinalized); let did_not_vote_before = !>::exists( proposal_id, @@ -265,7 +267,7 @@ decl_module! { let proposal = Self::proposals(proposal_id); ensure!(proposer_id == proposal.proposer_id, Error::NotAuthor); - ensure!(proposal.status == ProposalStatus::Active, Error::ProposalFinalized); + ensure!(matches!(proposal.status, ProposalStatus::Active{..}), Error::ProposalFinalized); // mutation @@ -279,7 +281,7 @@ decl_module! { ensure!(>::exists(proposal_id), Error::ProposalNotFound); let proposal = Self::proposals(proposal_id); - ensure!(proposal.status == ProposalStatus::Active, Error::ProposalFinalized); + ensure!(matches!(proposal.status, ProposalStatus::Active{..}), Error::ProposalFinalized); // mutation @@ -360,9 +362,8 @@ impl Module { title, description, proposer_id: proposer_id.clone(), - status: ProposalStatus::Active, + status: ProposalStatus::Active(stake_data), voting_results: VotingResults::default(), - stake_data, }; >::insert(proposal_id, new_proposal); @@ -444,12 +445,14 @@ impl Module { if >::exists(proposal_id) { let proposal = Self::proposals(proposal_id); - if let Some(stake_data) = proposal.stake_data { - //TODO: handle the result - let _ = CurrencyOf::::resolve_into_existing( - &stake_data.source_account_id, - imbalance, - ); + if let ProposalStatus::Active(active_stake_result) = proposal.status { + if let Some(active_stake) = active_stake_result { + //TODO: handle the result + let _ = CurrencyOf::::resolve_into_existing( + &active_stake.source_account_id, + imbalance, + ); + } } } } @@ -537,31 +540,31 @@ impl Module { let mut proposal = Self::proposals(proposal_id); - if let ProposalDecisionStatus::Approved { .. } = decision_status { - >::insert(proposal_id, ()); - } - - // deal with stakes if necessary - let slash_balance = Self::calculate_slash_balance(&decision_status, &proposal.parameters); - let slash_and_unstake_result = - Self::slash_and_unstake(proposal.stake_data.clone(), slash_balance); + if let ProposalStatus::Active(active_stake) = proposal.status.clone() { + if let ProposalDecisionStatus::Approved { .. } = decision_status { + >::insert(proposal_id, ()); + } - //TODO: leave stake data as is? - if slash_and_unstake_result.is_ok() { - proposal.stake_data = None; - } + // deal with stakes if necessary + let slash_balance = + Self::calculate_slash_balance(&decision_status, &proposal.parameters); + let slash_and_unstake_result = + Self::slash_and_unstake(active_stake.clone(), slash_balance); - // create finalized proposal status with error if any - let new_proposal_status = //TODO rename without an error - ProposalStatus::finalized_with_error(decision_status, slash_and_unstake_result.err(), Self::current_block()); + // create finalized proposal status with error if any + let new_proposal_status = //TODO rename without an error + ProposalStatus::finalized_with_error(decision_status, slash_and_unstake_result.err(), active_stake, Self::current_block()); - proposal.status = new_proposal_status.clone(); - >::insert(proposal_id, proposal); + proposal.status = new_proposal_status.clone(); + >::insert(proposal_id, proposal); - Self::deposit_event(RawEvent::ProposalStatusUpdated( - proposal_id, - new_proposal_status, - )); + Self::deposit_event(RawEvent::ProposalStatusUpdated( + proposal_id, + new_proposal_status, + )); + } else { + print("Broken invariant: proposal cannot be non-active during the finalisation"); + } } // Slashes the stake and perform unstake only in case of existing stake diff --git a/runtime-modules/proposals/engine/src/tests/mod.rs b/runtime-modules/proposals/engine/src/tests/mod.rs index 030acad7a0..bad900a3a0 100644 --- a/runtime-modules/proposals/engine/src/tests/mod.rs +++ b/runtime-modules/proposals/engine/src/tests/mod.rs @@ -243,7 +243,7 @@ impl VoteGenerator { struct EventFixture; impl EventFixture { - fn assert_events(expected_raw_events: Vec>) { + fn assert_events(expected_raw_events: Vec>) { let expected_events = expected_raw_events .iter() .map(|ev| EventRecord { @@ -340,7 +340,6 @@ fn proposal_execution_succeeds() { rejections: 0, slashes: 0, }, - stake_data: None, } ); @@ -393,7 +392,6 @@ fn proposal_execution_failed() { rejections: 0, slashes: 0, }, - stake_data: None, } ) }); @@ -572,7 +570,6 @@ fn cancel_proposal_succeeds() { title: b"title".to_vec(), description: b"description".to_vec(), voting_results: VotingResults::default(), - stake_data: None, } ) }); @@ -641,7 +638,6 @@ fn veto_proposal_succeeds() { title: b"title".to_vec(), description: b"description".to_vec(), voting_results: VotingResults::default(), - stake_data: None, } ); @@ -727,6 +723,7 @@ fn cancel_proposal_event_emitted() { ProposalStatus::Finalized(FinalizationData { proposal_status: ProposalDecisionStatus::Canceled, encoded_unstaking_error_due_to_broken_runtime: None, + stake_data_after_unstaking_error: None, finalized_at: 1, }), ), @@ -772,7 +769,6 @@ fn create_proposal_and_expire_it() { title: b"title".to_vec(), description: b"description".to_vec(), voting_results: VotingResults::default(), - stake_data: None, } ) }); @@ -818,7 +814,6 @@ fn proposal_execution_postponed_because_of_grace_period() { rejections: 0, slashes: 0, }, - stake_data: None, } ); }); @@ -860,7 +855,6 @@ fn proposal_execution_succeeds_after_the_grace_period() { rejections: 0, slashes: 0, }, - stake_data: None, }; assert_eq!(proposal, expected_proposal); @@ -955,14 +949,13 @@ fn create_dummy_proposal_succeeds_with_stake() { parameters: parameters_fixture.params(), proposer_id: 1, created_at: 1, - status: ProposalStatus::Active, + status: ProposalStatus::Active(Some(ActiveStake { + stake_id: 0, // valid stake_id + source_account_id: 1 + })), title: b"title".to_vec(), description: b"description".to_vec(), voting_results: VotingResults::default(), - stake_data: Some(ActiveStake { - stake_id: 0, // valid stake_id - source_account_id: 1 - }), } ) }); @@ -1162,6 +1155,7 @@ fn proposal_slashing_succeeds() { proposal_status: ProposalDecisionStatus::Slashed, encoded_unstaking_error_due_to_broken_runtime: None, finalized_at: 1, + stake_data_after_unstaking_error: None, }), ); assert!(!>::exists(proposal_id)); @@ -1218,15 +1212,15 @@ fn finalize_proposal_using_stake_mocks_failed() { status: ProposalStatus::finalized_with_error( ProposalDecisionStatus::Expired, Some("Cannot remove stake"), + Some(ActiveStake { + stake_id: 1, + source_account_id: 1 + }), 4, ), title: b"title".to_vec(), description: b"description".to_vec(), voting_results: VotingResults::default(), - stake_data: Some(ActiveStake { - stake_id: 1, - source_account_id: 1 - }), } ); }); diff --git a/runtime-modules/proposals/engine/src/types/mod.rs b/runtime-modules/proposals/engine/src/types/mod.rs index 5720482087..ad9f84fd40 100644 --- a/runtime-modules/proposals/engine/src/types/mod.rs +++ b/runtime-modules/proposals/engine/src/types/mod.rs @@ -142,19 +142,18 @@ pub struct Proposal { pub created_at: BlockNumber, /// Current proposal status - pub status: ProposalStatus, + pub status: ProposalStatus, /// Curring voting result for the proposal pub voting_results: VotingResults, - - /// Stake data for the proposal - pub stake_data: Option>, } impl Proposal where BlockNumber: Add + PartialOrd + Copy, + StakeId: Clone, + AccountId: Clone, { /// Returns whether voting period expired by now pub fn is_voting_period_expired(&self, now: BlockNumber) -> bool { @@ -233,6 +232,8 @@ impl<'a, BlockNumber, ProposerId, Balance, StakeId, AccountId> ProposalStatusResolution<'a, BlockNumber, ProposerId, Balance, StakeId, AccountId> where BlockNumber: Add + PartialOrd + Copy, + StakeId: Clone, + AccountId: Clone, { // Proposal has been expired and quorum not reached. pub fn is_expired(&self) -> bool { @@ -353,7 +354,7 @@ pub(crate) struct ApprovedProposalData< pub proposal: Proposal, /// Proposal finalisation status data - pub finalisation_status_data: FinalizationData, + pub finalisation_status_data: FinalizationData, } #[cfg(test)] diff --git a/runtime-modules/proposals/engine/src/types/proposal_statuses.rs b/runtime-modules/proposals/engine/src/types/proposal_statuses.rs index a9d7b5dfda..1ce4d634b4 100644 --- a/runtime-modules/proposals/engine/src/types/proposal_statuses.rs +++ b/runtime-modules/proposals/engine/src/types/proposal_statuses.rs @@ -1,46 +1,49 @@ use codec::{Decode, Encode}; use rstd::prelude::*; +use crate::ActiveStake; #[cfg(feature = "std")] use serde::{Deserialize, Serialize}; /// Current status of the proposal #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] #[derive(Encode, Decode, Clone, PartialEq, Eq, Debug)] -pub enum ProposalStatus { - /// A new proposal that is available for voting. - Active, +pub enum ProposalStatus { + /// A new proposal status that is available for voting (with optional stake data). + Active(Option>), /// The proposal decision was made. - Finalized(FinalizationData), + Finalized(FinalizationData), } -impl Default for ProposalStatus { +impl Default for ProposalStatus { fn default() -> Self { - ProposalStatus::Active + ProposalStatus::Active(None) } } -impl ProposalStatus { +impl ProposalStatus { /// Creates finalized proposal status with provided ProposalDecisionStatus pub fn finalized( decision_status: ProposalDecisionStatus, now: BlockNumber, - ) -> ProposalStatus { - Self::finalized_with_error(decision_status, None, now) + ) -> ProposalStatus { + Self::finalized_with_error(decision_status, None, None, now) } /// Creates finalized proposal status with provided ProposalDecisionStatus and error pub fn finalized_with_error( decision_status: ProposalDecisionStatus, encoded_unstaking_error_due_to_broken_runtime: Option<&str>, + active_stake: Option>, now: BlockNumber, - ) -> ProposalStatus { + ) -> ProposalStatus { ProposalStatus::Finalized(FinalizationData { proposal_status: decision_status, encoded_unstaking_error_due_to_broken_runtime: encoded_unstaking_error_due_to_broken_runtime.map(|err| err.as_bytes().to_vec()), finalized_at: now, + stake_data_after_unstaking_error: active_stake, }) } @@ -48,11 +51,12 @@ impl ProposalStatus { pub fn approved( approved_status: ApprovedProposalStatus, now: BlockNumber, - ) -> ProposalStatus { + ) -> ProposalStatus { ProposalStatus::Finalized(FinalizationData { proposal_status: ProposalDecisionStatus::Approved(approved_status), encoded_unstaking_error_due_to_broken_runtime: None, finalized_at: now, + stake_data_after_unstaking_error: None, }) } } @@ -60,7 +64,7 @@ impl ProposalStatus { /// Final proposal status and potential error. #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] #[derive(Encode, Decode, Clone, PartialEq, Eq, Debug)] -pub struct FinalizationData { +pub struct FinalizationData { /// Final proposal status pub proposal_status: ProposalDecisionStatus, @@ -69,14 +73,17 @@ pub struct FinalizationData { /// Error occured during the proposal finalization - unstaking failed in the stake module pub encoded_unstaking_error_due_to_broken_runtime: Option>, + + /// Stake data for the proposal, filled if the unstaking wasn't successful + pub stake_data_after_unstaking_error: Option>, } -impl FinalizationData { +impl FinalizationData { /// FinalizationData helper, creates ApprovedProposalStatus pub fn create_approved_proposal_status( self, approved_status: ApprovedProposalStatus, - ) -> ProposalStatus { + ) -> ProposalStatus { ProposalStatus::Finalized(FinalizationData { proposal_status: ProposalDecisionStatus::Approved(approved_status), ..self From 7daf806ab7add9392c3ceaa83b342a116657d6e2 Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Wed, 25 Mar 2020 21:26:31 +0400 Subject: [PATCH 117/286] content working group: added set_mint_capacity dispatchable and tests --- .../content-working-group/src/genesis.rs | 6 +- .../content-working-group/src/lib.rs | 45 ++++++++++++- .../content-working-group/src/mock.rs | 9 ++- .../content-working-group/src/tests.rs | 66 ++++++++++++++++++- 4 files changed, 119 insertions(+), 7 deletions(-) diff --git a/runtime-modules/content-working-group/src/genesis.rs b/runtime-modules/content-working-group/src/genesis.rs index fcc4a4396b..6cf74f39c1 100644 --- a/runtime-modules/content-working-group/src/genesis.rs +++ b/runtime-modules/content-working-group/src/genesis.rs @@ -43,11 +43,11 @@ pub struct GenesisConfigBuilder { } impl GenesisConfigBuilder { - /* - pub fn set_mint(mut self, mint: ::MintId) -> Self { - self.mint = mint; + pub fn with_mint_capacity(mut self, capacity: minting::BalanceOf) -> Self { + self.mint_capacity = capacity; self } + /* pub fn set_channel_handle_constraint(mut self, constraint: InputValidationLengthConstraint) -> Self { self.channel_description_constraint = constraint; self diff --git a/runtime-modules/content-working-group/src/lib.rs b/runtime-modules/content-working-group/src/lib.rs index b0c6aeea93..d8e2d8f81d 100755 --- a/runtime-modules/content-working-group/src/lib.rs +++ b/runtime-modules/content-working-group/src/lib.rs @@ -1080,7 +1080,9 @@ decl_event! { CuratorApplicationId = CuratorApplicationId, CuratorId = CuratorId, CuratorApplicationIdToCuratorIdMap = CuratorApplicationIdToCuratorIdMap, + MintBalanceOf = minting::BalanceOf, ::AccountId, + ::MintId, { ChannelCreated(ChannelId), ChannelOwnershipTransferred(ChannelId), @@ -1100,6 +1102,8 @@ decl_event! { CuratorRewardAccountUpdated(CuratorId, AccountId), ChannelUpdatedByCurationActor(ChannelId), ChannelCreationEnabledUpdated(bool), + MintCapacityIncreased(MintId, MintBalanceOf, MintBalanceOf), + MintCapacityDecreased(MintId, MintBalanceOf, MintBalanceOf), } } @@ -2022,7 +2026,11 @@ decl_module! { Self::deposit_event(RawEvent::ChannelCreationEnabledUpdated(enabled)); } - /// Add to capacity of current acive mint + /// Add to capacity of current acive mint. + /// This may be deprecated in the future, since set_mint_capacity is sufficient to + /// both increase and decrease capacity. Although when considering that it may be executed + /// by a proposal, given the temporal delay in approving a proposal, it might be more suitable + /// than set_mint_capacity? pub fn increase_mint_capacity( origin, additional_capacity: minting::BalanceOf @@ -2033,6 +2041,41 @@ decl_module! { let mint = >::mints(mint_id); // must exist let new_capacity = mint.capacity() + additional_capacity; let _ = >::set_mint_capacity(mint_id, new_capacity); + + Self::deposit_event(RawEvent::MintCapacityIncreased( + mint_id, additional_capacity, new_capacity + )); + } + + /// Sets the capacity of the current active mint + pub fn set_mint_capacity( + origin, + new_capacity: minting::BalanceOf + ) { + ensure_root(origin)?; + + let mint_id = Self::mint(); + + // Mint must exist - it is set at genesis + let mint = >::mints(mint_id); + + let current_capacity = mint.capacity(); + + if new_capacity != current_capacity { + // Cannot fail if mint exists + let _ = >::set_mint_capacity(mint_id, new_capacity); + + if new_capacity > current_capacity { + Self::deposit_event(RawEvent::MintCapacityIncreased( + mint_id, new_capacity - current_capacity, new_capacity + )); + } else { + Self::deposit_event(RawEvent::MintCapacityDecreased( + mint_id, current_capacity - new_capacity, new_capacity + )); + } + } + } } } diff --git a/runtime-modules/content-working-group/src/mock.rs b/runtime-modules/content-working-group/src/mock.rs index 3f2f4a57f3..d99e240cf2 100644 --- a/runtime-modules/content-working-group/src/mock.rs +++ b/runtime-modules/content-working-group/src/mock.rs @@ -68,7 +68,9 @@ pub type RawLibTestEvent = RawEvent< CuratorApplicationId, CuratorId, CuratorApplicationIdToCuratorIdMap, + minting::BalanceOf, ::AccountId, + ::MintId, >; pub fn get_last_event_or_panic() -> RawLibTestEvent { @@ -220,11 +222,13 @@ impl TestExternalitiesBuilder { self.membership_config = Some(membership_config); self } - pub fn set_content_wg_config(mut self, conteng_wg_config: GenesisConfig) -> Self { + */ + + pub fn with_content_wg_config(mut self, conteng_wg_config: GenesisConfig) -> Self { self.content_wg_config = Some(conteng_wg_config); self } - */ + pub fn build(self) -> runtime_io::TestExternalities { // Add system let mut t = self @@ -260,3 +264,4 @@ impl TestExternalitiesBuilder { pub type System = system::Module; pub type Balances = balances::Module; pub type ContentWorkingGroup = Module; +pub type Minting = minting::Module; diff --git a/runtime-modules/content-working-group/src/tests.rs b/runtime-modules/content-working-group/src/tests.rs index 03cc88e36d..cb177f3bfd 100644 --- a/runtime-modules/content-working-group/src/tests.rs +++ b/runtime-modules/content-working-group/src/tests.rs @@ -1,6 +1,6 @@ #![cfg(test)] -//use super::genesis; +use super::genesis; use super::mock::{self, *}; //use crate::membership; use hiring; @@ -2184,3 +2184,67 @@ pub fn generate_too_short_length_buffer(constraint: &InputValidationLengthConstr pub fn generate_too_long_length_buffer(constraint: &InputValidationLengthConstraint) -> Vec { generate_text((constraint.max() + 1) as usize) } + +#[test] +fn setting_mint_capacity() { + const MINT_CAPACITY: u64 = 50000; + + TestExternalitiesBuilder::::default() + .with_content_wg_config( + genesis::GenesisConfigBuilder::::default() + .with_mint_capacity(MINT_CAPACITY) + .build(), + ) + .build() + .execute_with(|| {}); +} + +#[test] +fn setting_mint_capacity() { + const MINT_CAPACITY: u64 = 50000; + + TestExternalitiesBuilder::::default() + .with_content_wg_config( + genesis::GenesisConfigBuilder::::default() + .with_mint_capacity(MINT_CAPACITY) + .build(), + ) + .build() + .execute_with(|| { + let mint_id = ContentWorkingGroup::mint(); + let mint = Minting::mints(mint_id); + assert_eq!(mint.capacity(), MINT_CAPACITY); + + // Decreasing mint capacity + let new_lower_capacity = 10000; + let decrease = MINT_CAPACITY - new_lower_capacity; + assert_ok!(ContentWorkingGroup::set_mint_capacity( + Origin::ROOT, + new_lower_capacity + )); + // Correct event after decreasing + assert_eq!( + get_last_event_or_panic(), + crate::RawEvent::MintCapacityDecreased(mint_id, decrease, new_lower_capacity) + ); + // Correct value of capacity after decreasing + let mint = Minting::mints(mint_id); + assert_eq!(mint.capacity(), new_lower_capacity); + + // Increasing mint capacity + let new_higher_capacity = 25000; + let increase = new_higher_capacity - mint.capacity(); + assert_ok!(ContentWorkingGroup::set_mint_capacity( + Origin::ROOT, + new_higher_capacity + )); + // Excpected event after increasing + assert_eq!( + get_last_event_or_panic(), + crate::RawEvent::MintCapacityIncreased(mint_id, increase, new_higher_capacity) + ); + // Excpected value of capacity after increasing + let mint = Minting::mints(mint_id); + assert_eq!(mint.capacity(), new_higher_capacity); + }); +} From 06b397fa0f649d443ed96eeac71142cd5593076a Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Wed, 25 Mar 2020 21:44:36 +0400 Subject: [PATCH 118/286] content working group: test for increase_mint_capacity --- .../content-working-group/src/tests.rs | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/runtime-modules/content-working-group/src/tests.rs b/runtime-modules/content-working-group/src/tests.rs index cb177f3bfd..8d8f6f8198 100644 --- a/runtime-modules/content-working-group/src/tests.rs +++ b/runtime-modules/content-working-group/src/tests.rs @@ -2186,7 +2186,7 @@ pub fn generate_too_long_length_buffer(constraint: &InputValidationLengthConstra } #[test] -fn setting_mint_capacity() { +fn increasing_mint_capacity() { const MINT_CAPACITY: u64 = 50000; TestExternalitiesBuilder::::default() @@ -2196,7 +2196,27 @@ fn setting_mint_capacity() { .build(), ) .build() - .execute_with(|| {}); + .execute_with(|| { + let mint_id = ContentWorkingGroup::mint(); + let mint = Minting::mints(mint_id); + assert_eq!(mint.capacity(), MINT_CAPACITY); + + let increase = 25000; + // Increasing mint capacity + let expected_new_capacity = MINT_CAPACITY + increase; + assert_ok!(ContentWorkingGroup::increase_mint_capacity( + Origin::ROOT, + increase + )); + // Excpected event after increasing + assert_eq!( + get_last_event_or_panic(), + crate::RawEvent::MintCapacityIncreased(mint_id, increase, expected_new_capacity) + ); + // Excpected value of capacity after increasing + let mint = Minting::mints(mint_id); + assert_eq!(mint.capacity(), expected_new_capacity); + }); } #[test] From 3254ef1a1b38179739c6c65b844c3805c007a525 Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Wed, 25 Mar 2020 21:45:00 +0400 Subject: [PATCH 119/286] bumpp runtime spec 9 since we added methods to the public api --- Cargo.lock | 2 +- runtime/Cargo.toml | 2 +- runtime/src/lib.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cc4b914ad6..eea76befb9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1599,7 +1599,7 @@ dependencies = [ [[package]] name = "joystream-node-runtime" -version = "6.8.1" +version = "6.9.0" dependencies = [ "parity-scale-codec", "safe-mix", diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 25c158357d..6ff953659c 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -5,7 +5,7 @@ edition = '2018' name = 'joystream-node-runtime' # Follow convention: https://github.com/Joystream/substrate-runtime-joystream/issues/1 # {Authoring}.{Spec}.{Impl} of the RuntimeVersion -version = '6.8.1' +version = '6.9.0' [features] default = ['std'] diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index d8ed411c8c..92c4bbb9f0 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -115,7 +115,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("joystream-node"), impl_name: create_runtime_str!("joystream-node"), authoring_version: 6, - spec_version: 8, + spec_version: 9, impl_version: 0, apis: RUNTIME_API_VERSIONS, }; From 0ad43e5cf9fa3d074c3a5dbedcf78780a09ca5be Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Thu, 26 Mar 2020 17:46:20 +0400 Subject: [PATCH 120/286] council election: set_election_parameters() replacing individual calls for each parameter --- runtime-modules/governance/src/election.rs | 130 +++++++++++------- .../governance/src/election_params.rs | 45 ++++++ runtime-modules/governance/src/lib.rs | 1 + 3 files changed, 128 insertions(+), 48 deletions(-) create mode 100644 runtime-modules/governance/src/election_params.rs diff --git a/runtime-modules/governance/src/election.rs b/runtime-modules/governance/src/election.rs index 7e8c5dcf82..0c82a1def9 100644 --- a/runtime-modules/governance/src/election.rs +++ b/runtime-modules/governance/src/election.rs @@ -14,6 +14,7 @@ use super::sealed_vote::SealedVote; use super::stake::Stake; use super::council; +use crate::election_params::{self, ElectionParameters}; pub use common::currency::{BalanceOf, GovernanceCurrency}; pub trait Trait: @@ -24,6 +25,8 @@ pub trait Trait: type CouncilElected: CouncilElected>, Self::BlockNumber>; } +pub static MSG_CANNOT_CHANGE_PARAMS_DURING_ELECTION: &str = "CannotChangeParamsDuringElection"; + #[derive(Clone, Copy, Encode, Decode)] pub enum ElectionStage { Announcing(BlockNumber), @@ -106,8 +109,23 @@ decl_storage! { // TODO value type of this map looks scary, is there any way to simplify the notation? Votes get(votes): map T::Hash => SealedVote, T::Hash, T::AccountId>; - // Current Election Parameters - default "zero" values are not meaningful. Running an election without - // settings reasonable values is a bad idea. Parameters can be set in the TriggerElection hook. + // Current Election Parameters. + // Should we replace all the individual values with a single ElectionParameters type? + // Having them individually makes it more flexible to add and remove new parameters in future + // without dealing with migration issues. + + // We don't currently handle zero periods, zero council term, zero council size and candidacy + // limit in any special way. The behaviour in such cases: + // Setting any period to 0 will mean the election getting stuck in that stage, until force changing + // the state. + // Council Size of 0 - no limit to size of council, all applicants that move beyond + // announcing stage would become council members, so effectively the candidacy limit will + // be the size of the council, voting and revealing have no impact on final results. + // If candidacy limit is zero and council size > 0, council_size number of applicants will reach the voting stage. + // and become council members, voting will have no impact on final results. + // If both candidacy limit and council size are zero then all applicant become council members + // since no filtering occurs at end of announcing stage. + // We only guard against these edge cases in the set_election_parameters() call. AnnouncingPeriod get(announcing_period) config(): T::BlockNumber = T::BlockNumber::from(100); VotingPeriod get(voting_period) config(): T::BlockNumber = T::BlockNumber::from(100); RevealingPeriod get(revealing_period) config(): T::BlockNumber = T::BlockNumber::from(100); @@ -195,7 +213,7 @@ impl Module { // Take snapshot of seat and backing stakes of an existing council // Its important to note that the election system takes ownership of these stakes, and is responsible - // to return any unused stake to original owners and the end of the election. + // to return any unused stake to original owners at the end of the election. Self::initialize_transferable_stakes(current_council); Self::deposit_event(RawEvent::ElectionStarted()); @@ -803,52 +821,19 @@ decl_module! { >::put(ElectionStage::Voting(ends_at)); } - fn set_param_announcing_period(origin, period: T::BlockNumber) { - ensure_root(origin)?; - ensure!(!Self::is_election_running(), "cannot change params during election"); - ensure!(!period.is_zero(), "period cannot be zero"); - >::put(period); - } - fn set_param_voting_period(origin, period: T::BlockNumber) { - ensure_root(origin)?; - ensure!(!Self::is_election_running(), "cannot change params during election"); - ensure!(!period.is_zero(), "period cannot be zero"); - >::put(period); - } - fn set_param_revealing_period(origin, period: T::BlockNumber) { - ensure_root(origin)?; - ensure!(!Self::is_election_running(), "cannot change params during election"); - ensure!(!period.is_zero(), "period cannot be zero"); - >::put(period); - } - fn set_param_min_council_stake(origin, amount: BalanceOf) { - ensure_root(origin)?; - ensure!(!Self::is_election_running(), "cannot change params during election"); - >::put(amount); - } - fn set_param_new_term_duration(origin, duration: T::BlockNumber) { + fn set_election_parameters(origin, params: ElectionParameters, T::BlockNumber>) { ensure_root(origin)?; - ensure!(!Self::is_election_running(), "cannot change params during election"); - ensure!(!duration.is_zero(), "new term duration cannot be zero"); - >::put(duration); - } - fn set_param_council_size(origin, council_size: u32) { - ensure_root(origin)?; - ensure!(!Self::is_election_running(), "cannot change params during election"); - ensure!(council_size > 0, "council size cannot be zero"); - ensure!(council_size <= Self::candidacy_limit(), "council size cannot greater than candidacy limit"); - CouncilSize::put(council_size); - } - fn set_param_candidacy_limit(origin, limit: u32) { - ensure_root(origin)?; - ensure!(!Self::is_election_running(), "cannot change params during election"); - ensure!(limit >= Self::council_size(), "candidacy limit cannot be less than council size"); - CandidacyLimit::put(limit); - } - fn set_param_min_voting_stake(origin, amount: BalanceOf) { - ensure_root(origin)?; - ensure!(!Self::is_election_running(), "cannot change params during election"); - >::put(amount); + ensure!(!Self::is_election_running(), MSG_CANNOT_CHANGE_PARAMS_DURING_ELECTION); + params.ensure_valid()?; + + >::put(params.announcing_period); + >::put(params.voting_period); + >::put(params.revealing_period); + >::put(params.min_council_stake); + >::put(params.new_term_duration); + CouncilSize::put(params.council_size); + CandidacyLimit::put(params.candidacy_limit); + >::put(params.min_voting_stake); } fn force_stop_election(origin) { @@ -2042,4 +2027,53 @@ mod tests { assert_ok!(Election::start_election(vec![])); }); } + + #[test] + fn setting_election_parameters() { + initial_test_ext().execute_with(|| { + let default_parameters: ElectionParameters = ElectionParameters::default(); + // default all zeros is invalid + assert!(default_parameters.ensure_valid().is_err()); + + let new_parameters = ElectionParameters { + announcing_period: 1, + voting_period: 2, + revealing_period: 3, + council_size: 4, + candidacy_limit: 5, + min_voting_stake: 6, + min_council_stake: 7, + new_term_duration: 8, + }; + + assert_ok!(Election::set_election_parameters( + Origin::ROOT, + new_parameters + )); + + assert_eq!( + >::get(), + new_parameters.announcing_period + ); + assert_eq!(>::get(), new_parameters.voting_period); + assert_eq!( + >::get(), + new_parameters.revealing_period + ); + assert_eq!( + >::get(), + new_parameters.min_council_stake + ); + assert_eq!( + >::get(), + new_parameters.new_term_duration + ); + assert_eq!(CouncilSize::get(), new_parameters.council_size); + assert_eq!(CandidacyLimit::get(), new_parameters.candidacy_limit); + assert_eq!( + >::get(), + new_parameters.min_voting_stake + ); + }); + } } diff --git a/runtime-modules/governance/src/election_params.rs b/runtime-modules/governance/src/election_params.rs new file mode 100644 index 0000000000..99d4404b49 --- /dev/null +++ b/runtime-modules/governance/src/election_params.rs @@ -0,0 +1,45 @@ +use codec::{Decode, Encode}; +use sr_primitives::traits::Zero; +use srml_support::{dispatch::Result, ensure}; + +pub static MSG_PERIOD_CANNOT_BE_ZERO: &str = "PeriodCannotBeZero"; +pub static MSG_COUNCIL_SIZE_CANNOT_BE_ZERO: &str = "CouncilSizeCannotBeZero"; +pub static MSG_CANDIDACY_LIMIT_WAS_LOWER_THAN_COUNCIL_SIZE: &str = + "CandidacyWasLessThanCouncilSize"; + +/// Combined Election parameters, as argument for set_election_parameters +#[derive(Clone, Copy, Encode, Decode, Default, PartialEq, Debug)] +pub struct ElectionParameters { + pub announcing_period: BlockNumber, + pub voting_period: BlockNumber, + pub revealing_period: BlockNumber, + pub council_size: u32, + pub candidacy_limit: u32, + pub new_term_duration: BlockNumber, + pub min_council_stake: Balance, + pub min_voting_stake: Balance, +} + +impl ElectionParameters { + pub fn ensure_valid(&self) -> Result { + self.ensure_periods_are_valid()?; + self.ensure_council_size_and_candidacy_limit_are_valid()?; + Ok(()) + } + + fn ensure_periods_are_valid(&self) -> Result { + ensure!(!self.announcing_period.is_zero(), MSG_PERIOD_CANNOT_BE_ZERO); + ensure!(!self.voting_period.is_zero(), MSG_PERIOD_CANNOT_BE_ZERO); + ensure!(!self.revealing_period.is_zero(), MSG_PERIOD_CANNOT_BE_ZERO); + Ok(()) + } + + fn ensure_council_size_and_candidacy_limit_are_valid(&self) -> Result { + ensure!(self.council_size > 0, MSG_COUNCIL_SIZE_CANNOT_BE_ZERO); + ensure!( + self.council_size <= self.candidacy_limit, + MSG_CANDIDACY_LIMIT_WAS_LOWER_THAN_COUNCIL_SIZE + ); + Ok(()) + } +} diff --git a/runtime-modules/governance/src/lib.rs b/runtime-modules/governance/src/lib.rs index 9e1d712f8b..9b39780d8a 100644 --- a/runtime-modules/governance/src/lib.rs +++ b/runtime-modules/governance/src/lib.rs @@ -3,6 +3,7 @@ pub mod council; pub mod election; +pub mod election_params; pub mod proposals; mod sealed_vote; From 34b149afbcf3fd939526f87c8dae5df632050a38 Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Thu, 26 Mar 2020 18:03:20 +0400 Subject: [PATCH 121/286] bump runtime spec to 10, bump node to v2.1.4 --- Cargo.lock | 4 ++-- node/Cargo.toml | 2 +- runtime/Cargo.toml | 2 +- runtime/src/lib.rs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cc4b914ad6..4fd6571eb9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1554,7 +1554,7 @@ dependencies = [ [[package]] name = "joystream-node" -version = "2.1.3" +version = "2.1.4" dependencies = [ "ctrlc", "derive_more 0.14.1", @@ -1599,7 +1599,7 @@ dependencies = [ [[package]] name = "joystream-node-runtime" -version = "6.8.1" +version = "6.10.0" dependencies = [ "parity-scale-codec", "safe-mix", diff --git a/node/Cargo.toml b/node/Cargo.toml index 12aa4b4890..62394af5a0 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -3,7 +3,7 @@ authors = ['Joystream'] build = 'build.rs' edition = '2018' name = 'joystream-node' -version = '2.1.3' +version = '2.1.4' default-run = "joystream-node" [[bin]] diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 25c158357d..74b1a68aa3 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -5,7 +5,7 @@ edition = '2018' name = 'joystream-node-runtime' # Follow convention: https://github.com/Joystream/substrate-runtime-joystream/issues/1 # {Authoring}.{Spec}.{Impl} of the RuntimeVersion -version = '6.8.1' +version = '6.10.0' [features] default = ['std'] diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index d8ed411c8c..5829a0b3b3 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -115,7 +115,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("joystream-node"), impl_name: create_runtime_str!("joystream-node"), authoring_version: 6, - spec_version: 8, + spec_version: 10, impl_version: 0, apis: RUNTIME_API_VERSIONS, }; From f97d3c8451df426870c1477ed2ab5681ffa7bfbb Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Thu, 26 Mar 2020 18:10:13 +0400 Subject: [PATCH 122/286] fix compiler warning --- runtime-modules/governance/src/election.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime-modules/governance/src/election.rs b/runtime-modules/governance/src/election.rs index 0c82a1def9..bcb4bf4185 100644 --- a/runtime-modules/governance/src/election.rs +++ b/runtime-modules/governance/src/election.rs @@ -14,7 +14,7 @@ use super::sealed_vote::SealedVote; use super::stake::Stake; use super::council; -use crate::election_params::{self, ElectionParameters}; +use crate::election_params::ElectionParameters; pub use common::currency::{BalanceOf, GovernanceCurrency}; pub trait Trait: From 1d115a84a74548faa113f678570de987e90417b4 Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Thu, 26 Mar 2020 18:21:00 +0400 Subject: [PATCH 123/286] do not ignore result value when calling set_mint_capacity --- runtime-modules/content-working-group/src/lib.rs | 4 ++-- runtime-modules/token-minting/src/lib.rs | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/runtime-modules/content-working-group/src/lib.rs b/runtime-modules/content-working-group/src/lib.rs index d8e2d8f81d..482a4a49c3 100755 --- a/runtime-modules/content-working-group/src/lib.rs +++ b/runtime-modules/content-working-group/src/lib.rs @@ -2040,7 +2040,7 @@ decl_module! { let mint_id = Self::mint(); let mint = >::mints(mint_id); // must exist let new_capacity = mint.capacity() + additional_capacity; - let _ = >::set_mint_capacity(mint_id, new_capacity); + >::set_mint_capacity(mint_id, new_capacity)?; Self::deposit_event(RawEvent::MintCapacityIncreased( mint_id, additional_capacity, new_capacity @@ -2063,7 +2063,7 @@ decl_module! { if new_capacity != current_capacity { // Cannot fail if mint exists - let _ = >::set_mint_capacity(mint_id, new_capacity); + >::set_mint_capacity(mint_id, new_capacity)?; if new_capacity > current_capacity { Self::deposit_event(RawEvent::MintCapacityIncreased( diff --git a/runtime-modules/token-minting/src/lib.rs b/runtime-modules/token-minting/src/lib.rs index b84237708e..df9c6fef91 100755 --- a/runtime-modules/token-minting/src/lib.rs +++ b/runtime-modules/token-minting/src/lib.rs @@ -73,6 +73,15 @@ impl From for TransferError { } } +impl From for &'static str { + fn from(err: GeneralError) -> &'static str { + match err { + GeneralError::MintNotFound => "MintNotFound", + GeneralError::NextAdjustmentInPast => "NextAdjustmentInPast", + } + } +} + #[derive(Encode, Decode, Copy, Clone, Debug, Eq, PartialEq)] pub enum Adjustment { // First adjustment will be after AdjustOnInterval.block_interval From 85684bf2540bf87d41da9ba78767a91fce8a3337 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Thu, 26 Mar 2020 17:34:00 +0300 Subject: [PATCH 124/286] Fix broken tests --- runtime-modules/proposals/engine/src/lib.rs | 8 ++++++-- runtime-modules/proposals/engine/src/tests/mod.rs | 12 ++++++------ runtime-modules/proposals/engine/src/types/mod.rs | 4 ++-- .../engine/src/types/proposal_statuses.rs | 14 ++++++++++---- 4 files changed, 24 insertions(+), 14 deletions(-) diff --git a/runtime-modules/proposals/engine/src/lib.rs b/runtime-modules/proposals/engine/src/lib.rs index 0e0ea736f7..e4c07f2dc3 100644 --- a/runtime-modules/proposals/engine/src/lib.rs +++ b/runtime-modules/proposals/engine/src/lib.rs @@ -549,8 +549,12 @@ impl Module { Self::slash_and_unstake(active_stake.clone(), slash_balance); // create finalized proposal status with error if any - let new_proposal_status = //TODO rename without an error - ProposalStatus::finalized_with_error(decision_status, slash_and_unstake_result.err(), active_stake, Self::current_block()); + let new_proposal_status = ProposalStatus::finalized( + decision_status, + slash_and_unstake_result.err(), + active_stake, + Self::current_block(), + ); proposal.status = new_proposal_status.clone(); >::insert(proposal_id, proposal); diff --git a/runtime-modules/proposals/engine/src/tests/mod.rs b/runtime-modules/proposals/engine/src/tests/mod.rs index d52fc06aaf..3a9230508f 100644 --- a/runtime-modules/proposals/engine/src/tests/mod.rs +++ b/runtime-modules/proposals/engine/src/tests/mod.rs @@ -464,7 +464,7 @@ fn rejected_voting_results_and_remove_proposal_id_from_active_succeeds() { assert_eq!( proposal.status, - ProposalStatus::finalized(ProposalDecisionStatus::Rejected, 1), + ProposalStatus::finalized_successfully(ProposalDecisionStatus::Rejected, 1), ); assert!(!>::exists(proposal_id)); }); @@ -566,7 +566,7 @@ fn cancel_proposal_succeeds() { parameters: parameters_fixture.params(), proposer_id: 1, created_at: 1, - status: ProposalStatus::finalized(ProposalDecisionStatus::Canceled, 1), + status: ProposalStatus::finalized_successfully(ProposalDecisionStatus::Canceled, 1), title: b"title".to_vec(), description: b"description".to_vec(), voting_results: VotingResults::default(), @@ -634,7 +634,7 @@ fn veto_proposal_succeeds() { parameters: parameters_fixture.params(), proposer_id: 1, created_at: 1, - status: ProposalStatus::finalized(ProposalDecisionStatus::Vetoed, 1), + status: ProposalStatus::finalized_successfully(ProposalDecisionStatus::Vetoed, 1), title: b"title".to_vec(), description: b"description".to_vec(), voting_results: VotingResults::default(), @@ -701,7 +701,7 @@ fn veto_proposal_event_emitted() { RawEvent::ProposalCreated(1, 1), RawEvent::ProposalStatusUpdated( 1, - ProposalStatus::finalized(ProposalDecisionStatus::Vetoed, 1), + ProposalStatus::finalized_successfully(ProposalDecisionStatus::Vetoed, 1), ), ]); }); @@ -765,7 +765,7 @@ fn create_proposal_and_expire_it() { parameters: parameters_fixture.params(), proposer_id: 1, created_at: 1, - status: ProposalStatus::finalized(ProposalDecisionStatus::Expired, 4), + status: ProposalStatus::finalized_successfully(ProposalDecisionStatus::Expired, 4), title: b"title".to_vec(), description: b"description".to_vec(), voting_results: VotingResults::default(), @@ -1282,7 +1282,7 @@ fn finalize_proposal_using_stake_mocks_failed() { parameters: parameters_fixture.params(), proposer_id: 1, created_at: 1, - status: ProposalStatus::finalized_with_error( + status: ProposalStatus::finalized( ProposalDecisionStatus::Expired, Some("Cannot remove stake"), Some(ActiveStake { diff --git a/runtime-modules/proposals/engine/src/types/mod.rs b/runtime-modules/proposals/engine/src/types/mod.rs index ad9f84fd40..0948a327cf 100644 --- a/runtime-modules/proposals/engine/src/types/mod.rs +++ b/runtime-modules/proposals/engine/src/types/mod.rs @@ -389,7 +389,7 @@ mod tests { let mut proposal = ProposalObject::default(); proposal.parameters.grace_period = 3; - proposal.status = ProposalStatus::finalized( + proposal.status = ProposalStatus::finalized_successfully( ProposalDecisionStatus::Approved(ApprovedProposalStatus::PendingExecution), 0, ); @@ -402,7 +402,7 @@ mod tests { let mut proposal = ProposalObject::default(); proposal.parameters.grace_period = 0; - proposal.status = ProposalStatus::finalized( + proposal.status = ProposalStatus::finalized_successfully( ProposalDecisionStatus::Approved(ApprovedProposalStatus::PendingExecution), 0, ); diff --git a/runtime-modules/proposals/engine/src/types/proposal_statuses.rs b/runtime-modules/proposals/engine/src/types/proposal_statuses.rs index 1ce4d634b4..1a2de64dbd 100644 --- a/runtime-modules/proposals/engine/src/types/proposal_statuses.rs +++ b/runtime-modules/proposals/engine/src/types/proposal_statuses.rs @@ -24,26 +24,32 @@ impl Default for ProposalStatus ProposalStatus { /// Creates finalized proposal status with provided ProposalDecisionStatus - pub fn finalized( + pub fn finalized_successfully( decision_status: ProposalDecisionStatus, now: BlockNumber, ) -> ProposalStatus { - Self::finalized_with_error(decision_status, None, None, now) + Self::finalized(decision_status, None, None, now) } /// Creates finalized proposal status with provided ProposalDecisionStatus and error - pub fn finalized_with_error( + pub fn finalized( decision_status: ProposalDecisionStatus, encoded_unstaking_error_due_to_broken_runtime: Option<&str>, active_stake: Option>, now: BlockNumber, ) -> ProposalStatus { + // drop the stake information if there were no errors on unstaking + let actual_stake = if encoded_unstaking_error_due_to_broken_runtime.is_some() { + active_stake + } else { + None + }; ProposalStatus::Finalized(FinalizationData { proposal_status: decision_status, encoded_unstaking_error_due_to_broken_runtime: encoded_unstaking_error_due_to_broken_runtime.map(|err| err.as_bytes().to_vec()), finalized_at: now, - stake_data_after_unstaking_error: active_stake, + stake_data_after_unstaking_error: actual_stake, }) } From e44bfe1a24cded345ac4bdc400c10f7af6934388 Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Thu, 26 Mar 2020 20:24:33 +0400 Subject: [PATCH 125/286] content working group: replace_lead in place of set_lead, unset_lead --- .../content-working-group/src/lib.rs | 198 ++++++++++-------- .../content-working-group/src/tests.rs | 12 +- 2 files changed, 112 insertions(+), 98 deletions(-) diff --git a/runtime-modules/content-working-group/src/lib.rs b/runtime-modules/content-working-group/src/lib.rs index b0c6aeea93..94939750ef 100755 --- a/runtime-modules/content-working-group/src/lib.rs +++ b/runtime-modules/content-working-group/src/lib.rs @@ -1906,103 +1906,23 @@ decl_module! { ); } - /* - * Root origin routines for managing lead. - */ - - - /// Introduce a lead when one is not currently set. - pub fn set_lead(origin, member: T::MemberId, role_account: T::AccountId) { - + /// Replace the current lead. First unsets the active lead if there is one. + /// If a value is provided for new_lead it will then set that new lead. + /// It is responsibility of the caller to ensure the new lead can be set + /// to avoid the lead role being vacant at the end of the call. + pub fn replace_lead(origin, new_lead: Option<(T::MemberId, T::AccountId)>) { // Ensure root is origin ensure_root(origin)?; - // Ensure there is no current lead - ensure!( - >::get().is_none(), - MSG_CURRENT_LEAD_ALREADY_SET - ); - - // Ensure that member can actually become lead - let new_lead_id = >::get(); - - let new_lead_role = - role_types::ActorInRole::new(role_types::Role::CuratorLead, new_lead_id); - - let _profile = >::can_register_role_on_member( - &member, - &role_types::ActorInRole::new(role_types::Role::CuratorLead, new_lead_id), - )?; - - // - // == MUTATION SAFE == - // - - // Construct lead - let new_lead = Lead { - role_account: role_account.clone(), - reward_relationship: None, - inducted: >::block_number(), - stage: LeadRoleState::Active, - }; - - // Store lead - >::insert(new_lead_id, new_lead); - - // Update current lead - >::put(new_lead_id); // Some(new_lead_id) - - // Update next lead counter - >::mutate(|id| *id += as One>::one()); - - // Register in role - let registered_role = - >::register_role_on_member(member, &new_lead_role).is_ok(); - - assert!(registered_role); - - // Trigger event - Self::deposit_event(RawEvent::LeadSet(new_lead_id)); - } - - /// Evict the currently unset lead - pub fn unset_lead(origin) { - - // Ensure root is origin - ensure_root(origin)?; - - // Ensure there is a lead set - let (lead_id,lead) = Self::ensure_lead_is_set()?; - - // - // == MUTATION SAFE == - // - - // Unregister from role in membership model - let current_lead_role = role_types::ActorInRole{ - role: role_types::Role::CuratorLead, - actor_id: lead_id - }; - - let unregistered_role = >::unregister_role(current_lead_role).is_ok(); - - assert!(unregistered_role); - - // Update lead stage as exited - let current_block = >::block_number(); - - let new_lead = Lead{ - stage: LeadRoleState::Exited(ExitedLeadRole { initiated_at_block_number: current_block}), - ..lead - }; - - >::insert(lead_id, new_lead); - - // Update current lead - >::take(); // None + // Unset current lead first + if Self::ensure_lead_is_set().is_ok() { + Self::unset_lead()?; + } - // Trigger event - Self::deposit_event(RawEvent::LeadUnset(lead_id)); + // Try to set new lead + if let Some((member_id, role_account)) = new_lead { + Self::set_lead(member_id, role_account)?; + } } /// Add an opening for a curator role. @@ -2079,6 +1999,98 @@ impl versioned_store_permissions::CredentialChecker for Module { } impl Module { + /// Introduce a lead when one is not currently set. + fn set_lead(member: T::MemberId, role_account: T::AccountId) -> dispatch::Result { + // Ensure there is no current lead + ensure!( + >::get().is_none(), + MSG_CURRENT_LEAD_ALREADY_SET + ); + + // Ensure that member can actually become lead + let new_lead_id = >::get(); + + let new_lead_role = + role_types::ActorInRole::new(role_types::Role::CuratorLead, new_lead_id); + + let _profile = >::can_register_role_on_member( + &member, + &role_types::ActorInRole::new(role_types::Role::CuratorLead, new_lead_id), + )?; + + // + // == MUTATION SAFE == + // + + // Construct lead + let new_lead = Lead { + role_account: role_account.clone(), + reward_relationship: None, + inducted: >::block_number(), + stage: LeadRoleState::Active, + }; + + // Store lead + >::insert(new_lead_id, new_lead); + + // Update current lead + >::put(new_lead_id); // Some(new_lead_id) + + // Update next lead counter + >::mutate(|id| *id += as One>::one()); + + // Register in role + let registered_role = + >::register_role_on_member(member, &new_lead_role).is_ok(); + + assert!(registered_role); + + // Trigger event + Self::deposit_event(RawEvent::LeadSet(new_lead_id)); + + Ok(()) + } + + /// Evict the currently set lead + fn unset_lead() -> dispatch::Result { + // Ensure there is a lead set + let (lead_id, lead) = Self::ensure_lead_is_set()?; + + // + // == MUTATION SAFE == + // + + // Unregister from role in membership model + let current_lead_role = role_types::ActorInRole { + role: role_types::Role::CuratorLead, + actor_id: lead_id, + }; + + let unregistered_role = >::unregister_role(current_lead_role).is_ok(); + + assert!(unregistered_role); + + // Update lead stage as exited + let current_block = >::block_number(); + + let new_lead = Lead { + stage: LeadRoleState::Exited(ExitedLeadRole { + initiated_at_block_number: current_block, + }), + ..lead + }; + + >::insert(lead_id, new_lead); + + // Update current lead + >::take(); // None + + // Trigger event + Self::deposit_event(RawEvent::LeadUnset(lead_id)); + + Ok(()) + } + fn ensure_member_has_no_active_application_on_opening( curator_applications: CuratorApplicationIdSet, member_id: T::MemberId, diff --git a/runtime-modules/content-working-group/src/tests.rs b/runtime-modules/content-working-group/src/tests.rs index 03cc88e36d..acf19b10aa 100644 --- a/runtime-modules/content-working-group/src/tests.rs +++ b/runtime-modules/content-working-group/src/tests.rs @@ -1160,7 +1160,10 @@ struct SetLeadFixture { impl SetLeadFixture { fn call(&self) -> Result<(), &'static str> { - ContentWorkingGroup::set_lead(self.origin.clone(), self.member_id, self.new_role_account) + ContentWorkingGroup::replace_lead( + self.origin.clone(), + Some((self.member_id, self.new_role_account)), + ) } pub fn call_and_assert_success(&self) { @@ -1221,7 +1224,7 @@ struct UnsetLeadFixture { impl UnsetLeadFixture { fn call(&self) -> Result<(), &'static str> { - ContentWorkingGroup::unset_lead(self.origin.clone()) + ContentWorkingGroup::replace_lead(self.origin.clone(), None) } pub fn call_and_assert_success(&self) { @@ -2121,10 +2124,9 @@ pub fn set_lead( // Set lead assert_eq!( - ContentWorkingGroup::set_lead( + ContentWorkingGroup::replace_lead( mock::Origin::system(system::RawOrigin::Root), - member_id, - new_role_account + Some((member_id, new_role_account)) ) .unwrap(), () From 1ef9f9d63240631ddf08b75b9ac477e170c418af Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Thu, 26 Mar 2020 20:25:11 +0400 Subject: [PATCH 126/286] bump runtime spec to 11, node version to v2.1.5 --- Cargo.lock | 4 ++-- node/Cargo.toml | 2 +- runtime/Cargo.toml | 2 +- runtime/src/lib.rs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cc4b914ad6..3051b32eda 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1554,7 +1554,7 @@ dependencies = [ [[package]] name = "joystream-node" -version = "2.1.3" +version = "2.1.5" dependencies = [ "ctrlc", "derive_more 0.14.1", @@ -1599,7 +1599,7 @@ dependencies = [ [[package]] name = "joystream-node-runtime" -version = "6.8.1" +version = "6.11.0" dependencies = [ "parity-scale-codec", "safe-mix", diff --git a/node/Cargo.toml b/node/Cargo.toml index 12aa4b4890..134bad64a6 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -3,7 +3,7 @@ authors = ['Joystream'] build = 'build.rs' edition = '2018' name = 'joystream-node' -version = '2.1.3' +version = '2.1.5' default-run = "joystream-node" [[bin]] diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 25c158357d..eeba50dd15 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -5,7 +5,7 @@ edition = '2018' name = 'joystream-node-runtime' # Follow convention: https://github.com/Joystream/substrate-runtime-joystream/issues/1 # {Authoring}.{Spec}.{Impl} of the RuntimeVersion -version = '6.8.1' +version = '6.11.0' [features] default = ['std'] diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index d8ed411c8c..bf1581d52f 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -115,7 +115,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("joystream-node"), impl_name: create_runtime_str!("joystream-node"), authoring_version: 6, - spec_version: 8, + spec_version: 11, impl_version: 0, apis: RUNTIME_API_VERSIONS, }; From 3df8a4d224d64cea065e26a9296aa01b1e19074a Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Fri, 27 Mar 2020 11:33:22 +0400 Subject: [PATCH 127/286] add mint to council --- Cargo.lock | 5 +++-- node/Cargo.toml | 2 +- runtime-modules/governance/Cargo.toml | 8 ++++++- runtime-modules/governance/src/council.rs | 24 +++++++++++++++++--- runtime-modules/governance/src/election.rs | 19 +++++++++------- runtime-modules/governance/src/mock.rs | 5 ++++- runtime-modules/governance/src/proposals.rs | 24 ++++++++++++-------- runtime/Cargo.toml | 2 +- runtime/src/lib.rs | 2 +- runtime/src/migration.rs | 25 +++++++++------------ 10 files changed, 74 insertions(+), 42 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index eea76befb9..232c102310 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1554,7 +1554,7 @@ dependencies = [ [[package]] name = "joystream-node" -version = "2.1.3" +version = "2.1.6" dependencies = [ "ctrlc", "derive_more 0.14.1", @@ -1599,7 +1599,7 @@ dependencies = [ [[package]] name = "joystream-node-runtime" -version = "6.9.0" +version = "6.12.0" dependencies = [ "parity-scale-codec", "safe-mix", @@ -4796,6 +4796,7 @@ dependencies = [ "substrate-common-module", "substrate-membership-module", "substrate-primitives", + "substrate-token-mint-module", ] [[package]] diff --git a/node/Cargo.toml b/node/Cargo.toml index 12aa4b4890..bb6930245e 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -3,7 +3,7 @@ authors = ['Joystream'] build = 'build.rs' edition = '2018' name = 'joystream-node' -version = '2.1.3' +version = '2.1.6' default-run = "joystream-node" [[bin]] diff --git a/runtime-modules/governance/Cargo.toml b/runtime-modules/governance/Cargo.toml index 61cce493b9..d3314bd0db 100644 --- a/runtime-modules/governance/Cargo.toml +++ b/runtime-modules/governance/Cargo.toml @@ -17,6 +17,7 @@ std = [ 'rstd/std', 'common/std', 'membership/std', + 'minting/std', ] [dependencies.sr-primitives] @@ -86,4 +87,9 @@ rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' default_features = false git = 'https://github.com/paritytech/substrate.git' package = 'srml-balances' -rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' \ No newline at end of file +rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' + +[dependencies.minting] +default_features = false +package = 'substrate-token-mint-module' +path = '../token-minting' \ No newline at end of file diff --git a/runtime-modules/governance/src/council.rs b/runtime-modules/governance/src/council.rs index 792977f073..71b3e6419d 100644 --- a/runtime-modules/governance/src/council.rs +++ b/runtime-modules/governance/src/council.rs @@ -21,7 +21,7 @@ impl CouncilTermEnded for (X,) { } } -pub trait Trait: system::Trait + GovernanceCurrency { +pub trait Trait: system::Trait + minting::Trait + GovernanceCurrency { type Event: From> + Into<::Event>; type CouncilTermEnded: CouncilTermEnded; @@ -29,8 +29,14 @@ pub trait Trait: system::Trait + GovernanceCurrency { decl_storage! { trait Store for Module as Council { - ActiveCouncil get(active_council) config(): Seats>; - TermEndsAt get(term_ends_at) config() : T::BlockNumber = T::BlockNumber::from(1); + pub ActiveCouncil get(active_council) config(): Seats>; + + pub TermEndsAt get(term_ends_at) config() : T::BlockNumber = T::BlockNumber::from(1); + + /// The mint that funds council member rewards and spending proposals budget. + pub Mint get(mint) build(|_config: &GenesisConfig| { + >::initialize_mint() + }): ::MintId; } } @@ -60,6 +66,12 @@ impl Module { pub fn is_councilor(sender: &T::AccountId) -> bool { Self::active_council().iter().any(|c| c.member == *sender) } + + // Initializes a new mint + pub fn initialize_mint() -> T::MintId { + >::add_mint(minting::BalanceOf::::zero(), None) + .expect("Failed to create a mint for the council") + } } decl_module! { @@ -118,6 +130,12 @@ decl_module! { ensure!(ends_at > >::block_number(), "must set future block number"); >::put(ends_at); } + + fn set_mint_capacity(origin, new_capacity: minting::BalanceOf) { + ensure_root(origin)?; + let mint_id = Self::mint(); + minting::Module::::set_mint_capacity(mint_id, new_capacity)?; + } } } diff --git a/runtime-modules/governance/src/election.rs b/runtime-modules/governance/src/election.rs index 7e8c5dcf82..db1b90b606 100644 --- a/runtime-modules/governance/src/election.rs +++ b/runtime-modules/governance/src/election.rs @@ -156,7 +156,7 @@ impl Module { } fn can_participate(sender: &T::AccountId) -> bool { - !T::Currency::free_balance(sender).is_zero() + !::Currency::free_balance(sender).is_zero() && >::is_member_account(sender) } @@ -356,7 +356,10 @@ impl Module { for stakeholder in Self::existing_stake_holders().iter() { let stake = Self::transferable_stakes(stakeholder); if !stake.seat.is_zero() || !stake.backing.is_zero() { - T::Currency::unreserve(stakeholder, stake.seat + stake.backing); + ::Currency::unreserve( + stakeholder, + stake.seat + stake.backing, + ); } } } @@ -381,7 +384,7 @@ impl Module { // return new stake to account's free balance if !stake.new.is_zero() { - T::Currency::unreserve(applicant, stake.new); + ::Currency::unreserve(applicant, stake.new); } // return unused transferable stake @@ -435,7 +438,7 @@ impl Module { // return new stake to account's free balance let SealedVote { voter, stake, .. } = sealed_vote; if !stake.new.is_zero() { - T::Currency::unreserve(voter, stake.new); + ::Currency::unreserve(voter, stake.new); } // return unused transferable stake @@ -626,12 +629,12 @@ impl Module { let new_stake = Self::new_stake_reusing_transferable(&mut transferable_stake.seat, stake); ensure!( - T::Currency::can_reserve(&applicant, new_stake.new), + ::Currency::can_reserve(&applicant, new_stake.new), "not enough free balance to reserve" ); ensure!( - T::Currency::reserve(&applicant, new_stake.new).is_ok(), + ::Currency::reserve(&applicant, new_stake.new).is_ok(), "failed to reserve applicant stake!" ); @@ -662,12 +665,12 @@ impl Module { Self::new_stake_reusing_transferable(&mut transferable_stake.backing, stake); ensure!( - T::Currency::can_reserve(&voter, vote_stake.new), + ::Currency::can_reserve(&voter, vote_stake.new), "not enough free balance to reserve" ); ensure!( - T::Currency::reserve(&voter, vote_stake.new).is_ok(), + ::Currency::reserve(&voter, vote_stake.new).is_ok(), "failed to reserve voting stake!" ); diff --git a/runtime-modules/governance/src/mock.rs b/runtime-modules/governance/src/mock.rs index 5e6dc33dbe..8d13c511fe 100644 --- a/runtime-modules/governance/src/mock.rs +++ b/runtime-modules/governance/src/mock.rs @@ -70,7 +70,10 @@ impl membership::members::Trait for Test { type ActorId = u32; type InitialMembersBalance = InitialMembersBalance; } - +impl minting::Trait for Test { + type Currency = Balances; + type MintId = u64; +} parameter_types! { pub const ExistentialDeposit: u32 = 0; pub const TransferFee: u32 = 0; diff --git a/runtime-modules/governance/src/proposals.rs b/runtime-modules/governance/src/proposals.rs index e681e51d6c..64a177a6fd 100644 --- a/runtime-modules/governance/src/proposals.rs +++ b/runtime-modules/governance/src/proposals.rs @@ -244,7 +244,7 @@ decl_module! { ensure!(wasm_code.len() as u32 <= Self::wasm_code_max_len(), MSG_TOO_LONG_WASM_CODE); // Lock proposer's stake: - T::Currency::reserve(&proposer, stake) + ::Currency::reserve(&proposer, stake) .map_err(|_| MSG_STAKE_IS_GREATER_THAN_BALANCE)?; let proposal_id = Self::proposal_count() + 1; @@ -312,11 +312,11 @@ decl_module! { // Spend some minimum fee on proposer's balance for canceling a proposal let fee = Self::cancellation_fee(); - let _ = T::Currency::slash_reserved(&proposer, fee); + let _ = ::Currency::slash_reserved(&proposer, fee); // Return unspent part of remaining staked deposit (after taking some fee) let left_stake = proposal.stake - fee; - let _ = T::Currency::unreserve(&proposer, left_stake); + let _ = ::Currency::unreserve(&proposer, left_stake); Self::_update_proposal_status(proposal_id, Cancelled)?; Self::deposit_event(RawEvent::ProposalCanceled(proposer, proposal_id)); @@ -336,7 +336,7 @@ decl_module! { let proposal = Self::proposals(proposal_id); ensure!(proposal.status == Active, MSG_PROPOSAL_FINALIZED); - let _ = T::Currency::unreserve(&proposal.proposer, proposal.stake); + let _ = ::Currency::unreserve(&proposal.proposer, proposal.stake); Self::_update_proposal_status(proposal_id, Cancelled)?; @@ -357,7 +357,7 @@ impl Module { } fn can_participate(sender: &T::AccountId) -> bool { - !T::Currency::free_balance(sender).is_zero() + !::Currency::free_balance(sender).is_zero() && >::is_member_account(sender) } @@ -513,7 +513,8 @@ impl Module { let proposal = Self::proposals(proposal_id); // Slash proposer's stake: - let _ = T::Currency::slash_reserved(&proposal.proposer, proposal.stake); + let _ = + ::Currency::slash_reserved(&proposal.proposer, proposal.stake); Ok(()) } @@ -525,11 +526,11 @@ impl Module { // Spend some minimum fee on proposer's balance to prevent spamming attacks: let fee = Self::rejection_fee(); - let _ = T::Currency::slash_reserved(&proposer, fee); + let _ = ::Currency::slash_reserved(&proposer, fee); // Return unspent part of remaining staked deposit (after taking some fee): let left_stake = proposal.stake - fee; - let _ = T::Currency::unreserve(&proposer, left_stake); + let _ = ::Currency::unreserve(&proposer, left_stake); Ok(()) } @@ -540,7 +541,7 @@ impl Module { let wasm_code = Self::wasm_code_by_hash(proposal.wasm_hash); // Return staked deposit to proposer: - let _ = T::Currency::unreserve(&proposal.proposer, proposal.stake); + let _ = ::Currency::unreserve(&proposal.proposer, proposal.stake); // Update wasm code of node's runtime: >::set_code(system::RawOrigin::Root.into(), wasm_code)?; @@ -649,6 +650,11 @@ mod tests { type InitialMembersBalance = InitialMembersBalance; } + impl minting::Trait for Test { + type Currency = balances::Module; + type MintId = u64; + } + impl Trait for Test { type Event = (); } diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 6ff953659c..c0eee0a3cf 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -5,7 +5,7 @@ edition = '2018' name = 'joystream-node-runtime' # Follow convention: https://github.com/Joystream/substrate-runtime-joystream/issues/1 # {Authoring}.{Spec}.{Impl} of the RuntimeVersion -version = '6.9.0' +version = '6.12.0' [features] default = ['std'] diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 92c4bbb9f0..13a2701388 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -115,7 +115,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("joystream-node"), impl_name: create_runtime_str!("joystream-node"), authoring_version: 6, - spec_version: 9, + spec_version: 12, impl_version: 0, apis: RUNTIME_API_VERSIONS, }; diff --git a/runtime/src/migration.rs b/runtime/src/migration.rs index fc4bd421a9..a26468b3f7 100644 --- a/runtime/src/migration.rs +++ b/runtime/src/migration.rs @@ -4,25 +4,19 @@ use srml_support::{decl_event, decl_module, decl_storage}; use sudo; use system; -// When preparing a new major runtime release version bump this value to match it and update -// the initialization code in runtime_initialization(). Because of the way substrate runs runtime code -// the runtime doesn't need to maintain any logic for old migrations. All knowledge about state of the chain and runtime -// prior to the new runtime taking over is implicit in the migration code implementation. If assumptions are incorrect -// behaviour is undefined. -const MIGRATION_FOR_SPEC_VERSION: u32 = 0; - impl Module { - fn runtime_initialization() { - if VERSION.spec_version != MIGRATION_FOR_SPEC_VERSION { - return; - } - - print("running runtime initializers"); + fn runtime_upgraded() { + print("running runtime initializers..."); // ... - // add initialization of other modules introduced in this runtime + // add initialization of modules introduced in new runtime release. This + // would be any new storage values that need an initial value which would not + // have been initialized with config() or build() mechanism. // ... + // Create the Council mint + governance::council::Module::::initialize_mint(); + Self::deposit_event(RawEvent::Migrated( >::block_number(), VERSION.spec_version, @@ -36,6 +30,7 @@ pub trait Trait: + storage::data_object_storage_registry::Trait + forum::Trait + sudo::Trait + + governance::council::Trait { type Event: From> + Into<::Event>; } @@ -64,7 +59,7 @@ decl_module! { SpecVersion::put(VERSION.spec_version); // run migrations and store initializers - Self::runtime_initialization(); + Self::runtime_upgraded(); } } } From bb8c043e7f3537861ba4186a1d4ee1b54451008b Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 27 Mar 2020 10:41:28 +0300 Subject: [PATCH 128/286] Refactor engine module - remove obsolete TODOs - add printing messages about broken invariants refund_proposal_stake() --- runtime-modules/proposals/engine/src/lib.rs | 23 +++++++++++-------- .../proposals/engine/src/types/stakes.rs | 1 - 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/runtime-modules/proposals/engine/src/lib.rs b/runtime-modules/proposals/engine/src/lib.rs index e4c07f2dc3..cf745f2a71 100644 --- a/runtime-modules/proposals/engine/src/lib.rs +++ b/runtime-modules/proposals/engine/src/lib.rs @@ -17,9 +17,6 @@ // Do not delete! Cannot be uncommented by default, because of Parity decl_module! issue. //#![warn(missing_docs)] -// TODO: Test StakingEventHandler -// TODO: Test refund_proposal_stake() - use types::FinalizedProposalData; use types::ProposalStakeManager; pub use types::{ @@ -431,12 +428,11 @@ impl Module { Ok(()) } - //TODO: candidate for invariant break or error saving to the state - /// Callback from StakingEventsHandler. Refunds unstaked imbalance back to the source account + /// Callback from StakingEventsHandler. Refunds unstaked imbalance back to the source account. + /// There can be a lot of invariant breaks in the scope of this proposal. + /// Such situations are handled by adding error messages to the log. pub fn refund_proposal_stake(stake_id: T::StakeId, imbalance: NegativeImbalance) { if >::exists(stake_id) { - //TODO: handle non existence - let proposal_id = Self::stakes_proposals(stake_id); if >::exists(proposal_id) { @@ -444,14 +440,23 @@ impl Module { if let ProposalStatus::Active(active_stake_result) = proposal.status { if let Some(active_stake) = active_stake_result { - //TODO: handle the result - let _ = CurrencyOf::::resolve_into_existing( + let refunding_result = CurrencyOf::::resolve_into_existing( &active_stake.source_account_id, imbalance, ); + + if refunding_result.is_err() { + print("Broken invariant: cannot refund"); + } } + } else { + print("Broken invariant: proposal status is not Active"); } + } else { + print("Broken invariant: proposal doesn't exist"); } + } else { + print("Broken invariant: stake doesn't exist"); } } } diff --git a/runtime-modules/proposals/engine/src/types/stakes.rs b/runtime-modules/proposals/engine/src/types/stakes.rs index 9463e669e8..181b055e63 100644 --- a/runtime-modules/proposals/engine/src/types/stakes.rs +++ b/runtime-modules/proposals/engine/src/types/stakes.rs @@ -151,7 +151,6 @@ impl ProposalStakeManager { pub fn remove_stake(stake_id: T::StakeId) -> Result<(), &'static str> { T::StakeHandlerProvider::stakes().unstake(stake_id)?; - //TODO: can't remove stake before refunding T::StakeHandlerProvider::stakes().remove_stake(stake_id)?; Ok(()) From d4c1c944eca58afc0e8eae2e8dc9072204fc202e Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Fri, 27 Mar 2020 11:59:46 +0400 Subject: [PATCH 129/286] council: add set_council_mint_capacity() and spend_from_council_mint() --- runtime-modules/governance/src/council.rs | 24 ++++++++++++++++------- runtime-modules/token-minting/src/lib.rs | 9 +++++++++ runtime/src/migration.rs | 2 +- 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/runtime-modules/governance/src/council.rs b/runtime-modules/governance/src/council.rs index 71b3e6419d..2f6fc41a1f 100644 --- a/runtime-modules/governance/src/council.rs +++ b/runtime-modules/governance/src/council.rs @@ -34,8 +34,8 @@ decl_storage! { pub TermEndsAt get(term_ends_at) config() : T::BlockNumber = T::BlockNumber::from(1); /// The mint that funds council member rewards and spending proposals budget. - pub Mint get(mint) build(|_config: &GenesisConfig| { - >::initialize_mint() + pub CouncilMint get(council_mint) build(|_config: &GenesisConfig| { + >::create_new_council_mint() }): ::MintId; } } @@ -68,9 +68,11 @@ impl Module { } // Initializes a new mint - pub fn initialize_mint() -> T::MintId { - >::add_mint(minting::BalanceOf::::zero(), None) - .expect("Failed to create a mint for the council") + pub fn create_new_council_mint() -> T::MintId { + let mint_id = >::add_mint(minting::BalanceOf::::zero(), None) + .expect("Failed to create a mint for the council"); + CouncilMint::::put(mint_id); + mint_id } } @@ -131,11 +133,19 @@ decl_module! { >::put(ends_at); } - fn set_mint_capacity(origin, new_capacity: minting::BalanceOf) { + /// Sets the capacity of the the council mint + fn set_council_mint_capacity(origin, new_capacity: minting::BalanceOf) { ensure_root(origin)?; - let mint_id = Self::mint(); + let mint_id = Self::council_mint(); minting::Module::::set_mint_capacity(mint_id, new_capacity)?; } + + /// Attempts to mint and transfer amount to destination account + fn spend_from_council_mint(origin, amount: minting::BalanceOf, destination: T::AccountId) { + ensure_root(origin)?; + let mint_id = Self::council_mint(); + minting::Module::::transfer_tokens(mint_id, amount, &destination)?; + } } } diff --git a/runtime-modules/token-minting/src/lib.rs b/runtime-modules/token-minting/src/lib.rs index df9c6fef91..20388f2fda 100755 --- a/runtime-modules/token-minting/src/lib.rs +++ b/runtime-modules/token-minting/src/lib.rs @@ -82,6 +82,15 @@ impl From for &'static str { } } +impl From for &'static str { + fn from(err: TransferError) -> &'static str { + match err { + TransferError::MintNotFound => "MintNotFound", + TransferError::NotEnoughCapacity => "NotEnoughCapacity", + } + } +} + #[derive(Encode, Decode, Copy, Clone, Debug, Eq, PartialEq)] pub enum Adjustment { // First adjustment will be after AdjustOnInterval.block_interval diff --git a/runtime/src/migration.rs b/runtime/src/migration.rs index a26468b3f7..fcfd32263d 100644 --- a/runtime/src/migration.rs +++ b/runtime/src/migration.rs @@ -15,7 +15,7 @@ impl Module { // ... // Create the Council mint - governance::council::Module::::initialize_mint(); + governance::council::Module::::create_new_council_mint(); Self::deposit_event(RawEvent::Migrated( >::block_number(), From de7ffad250d71b1228b49ef918f161d3e89c831f Mon Sep 17 00:00:00 2001 From: Gleb Urvanov Date: Fri, 27 Mar 2020 12:40:01 +0100 Subject: [PATCH 130/286] buy membership api test added --- tests/.env | 3 + tests/.gitignore | 4 + tests/.prettierrc | 4 + tests/LICENSE | 675 ++++++++++++++++++++++ tests/package.json | 31 + tests/src/tests/membershipCreationTest.ts | 102 ++++ tests/src/utils/apiMethods.ts | 96 +++ tests/src/utils/config.ts | 5 + tests/src/utils/utils.ts | 38 ++ tests/tsconfig.json | 66 +++ tests/tslint.json | 8 + 11 files changed, 1032 insertions(+) create mode 100644 tests/.env create mode 100644 tests/.gitignore create mode 100644 tests/.prettierrc create mode 100644 tests/LICENSE create mode 100644 tests/package.json create mode 100644 tests/src/tests/membershipCreationTest.ts create mode 100644 tests/src/utils/apiMethods.ts create mode 100644 tests/src/utils/config.ts create mode 100644 tests/src/utils/utils.ts create mode 100644 tests/tsconfig.json create mode 100644 tests/tslint.json diff --git a/tests/.env b/tests/.env new file mode 100644 index 0000000000..e82d01ce0e --- /dev/null +++ b/tests/.env @@ -0,0 +1,3 @@ +NODE_URL = ws://127.0.0.1:9944 +SUDO_ACCOUNT_URL = //Alice +MEMBERSHIP_CREATION_N = 1 diff --git a/tests/.gitignore b/tests/.gitignore new file mode 100644 index 0000000000..17e654e55d --- /dev/null +++ b/tests/.gitignore @@ -0,0 +1,4 @@ +.vscode/ +dist/ +node_modules/ +yarn* \ No newline at end of file diff --git a/tests/.prettierrc b/tests/.prettierrc new file mode 100644 index 0000000000..b4f8e6a6a1 --- /dev/null +++ b/tests/.prettierrc @@ -0,0 +1,4 @@ +{ + "singleQuote": true, + "arrowParens": "avoid" +} diff --git a/tests/LICENSE b/tests/LICENSE new file mode 100644 index 0000000000..2fb2e74d8d --- /dev/null +++ b/tests/LICENSE @@ -0,0 +1,675 @@ +### GNU GENERAL PUBLIC LICENSE + +Version 3, 29 June 2007 + +Copyright (C) 2007 Free Software Foundation, Inc. + + +Everyone is permitted to copy and distribute verbatim copies of this +license document, but changing it is not allowed. + +### Preamble + +The GNU General Public License is a free, copyleft license for +software and other kinds of works. + +The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom +to share and change all versions of a program--to make sure it remains +free software for all its users. We, the Free Software Foundation, use +the GNU General Public License for most of our software; it applies +also to any other work released this way by its authors. You can apply +it to your programs, too. + +When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + +To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you +have certain responsibilities if you distribute copies of the +software, or if you modify it: responsibilities to respect the freedom +of others. + +For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + +Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + +For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + +Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the +manufacturer can do so. This is fundamentally incompatible with the +aim of protecting users' freedom to change the software. The +systematic pattern of such abuse occurs in the area of products for +individuals to use, which is precisely where it is most unacceptable. +Therefore, we have designed this version of the GPL to prohibit the +practice for those products. If such problems arise substantially in +other domains, we stand ready to extend this provision to those +domains in future versions of the GPL, as needed to protect the +freedom of users. + +Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish +to avoid the special danger that patents applied to a free program +could make it effectively proprietary. To prevent this, the GPL +assures that patents cannot be used to render the program non-free. + +The precise terms and conditions for copying, distribution and +modification follow. + +### TERMS AND CONDITIONS + +#### 0. Definitions. + +"This License" refers to version 3 of the GNU General Public License. + +"Copyright" also means copyright-like laws that apply to other kinds +of works, such as semiconductor masks. + +"The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + +To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of +an exact copy. The resulting work is called a "modified version" of +the earlier work or a work "based on" the earlier work. + +A "covered work" means either the unmodified Program or a work based +on the Program. + +To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + +To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user +through a computer network, with no transfer of a copy, is not +conveying. + +An interactive user interface displays "Appropriate Legal Notices" to +the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + +#### 1. Source Code. + +The "source code" for a work means the preferred form of the work for +making modifications to it. "Object code" means any non-source form of +a work. + +A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + +The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + +The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + +The Corresponding Source need not include anything that users can +regenerate automatically from other parts of the Corresponding Source. + +The Corresponding Source for a work in source code form is that same +work. + +#### 2. Basic Permissions. + +All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + +You may make, run and propagate covered works that you do not convey, +without conditions so long as your license otherwise remains in force. +You may convey covered works to others for the sole purpose of having +them make modifications exclusively for you, or provide you with +facilities for running those works, provided that you comply with the +terms of this License in conveying all material for which you do not +control copyright. Those thus making or running the covered works for +you must do so exclusively on your behalf, under your direction and +control, on terms that prohibit them from making any copies of your +copyrighted material outside their relationship with you. + +Conveying under any other circumstances is permitted solely under the +conditions stated below. Sublicensing is not allowed; section 10 makes +it unnecessary. + +#### 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + +No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + +When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such +circumvention is effected by exercising rights under this License with +respect to the covered work, and you disclaim any intention to limit +operation or modification of the work as a means of enforcing, against +the work's users, your or third parties' legal rights to forbid +circumvention of technological measures. + +#### 4. Conveying Verbatim Copies. + +You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + +You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + +#### 5. Conveying Modified Source Versions. + +You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these +conditions: + +- a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. +- b) The work must carry prominent notices stating that it is + released under this License and any conditions added under + section 7. This requirement modifies the requirement in section 4 + to "keep intact all notices". +- c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. +- d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + +A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + +#### 6. Conveying Non-Source Forms. + +You may convey a covered work in object code form under the terms of +sections 4 and 5, provided that you also convey the machine-readable +Corresponding Source under the terms of this License, in one of these +ways: + +- a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. +- b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the Corresponding + Source from a network server at no charge. +- c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. +- d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. +- e) Convey the object code using peer-to-peer transmission, + provided you inform other peers where the object code and + Corresponding Source of the work are being offered to the general + public at no charge under subsection 6d. + +A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + +A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, +family, or household purposes, or (2) anything designed or sold for +incorporation into a dwelling. In determining whether a product is a +consumer product, doubtful cases shall be resolved in favor of +coverage. For a particular product received by a particular user, +"normally used" refers to a typical or common use of that class of +product, regardless of the status of the particular user or of the way +in which the particular user actually uses, or expects or is expected +to use, the product. A product is a consumer product regardless of +whether the product has substantial commercial, industrial or +non-consumer uses, unless such uses represent the only significant +mode of use of the product. + +"Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to +install and execute modified versions of a covered work in that User +Product from a modified version of its Corresponding Source. The +information must suffice to ensure that the continued functioning of +the modified object code is in no case prevented or interfered with +solely because modification has been made. + +If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + +The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or +updates for a work that has been modified or installed by the +recipient, or for the User Product in which it has been modified or +installed. Access to a network may be denied when the modification +itself materially and adversely affects the operation of the network +or violates the rules and protocols for communication across the +network. + +Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + +#### 7. Additional Terms. + +"Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + +When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + +Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders +of that material) supplement the terms of this License with terms: + +- a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or +- b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or +- c) Prohibiting misrepresentation of the origin of that material, + or requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or +- d) Limiting the use for publicity purposes of names of licensors + or authors of the material; or +- e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or +- f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions + of it) with contractual assumptions of liability to the recipient, + for any liability that these contractual assumptions directly + impose on those licensors and authors. + +All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + +If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + +Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; the +above requirements apply either way. + +#### 8. Termination. + +You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + +However, if you cease all violation of this License, then your license +from a particular copyright holder is reinstated (a) provisionally, +unless and until the copyright holder explicitly and finally +terminates your license, and (b) permanently, if the copyright holder +fails to notify you of the violation by some reasonable means prior to +60 days after the cessation. + +Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + +Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + +#### 9. Acceptance Not Required for Having Copies. + +You are not required to accept this License in order to receive or run +a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + +#### 10. Automatic Licensing of Downstream Recipients. + +Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + +An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + +You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + +#### 11. Patents. + +A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + +A contributor's "essential patent claims" are all patent claims owned +or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + +Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + +In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + +If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + +If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + +A patent license is "discriminatory" if it does not include within the +scope of its coverage, prohibits the exercise of, or is conditioned on +the non-exercise of one or more of the rights that are specifically +granted under this License. You may not convey a covered work if you +are a party to an arrangement with a third party that is in the +business of distributing software, under which you make payment to the +third party based on the extent of your activity of conveying the +work, and under which the third party grants, to any of the parties +who would receive the covered work from you, a discriminatory patent +license (a) in connection with copies of the covered work conveyed by +you (or copies made from those copies), or (b) primarily for and in +connection with specific products or compilations that contain the +covered work, unless you entered into that arrangement, or that patent +license was granted, prior to 28 March 2007. + +Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + +#### 12. No Surrender of Others' Freedom. + +If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under +this License and any other pertinent obligations, then as a +consequence you may not convey it at all. For example, if you agree to +terms that obligate you to collect a royalty for further conveying +from those to whom you convey the Program, the only way you could +satisfy both those terms and this License would be to refrain entirely +from conveying the Program. + +#### 13. Use with the GNU Affero General Public License. + +Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + +#### 14. Revised Versions of this License. + +The Free Software Foundation may publish revised and/or new versions +of the GNU General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in +detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies that a certain numbered version of the GNU General Public +License "or any later version" applies to it, you have the option of +following the terms and conditions either of that numbered version or +of any later version published by the Free Software Foundation. If the +Program does not specify a version number of the GNU General Public +License, you may choose any version ever published by the Free +Software Foundation. + +If the Program specifies that a proxy can decide which future versions +of the GNU General Public License can be used, that proxy's public +statement of acceptance of a version permanently authorizes you to +choose that version for the Program. + +Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + +#### 15. Disclaimer of Warranty. + +THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT +WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND +PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE +DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR +CORRECTION. + +#### 16. Limitation of Liability. + +IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR +CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES +ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT +NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR +LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM +TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER +PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +#### 17. Interpretation of Sections 15 and 16. + +If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + +END OF TERMS AND CONDITIONS + +### How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these +terms. + +To do so, attach the following notices to the program. It is safest to +attach them to the start of each source file to most effectively state +the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper +mail. + +If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands \`show w' and \`show c' should show the +appropriate parts of the General Public License. Of course, your +program's commands might be different; for a GUI interface, you would +use an "about box". + +You should also get your employer (if you work as a programmer) or +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. For more information on this, and how to apply and follow +the GNU GPL, see . + +The GNU General Public License does not permit incorporating your +program into proprietary programs. If your program is a subroutine +library, you may consider it more useful to permit linking proprietary +applications with the library. If this is what you want to do, use the +GNU Lesser General Public License instead of this License. But first, +please read . diff --git a/tests/package.json b/tests/package.json new file mode 100644 index 0000000000..30e0431d5b --- /dev/null +++ b/tests/package.json @@ -0,0 +1,31 @@ +{ + "name": "joystream-testing", + "version": "0.1.0", + "license": "GPL-3.0-only", + "scripts": { + "build": "tsc --build tsconfig.json", + "test": "mocha -r ts-node/register src/tests/*", + "lint": "tslint --project tsconfig.json", + "prettier": "prettier --write ./src" + }, + "dependencies": { + "@joystream/types": "^0.6.0", + "@polkadot/api": "^0.96.1", + "@polkadot/keyring": "^1.7.0-beta.5", + "@polkadot/types": "^0.96.1", + "@types/bn.js": "^4.11.5", + "bn.js": "^4.11.8", + "dotenv": "^8.2.0" + }, + "devDependencies": { + "@polkadot/ts": "^0.3.14", + "@types/chai": "^4.2.11", + "@types/mocha": "^7.0.2", + "chai": "^4.2.0", + "mocha": "^7.1.1", + "prettier": "2.0.2", + "ts-node": "^8.8.1", + "tslint": "^6.1.0", + "typescript": "^3.8.3" + } +} diff --git a/tests/src/tests/membershipCreationTest.ts b/tests/src/tests/membershipCreationTest.ts new file mode 100644 index 0000000000..acb3e601b5 --- /dev/null +++ b/tests/src/tests/membershipCreationTest.ts @@ -0,0 +1,102 @@ +import { WsProvider } from '@polkadot/api'; +import { registerJoystreamTypes } from '@joystream/types'; +import { Keyring } from '@polkadot/keyring'; +import { assert } from 'chai'; +import { KeyringPair } from '@polkadot/keyring/types'; +import BN = require('bn.js'); +import { ApiMethods } from '../utils/apiMethods'; +import { initConfig } from '../utils/config'; + +describe('Membership integration tests', () => { + initConfig(); + const keyring = new Keyring({ type: 'sr25519' }); + const nKeyPairs: KeyringPair[] = new Array(); + const N: number = +process.env.MEMBERSHIP_CREATION_N!; + const nodeUrl: string = process.env.NODE_URL!; + const sudoUri: string = process.env.SUDO_ACCOUNT_URL!; + const defaultTimeout: number = 30000; + let apiMethods: ApiMethods; + let sudo: KeyringPair; + let aKeyPair: KeyringPair; + let membershipFee: number; + + before(async function() { + this.timeout(defaultTimeout); + registerJoystreamTypes(); + const provider = new WsProvider(nodeUrl); + apiMethods = await ApiMethods.create(provider); + sudo = keyring.addFromUri(sudoUri); + for (let i = 0; i < N; i++) { + nKeyPairs.push(keyring.addFromUri(i.toString())); + } + aKeyPair = keyring.addFromUri('A'); + membershipFee = await apiMethods.getMembershipFee(0); + let nonce = await apiMethods.getNonce(sudo); + nonce = nonce.sub(new BN(1)); + await apiMethods.transferBalanceToAccounts( + sudo, + nKeyPairs, + membershipFee + 1, + nonce + ); + await apiMethods.transferBalance(sudo, aKeyPair.address, 2); + }); + + it('Buy membeship is accepted with sufficient funds', async () => { + await Promise.all( + nKeyPairs.map(async keyPair => { + await apiMethods.buyMembership(keyPair, 0, 'new_member'); + }) + ); + nKeyPairs.map(keyPair => + apiMethods + .getMembership(keyPair.address) + .then(membership => + assert(!membership.isEmpty, 'Account m is not a member') + ) + ); + }).timeout(defaultTimeout); + + it('Accont A has insufficient funds to buy membership', async () => { + apiMethods + .getBalance(aKeyPair.address) + .then(balance => + assert( + balance.toNumber() < membershipFee, + 'Account A already have sufficient balance to purchase membership' + ) + ); + }).timeout(defaultTimeout); + + it('Account A can not buy the membership with insufficient funds', async () => { + await apiMethods.buyMembership(aKeyPair, 0, 'late_member', true); + apiMethods + .getMembership(aKeyPair.address) + .then(membership => assert(membership.isEmpty, 'Account A is a member')); + }).timeout(defaultTimeout); + + it('Account A has been provided with funds to buy the membership', async () => { + await apiMethods.transferBalance(sudo, aKeyPair.address, membershipFee); + apiMethods + .getBalance(aKeyPair.address) + .then(balance => + assert( + balance.toNumber() >= membershipFee, + 'The account balance is insufficient to purchase membership' + ) + ); + }).timeout(defaultTimeout); + + it('Account A was able to buy the membership', async () => { + await apiMethods.buyMembership(aKeyPair, 0, 'late_member'); + apiMethods + .getMembership(aKeyPair.address) + .then(membership => + assert(!membership.isEmpty, 'Account A is a not member') + ); + }).timeout(defaultTimeout); + + after(() => { + apiMethods.close(); + }); +}); diff --git a/tests/src/utils/apiMethods.ts b/tests/src/utils/apiMethods.ts new file mode 100644 index 0000000000..243a164e56 --- /dev/null +++ b/tests/src/utils/apiMethods.ts @@ -0,0 +1,96 @@ +import { ApiPromise, WsProvider } from '@polkadot/api'; +import { Option } from '@polkadot/types'; +import { KeyringPair } from '@polkadot/keyring/types'; +import { Utils } from './utils'; +import { UserInfo, PaidMembershipTerms } from '@joystream/types/lib/members'; +import { Balance } from '@polkadot/types/interfaces'; +import BN = require('bn.js'); + +export class ApiMethods { + public static async create(provider: WsProvider): Promise { + const api = await ApiPromise.create({ provider }); + return new ApiMethods(api); + } + + private readonly api: ApiPromise; + constructor(api: ApiPromise) { + this.api = api; + } + + public close() { + this.api.disconnect(); + } + + public async buyMembership( + account: KeyringPair, + paidTerms: number, + name: string, + expectFailure = false + ): Promise { + return Utils.signAndSend( + this.api.tx.members.buyMembership( + paidTerms, + new UserInfo({ handle: name, avatar_uri: '', about: '' }) + ), + account, + await this.getNonce(account), + expectFailure + ); + } + + public getMembership(address: string): Promise { + return this.api.query.members.memberIdsByControllerAccountId(address); + } + + public getBalance(address: string): Promise { + return this.api.query.balances.freeBalance(address); + } + + public async transferBalance( + from: KeyringPair, + to: string, + amount: number, + nonce: BN = new BN(-1) + ): Promise { + const _nonce = nonce.isNeg() ? await this.getNonce(from) : nonce; + return Utils.signAndSend( + this.api.tx.balances.transfer(to, amount), + from, + _nonce + ); + } + + public getPaidMembershipTerms( + paidTermsId: number + ): Promise> { + return this.api.query.members.paidMembershipTermsById< + Option + >(paidTermsId); + } + + public getMembershipFee(paidTermsId: number): Promise { + return this.getPaidMembershipTerms(paidTermsId).then(terms => + terms.unwrap().fee.toNumber() + ); + } + + public async transferBalanceToAccounts( + from: KeyringPair, + to: KeyringPair[], + amount: number, + nonce: BN + ): Promise { + return Promise.all( + to.map(async keyPair => { + nonce = nonce.add(new BN(1)); + await this.transferBalance(from, keyPair.address, amount, nonce); + }) + ); + } + + public getNonce(account: KeyringPair): Promise { + return this.api.query.system + .accountNonce(account.address) + .then(nonce => new BN(nonce.toString())); + } +} diff --git a/tests/src/utils/config.ts b/tests/src/utils/config.ts new file mode 100644 index 0000000000..612aa752c5 --- /dev/null +++ b/tests/src/utils/config.ts @@ -0,0 +1,5 @@ +import { config } from 'dotenv'; + +export function initConfig() { + config(); +} diff --git a/tests/src/utils/utils.ts b/tests/src/utils/utils.ts new file mode 100644 index 0000000000..2fab12370c --- /dev/null +++ b/tests/src/utils/utils.ts @@ -0,0 +1,38 @@ +import { KeyringPair } from '@polkadot/keyring/types'; +import { SubmittableExtrinsic } from '@polkadot/api/types'; +import BN = require('bn.js'); + +export class Utils { + public static async signAndSend( + tx: SubmittableExtrinsic<'promise'>, + account: KeyringPair, + nonce: BN, + expectFailure = false + ): Promise { + return new Promise(async (resolve, reject) => { + const signedTx = tx.sign(account, { nonce }); + + await signedTx + .send(async result => { + if ( + result.status.isFinalized === true && + result.events !== undefined + ) { + result.events.forEach(event => { + if (event.event.method === 'ExtrinsicFailed') { + if (expectFailure) { + resolve(); + } else { + reject(new Error('Extrinsic failed unexpectedly')); + } + } + }); + resolve(); + } + }) + .catch(error => { + reject(error); + }); + }); + } +} diff --git a/tests/tsconfig.json b/tests/tsconfig.json new file mode 100644 index 0000000000..d53a0276a4 --- /dev/null +++ b/tests/tsconfig.json @@ -0,0 +1,66 @@ +{ + "compilerOptions": { + /* Basic Options */ + // "incremental": true, /* Enable incremental compilation */ + "target": "esnext" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */, + "module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */, + // "lib": [], /* Specify library files to be included in the compilation. */ + // "allowJs": true, /* Allow javascript files to be compiled. */ + // "checkJs": true, /* Report errors in .js files. */ + // "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */ + // "declaration": true, /* Generates corresponding '.d.ts' file. */ + // "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */ + // "sourceMap": true, /* Generates corresponding '.map' file. */ + // "outFile": "./", /* Concatenate and emit output to single file. */ + "outDir": "dist" /* Redirect output structure to the directory. */, + "rootDir": "src" /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */, + // "composite": true, /* Enable project compilation */ + // "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */ + // "removeComments": true, /* Do not emit comments to output. */ + // "noEmit": true, /* Do not emit outputs. */ + // "importHelpers": true, /* Import emit helpers from 'tslib'. */ + // "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */ + // "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */ + + /* Strict Type-Checking Options */ + "strict": true /* Enable all strict type-checking options. */, + // "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */ + // "strictNullChecks": true, /* Enable strict null checks. */ + // "strictFunctionTypes": true, /* Enable strict checking of function types. */ + // "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */ + // "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */ + // "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */ + // "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */ + + /* Additional Checks */ + // "noUnusedLocals": true, /* Report errors on unused locals. */ + // "noUnusedParameters": true, /* Report errors on unused parameters. */ + // "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */ + // "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */ + + /* Module Resolution Options */ + // "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */ + // "baseUrl": "./", /* Base directory to resolve non-absolute module names. */ + // "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */ + // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */ + // "typeRoots": [], /* List of folders to include type definitions from. */ + // "types": [], /* Type declaration files to be included in compilation. */ + // "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */ + "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */, + // "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */ + // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ + + /* Source Map Options */ + // "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */ + // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ + // "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */ + // "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */ + + /* Experimental Options */ + // "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */ + // "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */ + + /* Advanced Options */ + "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */ + } +} diff --git a/tests/tslint.json b/tests/tslint.json new file mode 100644 index 0000000000..84c9724809 --- /dev/null +++ b/tests/tslint.json @@ -0,0 +1,8 @@ +{ + "extends": ["tslint:recommended"], + "rules": { + "interface-name": [true, "never-prefix"], + "max-line-length": [true, 140], + "no-console": false + } +} From e4f57a28617fb9b66734164f9707ad5dd110e4be Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Fri, 27 Mar 2020 16:08:01 +0400 Subject: [PATCH 131/286] remove use of assert in set_lead and unset_lead --- runtime-modules/content-working-group/src/lib.rs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/runtime-modules/content-working-group/src/lib.rs b/runtime-modules/content-working-group/src/lib.rs index 94939750ef..eb0b451fcd 100755 --- a/runtime-modules/content-working-group/src/lib.rs +++ b/runtime-modules/content-working-group/src/lib.rs @@ -2040,10 +2040,7 @@ impl Module { >::mutate(|id| *id += as One>::one()); // Register in role - let registered_role = - >::register_role_on_member(member, &new_lead_role).is_ok(); - - assert!(registered_role); + >::register_role_on_member(member, &new_lead_role)?; // Trigger event Self::deposit_event(RawEvent::LeadSet(new_lead_id)); @@ -2066,9 +2063,7 @@ impl Module { actor_id: lead_id, }; - let unregistered_role = >::unregister_role(current_lead_role).is_ok(); - - assert!(unregistered_role); + >::unregister_role(current_lead_role)?; // Update lead stage as exited let current_block = >::block_number(); From 5985c1b1656618dfeebf82b5028d67fc4573e2c6 Mon Sep 17 00:00:00 2001 From: Gleb Urvanov Date: Fri, 27 Mar 2020 13:10:21 +0100 Subject: [PATCH 132/286] yarn workspace added --- .gitignore | 6 +++++ README.md | 5 ++++ package.json | 11 +++++++++ tests/.gitignore | 4 ---- tests/package.json | 58 +++++++++++++++++++++++----------------------- 5 files changed, 51 insertions(+), 33 deletions(-) create mode 100644 package.json delete mode 100644 tests/.gitignore diff --git a/.gitignore b/.gitignore index 58b9ee32cb..22fa52c180 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,12 @@ # runtime built with docker build script joystream_runtime.wasm +# Node modules directory +**/node_modules + +# Generated by yarn +yarn* + # JetBrains IDEs .idea diff --git a/README.md b/README.md index a2cf5663eb..e7a1b45feb 100644 --- a/README.md +++ b/README.md @@ -79,6 +79,11 @@ This will build and run a fresh new local development chain purging existing one cargo test ``` +### API integration tests + +```bash +yarn test +``` ## Joystream Runtime diff --git a/package.json b/package.json new file mode 100644 index 0000000000..2adb91c3b6 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "name": "joystream", + "license": "GPL-3.0-only", + "scripts": { + "test": "yarn && yarn workspaces run test" + }, + "workspaces": [ + "tests" + ] +} diff --git a/tests/.gitignore b/tests/.gitignore deleted file mode 100644 index 17e654e55d..0000000000 --- a/tests/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -.vscode/ -dist/ -node_modules/ -yarn* \ No newline at end of file diff --git a/tests/package.json b/tests/package.json index 30e0431d5b..bd3a209e57 100644 --- a/tests/package.json +++ b/tests/package.json @@ -1,31 +1,31 @@ { - "name": "joystream-testing", - "version": "0.1.0", - "license": "GPL-3.0-only", - "scripts": { - "build": "tsc --build tsconfig.json", - "test": "mocha -r ts-node/register src/tests/*", - "lint": "tslint --project tsconfig.json", - "prettier": "prettier --write ./src" - }, - "dependencies": { - "@joystream/types": "^0.6.0", - "@polkadot/api": "^0.96.1", - "@polkadot/keyring": "^1.7.0-beta.5", - "@polkadot/types": "^0.96.1", - "@types/bn.js": "^4.11.5", - "bn.js": "^4.11.8", - "dotenv": "^8.2.0" - }, - "devDependencies": { - "@polkadot/ts": "^0.3.14", - "@types/chai": "^4.2.11", - "@types/mocha": "^7.0.2", - "chai": "^4.2.0", - "mocha": "^7.1.1", - "prettier": "2.0.2", - "ts-node": "^8.8.1", - "tslint": "^6.1.0", - "typescript": "^3.8.3" - } + "name": "joystream-testing", + "version": "0.1.0", + "license": "GPL-3.0-only", + "scripts": { + "build": "tsc --build tsconfig.json", + "test": "mocha -r ts-node/register src/tests/*", + "lint": "tslint --project tsconfig.json", + "prettier": "prettier --write ./src" + }, + "dependencies": { + "@joystream/types": "^0.6.0", + "@polkadot/api": "^0.96.1", + "@polkadot/keyring": "^1.7.0-beta.5", + "@polkadot/types": "^0.96.1", + "@types/bn.js": "^4.11.5", + "bn.js": "^4.11.8", + "dotenv": "^8.2.0" + }, + "devDependencies": { + "@polkadot/ts": "^0.3.14", + "@types/chai": "^4.2.11", + "@types/mocha": "^7.0.2", + "chai": "^4.2.0", + "mocha": "^7.1.1", + "prettier": "2.0.2", + "ts-node": "^8.8.1", + "tslint": "^6.1.0", + "typescript": "^3.8.3" + } } From 74617592076f0f0599505693e72338f22452af71 Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Fri, 27 Mar 2020 16:49:28 +0400 Subject: [PATCH 133/286] fix broken Cargo.lock after merge conflic resolution --- Cargo.lock | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3e354d830b..3051b32eda 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1554,11 +1554,7 @@ dependencies = [ [[package]] name = "joystream-node" -<<<<<<< HEAD version = "2.1.5" -======= -version = "2.1.4" ->>>>>>> development dependencies = [ "ctrlc", "derive_more 0.14.1", From d4a21042541501782df2c0fad15f94ba16472c1c Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Fri, 27 Mar 2020 16:50:11 +0400 Subject: [PATCH 134/286] call register_role_on_member() before mutating, also drop call to can_register_role_on_member() it is called by register_role_on_member() --- runtime-modules/content-working-group/src/lib.rs | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/runtime-modules/content-working-group/src/lib.rs b/runtime-modules/content-working-group/src/lib.rs index 0d465a46c5..9972ef0b55 100755 --- a/runtime-modules/content-working-group/src/lib.rs +++ b/runtime-modules/content-working-group/src/lib.rs @@ -2050,21 +2050,18 @@ impl Module { MSG_CURRENT_LEAD_ALREADY_SET ); - // Ensure that member can actually become lead let new_lead_id = >::get(); let new_lead_role = role_types::ActorInRole::new(role_types::Role::CuratorLead, new_lead_id); - let _profile = >::can_register_role_on_member( - &member, - &role_types::ActorInRole::new(role_types::Role::CuratorLead, new_lead_id), - )?; - // // == MUTATION SAFE == // + // Register in role - will fail if member cannot become lead + members::Module::::register_role_on_member(member, &new_lead_role)?; + // Construct lead let new_lead = Lead { role_account: role_account.clone(), @@ -2082,9 +2079,6 @@ impl Module { // Update next lead counter >::mutate(|id| *id += as One>::one()); - // Register in role - >::register_role_on_member(member, &new_lead_role)?; - // Trigger event Self::deposit_event(RawEvent::LeadSet(new_lead_id)); From 2ebff4ae73015040eabc264fe0ee4917974e2fe9 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 27 Mar 2020 15:54:48 +0300 Subject: [PATCH 135/286] Add tests for engine errors --- .../proposals/engine/src/tests/mod.rs | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/runtime-modules/proposals/engine/src/tests/mod.rs b/runtime-modules/proposals/engine/src/tests/mod.rs index 3a9230508f..0293276083 100644 --- a/runtime-modules/proposals/engine/src/tests/mod.rs +++ b/runtime-modules/proposals/engine/src/tests/mod.rs @@ -1299,3 +1299,30 @@ fn finalize_proposal_using_stake_mocks_failed() { }); }); } + +#[test] +fn create_proposal_fails_with_invalid_threshold_parameters() { + initial_test_ext().execute_with(|| { + let mut parameters = ProposalParameters { + voting_period: 3, + approval_quorum_percentage: 50, + approval_threshold_percentage: 0, + slashing_quorum_percentage: 60, + slashing_threshold_percentage: 60, + grace_period: 5, + required_stake: None, + }; + + let mut dummy_proposal = DummyProposalFixture::default().with_parameters(parameters); + + dummy_proposal + .create_proposal_and_assert(Err(Error::InvalidParameterApprovalThreshold.into())); + + parameters.approval_threshold_percentage = 60; + parameters.slashing_threshold_percentage = 0; + dummy_proposal = DummyProposalFixture::default().with_parameters(parameters); + + dummy_proposal + .create_proposal_and_assert(Err(Error::InvalidParameterSlashingThreshold.into())); + }); +} From e9f1f165f6a1587ccaac301ecce139d1fb85f70c Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 27 Mar 2020 17:16:46 +0300 Subject: [PATCH 136/286] Add error tests --- runtime-modules/proposals/codex/src/lib.rs | 20 ++++++++++--------- .../proposals/discussion/src/lib.rs | 4 +--- .../proposals/discussion/src/types.rs | 2 ++ runtime-modules/proposals/engine/src/lib.rs | 4 +++- .../proposals/engine/src/types/mod.rs | 2 ++ runtime/src/test/proposals_integration.rs | 2 +- 6 files changed, 20 insertions(+), 14 deletions(-) diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index 80ac1e8f18..f348e18f67 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -1,15 +1,20 @@ //! Proposals codex module for the Joystream platform. Version 2. -//! Contains preset proposal types +//! Contains preset proposal types. //! //! Supported extrinsics (proposal type): //! - create_text_proposal +//! - create_runtime_upgrade_proposal +//! +//! Proposal implementations of this module: +//! - execute_text_proposal - prints the proposal to the log +//! - execute_runtime_upgrade_proposal - sets the runtime code //! // Ensure we're `no_std` when compiling for Wasm. #![cfg_attr(not(feature = "std"), no_std)] // Do not delete! Cannot be uncommented by default, because of Parity decl_module! issue. -//#![warn(missing_docs)] +// #![warn(missing_docs)] mod proposal_types; #[cfg(test)] @@ -71,9 +76,6 @@ decl_error! { /// Require root origin in extrinsics RequireRootOrigin, - - /// Errors from the proposal engine - ProposalsEngineError } } @@ -151,7 +153,7 @@ decl_module! { member_id.clone(), )?; - let proposal_code = >::text_proposal(title.clone(), description.clone(), text); + let proposal_code = >::execute_text_proposal(title.clone(), description.clone(), text); let discussion_thread_id = >::create_thread( member_id, @@ -200,7 +202,7 @@ decl_module! { member_id.clone(), )?; - let proposal_code = >::text_proposal(title.clone(), description.clone(), wasm); + let proposal_code = >::execute_runtime_upgrade_proposal(title.clone(), description.clone(), wasm); let discussion_thread_id = >::create_thread( member_id, @@ -223,7 +225,7 @@ decl_module! { // *************** Extrinsic to execute /// Text proposal extrinsic. Should be used as callable object to pass to the engine module. - fn text_proposal( + fn execute_text_proposal( origin, title: Vec, _description: Vec, @@ -239,7 +241,7 @@ decl_module! { /// Runtime upgrade proposal extrinsic. /// Should be used as callable object to pass to the engine module. - fn runtime_upgrade_proposal( + fn execute_runtime_upgrade_proposal( origin, title: Vec, _description: Vec, diff --git a/runtime-modules/proposals/discussion/src/lib.rs b/runtime-modules/proposals/discussion/src/lib.rs index 8edd4f3b6c..7820307efc 100644 --- a/runtime-modules/proposals/discussion/src/lib.rs +++ b/runtime-modules/proposals/discussion/src/lib.rs @@ -7,6 +7,7 @@ //! //! Public API: //! - create_discussion - creates a discussion +//! - ensure_can_create_thread - ensures safe thread creation //! // Ensure we're `no_std` when compiling for Wasm. @@ -84,9 +85,6 @@ pub trait Trait: system::Trait + membership::members::Trait { decl_error! { pub enum Error { - /// The size of the provided text for text proposal exceeded the limit - TextProposalSizeExceeded, - /// Author should match the post creator NotAuthor, diff --git a/runtime-modules/proposals/discussion/src/types.rs b/runtime-modules/proposals/discussion/src/types.rs index 27e20d9fcc..18bd8a86fb 100644 --- a/runtime-modules/proposals/discussion/src/types.rs +++ b/runtime-modules/proposals/discussion/src/types.rs @@ -1,3 +1,5 @@ +#![warn(missing_docs)] + use codec::{Decode, Encode}; #[cfg(feature = "std")] use serde::{Deserialize, Serialize}; diff --git a/runtime-modules/proposals/engine/src/lib.rs b/runtime-modules/proposals/engine/src/lib.rs index cf745f2a71..dc25791242 100644 --- a/runtime-modules/proposals/engine/src/lib.rs +++ b/runtime-modules/proposals/engine/src/lib.rs @@ -9,6 +9,8 @@ //! //! Public API (requires root origin): //! - create_proposal - creates proposal using provided parameters +//! - ensure_create_proposal_parameters_are_valid - ensures that we can create the proposal +//! - refund_proposal_stake - a callback for StakingHandlerEvents //! // Ensure we're `no_std` when compiling for Wasm. @@ -373,7 +375,7 @@ impl Module { /// Performs all checks for the proposal creation: /// - title, body lengths - /// - mac active proposal + /// - max active proposal /// - provided parameters: approval_threshold_percentage and slashing_threshold_percentage > 0 /// - provided stake balance and parameters.required_stake are valid pub fn ensure_create_proposal_parameters_are_valid( diff --git a/runtime-modules/proposals/engine/src/types/mod.rs b/runtime-modules/proposals/engine/src/types/mod.rs index 0948a327cf..4557297404 100644 --- a/runtime-modules/proposals/engine/src/types/mod.rs +++ b/runtime-modules/proposals/engine/src/types/mod.rs @@ -1,6 +1,8 @@ //! Proposals types module for the Joystream platform. Version 2. //! Provides types for the proposal engine. +#![warn(missing_docs)] + use codec::{Decode, Encode}; use rstd::cmp::PartialOrd; use rstd::ops::Add; diff --git a/runtime/src/test/proposals_integration.rs b/runtime/src/test/proposals_integration.rs index c467025f8e..2a9d3b3510 100644 --- a/runtime/src/test/proposals_integration.rs +++ b/runtime/src/test/proposals_integration.rs @@ -40,7 +40,7 @@ impl Default for DummyProposalFixture { fn default() -> Self { let title = b"title".to_vec(); let description = b"description".to_vec(); - let dummy_proposal = proposals_codex::Call::::text_proposal( + let dummy_proposal = proposals_codex::Call::::execute_text_proposal( title.clone(), description.clone(), b"text".to_vec(), From 6d4d3994ba8da34efb1cf9f64955312ac1c13e09 Mon Sep 17 00:00:00 2001 From: Gleb Urvanov Date: Fri, 27 Mar 2020 15:34:05 +0100 Subject: [PATCH 137/286] fee estimation added, style fix, readme update --- README.md | 13 ++---- package.json | 22 ++++----- tests/.env | 1 + tests/.prettierrc | 4 +- tests/package.json | 57 +++++++++++------------ tests/src/tests/membershipCreationTest.ts | 48 ++++++++----------- tests/src/utils/apiMethods.ts | 57 ++++++++++++----------- tests/src/utils/utils.ts | 5 +- 8 files changed, 96 insertions(+), 111 deletions(-) diff --git a/README.md b/README.md index e7a1b45feb..f02b56406a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Joystream -This is the main code reposity for all joystream software. It will house the substrate chain project, the full node and runtime and all reusable substrate runtime modules that make up the joystream runtime. In addition to all front-end apps and infrastructure servers necessary for operating the network. +This is the main code reposity for all joystream software. It will house the substrate chain project, the full node and runtime and all reusable substrate runtime modules that make up the joystream runtime. In addition to all front-end apps and infrastructure servers necessary for operating the network. The repository is currently just a cargo workspace, but eventually will also contain yarn workspaces, and possibly other project type workspaces. @@ -9,20 +9,18 @@ The repository is currently just a cargo workspace, but eventually will also con The joystream network builds on a pre-release version of [substrate v2.0](https://substrate.dev/) and adds additional functionality to support the [various roles](https://www.joystream.org/roles) that can be entered into on the platform. - ## Validator + ![ Nodes for Joystream](./node/validator-node-banner.svg) Joystream node is the main server application that connects to the network, synchronizes the blockchain with other nodes and produces blocks if configured as a validator node. To setup a full node and validator review the [advanced guide from the helpdesk](https://github.com/Joystream/helpdesk/tree/master/roles/validators). - -### Pre-built Binaries +### Pre-built Binaries The latest pre-built binaries can be downloads from the [releases](https://github.com/Joystream/substrate-runtime-joystream/releases) page. - ### Building from source Clone the repository and install build tools: @@ -51,8 +49,8 @@ cargo run --release -- --chain ./rome-tesnet.json The `rome-testnet.json` chain file can be ontained from the [release page](https://github.com/Joystream/substrate-runtime-joystream/releases/tag/v6.8.0) - ### Installing a release build + This will install the executable `joystream-node` to your `~/.cargo/bin` folder, which you would normally have in your `$PATH` environment. ```bash @@ -89,7 +87,6 @@ yarn test ![Joystream Runtime](./runtime/runtime-banner.svg) - The runtime is the code that defines the consensus rules of the Joystream protocol. It is compiled to WASM and lives on chain. Joystream node execute the code's logic to validate transactions and blocks on the blockchain. @@ -98,7 +95,6 @@ When building joystream-node as described abot with `cargo build --release`, in `target/release/wbuild/joystream-node-runtime/joystream_node_runtime.compact.wasm` - ### Deployment Deploying the compiled runtime on a live system can be done in one of two ways: @@ -112,7 +108,6 @@ Deploying the compiled runtime on a live system can be done in one of two ways: Versioning of the runtime is set in `runtime/src/lib.rs` For detailed information about how to set correct version numbers when developing a new runtime, [see this](https://github.com/Joystream/substrate-runtime-joystream/issues/1) - ## Coding style We use `cargo-fmt` to format the source code for consistency. diff --git a/package.json b/package.json index 2adb91c3b6..d30f4fa434 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,11 @@ -{ - "private": true, - "name": "joystream", - "license": "GPL-3.0-only", - "scripts": { - "test": "yarn && yarn workspaces run test" - }, - "workspaces": [ - "tests" - ] -} +{ + "private": true, + "name": "joystream", + "license": "GPL-3.0-only", + "scripts": { + "test": "yarn && yarn workspaces run test" + }, + "workspaces": [ + "tests" + ] +} diff --git a/tests/.env b/tests/.env index e82d01ce0e..c9aba02e40 100644 --- a/tests/.env +++ b/tests/.env @@ -1,3 +1,4 @@ NODE_URL = ws://127.0.0.1:9944 SUDO_ACCOUNT_URL = //Alice MEMBERSHIP_CREATION_N = 1 +MEMBERSHIP_PAID_TERMS = 0 diff --git a/tests/.prettierrc b/tests/.prettierrc index b4f8e6a6a1..bb2de5c084 100644 --- a/tests/.prettierrc +++ b/tests/.prettierrc @@ -1,4 +1,6 @@ { "singleQuote": true, - "arrowParens": "avoid" + "arrowParens": "avoid", + "useTabs": false, + "tabWidth": 2 } diff --git a/tests/package.json b/tests/package.json index bd3a209e57..263cb01362 100644 --- a/tests/package.json +++ b/tests/package.json @@ -1,31 +1,30 @@ { - "name": "joystream-testing", - "version": "0.1.0", - "license": "GPL-3.0-only", - "scripts": { - "build": "tsc --build tsconfig.json", - "test": "mocha -r ts-node/register src/tests/*", - "lint": "tslint --project tsconfig.json", - "prettier": "prettier --write ./src" - }, - "dependencies": { - "@joystream/types": "^0.6.0", - "@polkadot/api": "^0.96.1", - "@polkadot/keyring": "^1.7.0-beta.5", - "@polkadot/types": "^0.96.1", - "@types/bn.js": "^4.11.5", - "bn.js": "^4.11.8", - "dotenv": "^8.2.0" - }, - "devDependencies": { - "@polkadot/ts": "^0.3.14", - "@types/chai": "^4.2.11", - "@types/mocha": "^7.0.2", - "chai": "^4.2.0", - "mocha": "^7.1.1", - "prettier": "2.0.2", - "ts-node": "^8.8.1", - "tslint": "^6.1.0", - "typescript": "^3.8.3" - } + "name": "joystream-testing", + "version": "0.1.0", + "license": "GPL-3.0-only", + "scripts": { + "build": "tsc --build tsconfig.json", + "test": "mocha -r ts-node/register src/tests/*", + "lint": "tslint --project tsconfig.json", + "prettier": "prettier --write ./src" + }, + "dependencies": { + "@joystream/types": "^0.6.0", + "@polkadot/api": "^0.96.1", + "@polkadot/keyring": "^1.7.0-beta.5", + "@types/bn.js": "^4.11.5", + "bn.js": "^4.11.8", + "dotenv": "^8.2.0" + }, + "devDependencies": { + "@polkadot/ts": "^0.3.14", + "@types/chai": "^4.2.11", + "@types/mocha": "^7.0.2", + "chai": "^4.2.0", + "mocha": "^7.1.1", + "prettier": "2.0.2", + "ts-node": "^8.8.1", + "tslint": "^6.1.0", + "typescript": "^3.8.3" + } } diff --git a/tests/src/tests/membershipCreationTest.ts b/tests/src/tests/membershipCreationTest.ts index acb3e601b5..7ee1ac4c13 100644 --- a/tests/src/tests/membershipCreationTest.ts +++ b/tests/src/tests/membershipCreationTest.ts @@ -12,6 +12,7 @@ describe('Membership integration tests', () => { const keyring = new Keyring({ type: 'sr25519' }); const nKeyPairs: KeyringPair[] = new Array(); const N: number = +process.env.MEMBERSHIP_CREATION_N!; + const paidTerms: number = +process.env.MEMBERSHIP_PAID_TERMS!; const nodeUrl: string = process.env.NODE_URL!; const sudoUri: string = process.env.SUDO_ACCOUNT_URL!; const defaultTimeout: number = 30000; @@ -19,8 +20,9 @@ describe('Membership integration tests', () => { let sudo: KeyringPair; let aKeyPair: KeyringPair; let membershipFee: number; + let membershipTransactionFee: number; - before(async function() { + before(async function () { this.timeout(defaultTimeout); registerJoystreamTypes(); const provider = new WsProvider(nodeUrl); @@ -30,30 +32,28 @@ describe('Membership integration tests', () => { nKeyPairs.push(keyring.addFromUri(i.toString())); } aKeyPair = keyring.addFromUri('A'); - membershipFee = await apiMethods.getMembershipFee(0); - let nonce = await apiMethods.getNonce(sudo); - nonce = nonce.sub(new BN(1)); - await apiMethods.transferBalanceToAccounts( + membershipFee = await apiMethods.getMembershipFee(paidTerms); + membershipTransactionFee = apiMethods.estimateBuyMembershipFee( sudo, - nKeyPairs, - membershipFee + 1, - nonce + paidTerms, + 'member_name_which_is_longer_than_expected' ); - await apiMethods.transferBalance(sudo, aKeyPair.address, 2); + let nonce = await apiMethods.getNonce(sudo); + nonce = nonce.sub(new BN(1)); + await apiMethods.transferBalanceToAccounts(sudo, nKeyPairs, membershipFee + membershipTransactionFee, nonce); + await apiMethods.transferBalance(sudo, aKeyPair.address, membershipTransactionFee * 2); }); it('Buy membeship is accepted with sufficient funds', async () => { await Promise.all( nKeyPairs.map(async keyPair => { - await apiMethods.buyMembership(keyPair, 0, 'new_member'); + await apiMethods.buyMembership(keyPair, paidTerms, 'new_member'); }) ); nKeyPairs.map(keyPair => apiMethods .getMembership(keyPair.address) - .then(membership => - assert(!membership.isEmpty, 'Account m is not a member') - ) + .then(membership => assert(!membership.isEmpty, 'Account m is not a member')) ); }).timeout(defaultTimeout); @@ -61,18 +61,13 @@ describe('Membership integration tests', () => { apiMethods .getBalance(aKeyPair.address) .then(balance => - assert( - balance.toNumber() < membershipFee, - 'Account A already have sufficient balance to purchase membership' - ) + assert(balance.toNumber() < membershipFee, 'Account A already have sufficient balance to purchase membership') ); }).timeout(defaultTimeout); it('Account A can not buy the membership with insufficient funds', async () => { - await apiMethods.buyMembership(aKeyPair, 0, 'late_member', true); - apiMethods - .getMembership(aKeyPair.address) - .then(membership => assert(membership.isEmpty, 'Account A is a member')); + await apiMethods.buyMembership(aKeyPair, paidTerms, 'late_member', true); + apiMethods.getMembership(aKeyPair.address).then(membership => assert(membership.isEmpty, 'Account A is a member')); }).timeout(defaultTimeout); it('Account A has been provided with funds to buy the membership', async () => { @@ -80,20 +75,15 @@ describe('Membership integration tests', () => { apiMethods .getBalance(aKeyPair.address) .then(balance => - assert( - balance.toNumber() >= membershipFee, - 'The account balance is insufficient to purchase membership' - ) + assert(balance.toNumber() >= membershipFee, 'The account balance is insufficient to purchase membership') ); }).timeout(defaultTimeout); it('Account A was able to buy the membership', async () => { - await apiMethods.buyMembership(aKeyPair, 0, 'late_member'); + await apiMethods.buyMembership(aKeyPair, paidTerms, 'late_member'); apiMethods .getMembership(aKeyPair.address) - .then(membership => - assert(!membership.isEmpty, 'Account A is a not member') - ); + .then(membership => assert(!membership.isEmpty, 'Account A is a not member')); }).timeout(defaultTimeout); after(() => { diff --git a/tests/src/utils/apiMethods.ts b/tests/src/utils/apiMethods.ts index 243a164e56..cf395f0919 100644 --- a/tests/src/utils/apiMethods.ts +++ b/tests/src/utils/apiMethods.ts @@ -5,6 +5,7 @@ import { Utils } from './utils'; import { UserInfo, PaidMembershipTerms } from '@joystream/types/lib/members'; import { Balance } from '@polkadot/types/interfaces'; import BN = require('bn.js'); +import { SubmittableExtrinsic } from '@polkadot/api/types'; export class ApiMethods { public static async create(provider: WsProvider): Promise { @@ -23,15 +24,12 @@ export class ApiMethods { public async buyMembership( account: KeyringPair, - paidTerms: number, + paidTermsId: number, name: string, expectFailure = false ): Promise { return Utils.signAndSend( - this.api.tx.members.buyMembership( - paidTerms, - new UserInfo({ handle: name, avatar_uri: '', about: '' }) - ), + this.api.tx.members.buyMembership(paidTermsId, new UserInfo({ handle: name, avatar_uri: '', about: '' })), account, await this.getNonce(account), expectFailure @@ -46,32 +44,17 @@ export class ApiMethods { return this.api.query.balances.freeBalance(address); } - public async transferBalance( - from: KeyringPair, - to: string, - amount: number, - nonce: BN = new BN(-1) - ): Promise { + public async transferBalance(from: KeyringPair, to: string, amount: number, nonce: BN = new BN(-1)): Promise { const _nonce = nonce.isNeg() ? await this.getNonce(from) : nonce; - return Utils.signAndSend( - this.api.tx.balances.transfer(to, amount), - from, - _nonce - ); + return Utils.signAndSend(this.api.tx.balances.transfer(to, amount), from, _nonce); } - public getPaidMembershipTerms( - paidTermsId: number - ): Promise> { - return this.api.query.members.paidMembershipTermsById< - Option - >(paidTermsId); + public getPaidMembershipTerms(paidTermsId: number): Promise> { + return this.api.query.members.paidMembershipTermsById>(paidTermsId); } public getMembershipFee(paidTermsId: number): Promise { - return this.getPaidMembershipTerms(paidTermsId).then(terms => - terms.unwrap().fee.toNumber() - ); + return this.getPaidMembershipTerms(paidTermsId).then(terms => terms.unwrap().fee.toNumber()); } public async transferBalanceToAccounts( @@ -89,8 +72,26 @@ export class ApiMethods { } public getNonce(account: KeyringPair): Promise { - return this.api.query.system - .accountNonce(account.address) - .then(nonce => new BN(nonce.toString())); + return this.api.query.system.accountNonce(account.address).then(nonce => new BN(nonce.toString())); + } + + private getBaseTxFee(): number { + return this.api.createType('BalanceOf', this.api.consts.transactionPayment.transactionBaseFee).toNumber(); + } + + private estimateTxFee(tx: SubmittableExtrinsic<'promise'>): number { + const baseFee: number = this.getBaseTxFee(); + const byteFee: number = this.api + .createType('BalanceOf', this.api.consts.transactionPayment.transactionByteFee) + .toNumber(); + return tx.toHex().length * byteFee + baseFee; + } + + public estimateBuyMembershipFee(account: KeyringPair, paidTermsId: number, name: string): number { + const nonce: BN = new BN(0); + const signedTx = this.api.tx.members + .buyMembership(paidTermsId, new UserInfo({ handle: name, avatar_uri: '', about: '' })) + .sign(account, { nonce }); + return this.estimateTxFee(signedTx); } } diff --git a/tests/src/utils/utils.ts b/tests/src/utils/utils.ts index 2fab12370c..08e06a342e 100644 --- a/tests/src/utils/utils.ts +++ b/tests/src/utils/utils.ts @@ -14,10 +14,7 @@ export class Utils { await signedTx .send(async result => { - if ( - result.status.isFinalized === true && - result.events !== undefined - ) { + if (result.status.isFinalized === true && result.events !== undefined) { result.events.forEach(event => { if (event.event.method === 'ExtrinsicFailed') { if (expectFailure) { From 990bf763d617631459484e6c621a7ca1c734f6e1 Mon Sep 17 00:00:00 2001 From: Gleb Urvanov Date: Fri, 27 Mar 2020 15:39:54 +0100 Subject: [PATCH 138/286] unintentional changes reverted --- README.md | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index f02b56406a..ac5676843e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Joystream -This is the main code reposity for all joystream software. It will house the substrate chain project, the full node and runtime and all reusable substrate runtime modules that make up the joystream runtime. In addition to all front-end apps and infrastructure servers necessary for operating the network. +This is the main code reposity for all joystream software. It will house the substrate chain project, the full node and runtime and all reusable substrate runtime modules that make up the joystream runtime. In addition to all front-end apps and infrastructure servers necessary for operating the network. The repository is currently just a cargo workspace, but eventually will also contain yarn workspaces, and possibly other project type workspaces. @@ -9,18 +9,20 @@ The repository is currently just a cargo workspace, but eventually will also con The joystream network builds on a pre-release version of [substrate v2.0](https://substrate.dev/) and adds additional functionality to support the [various roles](https://www.joystream.org/roles) that can be entered into on the platform. -## Validator +## Validator ![ Nodes for Joystream](./node/validator-node-banner.svg) Joystream node is the main server application that connects to the network, synchronizes the blockchain with other nodes and produces blocks if configured as a validator node. To setup a full node and validator review the [advanced guide from the helpdesk](https://github.com/Joystream/helpdesk/tree/master/roles/validators). -### Pre-built Binaries + +### Pre-built Binaries The latest pre-built binaries can be downloads from the [releases](https://github.com/Joystream/substrate-runtime-joystream/releases) page. + ### Building from source Clone the repository and install build tools: @@ -49,8 +51,8 @@ cargo run --release -- --chain ./rome-tesnet.json The `rome-testnet.json` chain file can be ontained from the [release page](https://github.com/Joystream/substrate-runtime-joystream/releases/tag/v6.8.0) -### Installing a release build +### Installing a release build This will install the executable `joystream-node` to your `~/.cargo/bin` folder, which you would normally have in your `$PATH` environment. ```bash @@ -87,6 +89,7 @@ yarn test ![Joystream Runtime](./runtime/runtime-banner.svg) + The runtime is the code that defines the consensus rules of the Joystream protocol. It is compiled to WASM and lives on chain. Joystream node execute the code's logic to validate transactions and blocks on the blockchain. @@ -95,6 +98,7 @@ When building joystream-node as described abot with `cargo build --release`, in `target/release/wbuild/joystream-node-runtime/joystream_node_runtime.compact.wasm` + ### Deployment Deploying the compiled runtime on a live system can be done in one of two ways: @@ -108,6 +112,7 @@ Deploying the compiled runtime on a live system can be done in one of two ways: Versioning of the runtime is set in `runtime/src/lib.rs` For detailed information about how to set correct version numbers when developing a new runtime, [see this](https://github.com/Joystream/substrate-runtime-joystream/issues/1) + ## Coding style We use `cargo-fmt` to format the source code for consistency. @@ -138,4 +143,4 @@ This project is licensed under the GPLv3 License - see the [LICENSE](LICENSE) fi ## Acknowledgments -Thanks to the whole [Parity Tech](https://www.parity.io/) team for making substrate and helping on riot chat with tips, suggestions, tutorials and answering all our questions during development. +Thanks to the whole [Parity Tech](https://www.parity.io/) team for making substrate and helping on riot chat with tips, suggestions, tutorials and answering all our questions during development. \ No newline at end of file From bae83109b82afde469bef46484bd0aa9672b1887 Mon Sep 17 00:00:00 2001 From: Gleb Urvanov Date: Fri, 27 Mar 2020 15:41:10 +0100 Subject: [PATCH 139/286] unintentional changes reverted --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ac5676843e..e7a1b45feb 100644 --- a/README.md +++ b/README.md @@ -143,4 +143,4 @@ This project is licensed under the GPLv3 License - see the [LICENSE](LICENSE) fi ## Acknowledgments -Thanks to the whole [Parity Tech](https://www.parity.io/) team for making substrate and helping on riot chat with tips, suggestions, tutorials and answering all our questions during development. \ No newline at end of file +Thanks to the whole [Parity Tech](https://www.parity.io/) team for making substrate and helping on riot chat with tips, suggestions, tutorials and answering all our questions during development. From 76b240a9465ff6caf788bf1ab3e474e01d5b2409 Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Fri, 27 Mar 2020 19:48:19 +0400 Subject: [PATCH 140/286] council mint: make it an Option and avoid panics even when constructing genesis --- runtime-modules/governance/src/council.rs | 40 ++++++++++++++--------- runtime/src/migration.rs | 8 +++-- 2 files changed, 30 insertions(+), 18 deletions(-) diff --git a/runtime-modules/governance/src/council.rs b/runtime-modules/governance/src/council.rs index 2f6fc41a1f..518285f3ed 100644 --- a/runtime-modules/governance/src/council.rs +++ b/runtime-modules/governance/src/council.rs @@ -33,10 +33,10 @@ decl_storage! { pub TermEndsAt get(term_ends_at) config() : T::BlockNumber = T::BlockNumber::from(1); - /// The mint that funds council member rewards and spending proposals budget. - pub CouncilMint get(council_mint) build(|_config: &GenesisConfig| { - >::create_new_council_mint() - }): ::MintId; + /// The mint that funds council member rewards and spending proposals budget. It is an Option + /// because it was introduced in a runtime upgrade. It will be automatically created when + /// a successful call to set_council_mint_capacity() is made. + pub CouncilMint get(council_mint) : Option<::MintId>; } } @@ -67,12 +67,13 @@ impl Module { Self::active_council().iter().any(|c| c.member == *sender) } - // Initializes a new mint - pub fn create_new_council_mint() -> T::MintId { - let mint_id = >::add_mint(minting::BalanceOf::::zero(), None) - .expect("Failed to create a mint for the council"); + // Initializes a new mint, discarding previous mint if it existed. + pub fn create_new_council_mint( + capacity: minting::BalanceOf, + ) -> Result { + let mint_id = >::add_mint(capacity, None)?; CouncilMint::::put(mint_id); - mint_id + Ok(mint_id) } } @@ -133,18 +134,27 @@ decl_module! { >::put(ends_at); } - /// Sets the capacity of the the council mint - fn set_council_mint_capacity(origin, new_capacity: minting::BalanceOf) { + /// Sets the capacity of the the council mint, if it doesn't exist, attempts to + /// create a new one. + fn set_council_mint_capacity(origin, capacity: minting::BalanceOf) { ensure_root(origin)?; - let mint_id = Self::council_mint(); - minting::Module::::set_mint_capacity(mint_id, new_capacity)?; + + if let Some(mint_id) = Self::council_mint() { + minting::Module::::set_mint_capacity(mint_id, capacity)?; + } else { + Self::create_new_council_mint(capacity)?; + } } /// Attempts to mint and transfer amount to destination account fn spend_from_council_mint(origin, amount: minting::BalanceOf, destination: T::AccountId) { ensure_root(origin)?; - let mint_id = Self::council_mint(); - minting::Module::::transfer_tokens(mint_id, amount, &destination)?; + + if let Some(mint_id) = Self::council_mint() { + minting::Module::::transfer_tokens(mint_id, amount, &destination)?; + } else { + return Err("CouncilHashNoMint") + } } } } diff --git a/runtime/src/migration.rs b/runtime/src/migration.rs index fcfd32263d..e0b144429a 100644 --- a/runtime/src/migration.rs +++ b/runtime/src/migration.rs @@ -1,5 +1,5 @@ use crate::VERSION; -use sr_primitives::print; +use sr_primitives::{print, traits::Zero}; use srml_support::{decl_event, decl_module, decl_storage}; use sudo; use system; @@ -14,8 +14,10 @@ impl Module { // have been initialized with config() or build() mechanism. // ... - // Create the Council mint - governance::council::Module::::create_new_council_mint(); + // Create the Council mint. If it fails, we can't do anything about it here. + let _ = governance::council::Module::::create_new_council_mint( + minting::BalanceOf::::zero(), + ); Self::deposit_event(RawEvent::Migrated( >::block_number(), From 0a34d74febbb2713cab23748fdb639c3bfdba194 Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Fri, 27 Mar 2020 20:00:31 +0400 Subject: [PATCH 141/286] council mint: doc --- runtime-modules/governance/src/council.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime-modules/governance/src/council.rs b/runtime-modules/governance/src/council.rs index 518285f3ed..21b84c60ed 100644 --- a/runtime-modules/governance/src/council.rs +++ b/runtime-modules/governance/src/council.rs @@ -67,7 +67,7 @@ impl Module { Self::active_council().iter().any(|c| c.member == *sender) } - // Initializes a new mint, discarding previous mint if it existed. + /// Initializes a new mint, discarding previous mint if it existed. pub fn create_new_council_mint( capacity: minting::BalanceOf, ) -> Result { From 5150cfb00bbb7842fbffd791e84cee7b4d5b73ca Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Fri, 27 Mar 2020 21:11:16 +0400 Subject: [PATCH 142/286] validate ElectionParameters at genesis --- node/src/chain_spec.rs | 24 +++++----- runtime-modules/governance/src/election.rs | 44 ++++++++++++------- .../governance/src/election_params.rs | 5 ++- runtime/src/lib.rs | 1 + 4 files changed, 45 insertions(+), 29 deletions(-) diff --git a/node/src/chain_spec.rs b/node/src/chain_spec.rs index 5bc2015558..99271c8c83 100644 --- a/node/src/chain_spec.rs +++ b/node/src/chain_spec.rs @@ -18,9 +18,9 @@ use node_runtime::{ versioned_store::InputValidationLengthConstraint as VsInputValidation, ActorsConfig, AuthorityDiscoveryConfig, BabeConfig, Balance, BalancesConfig, ContentWorkingGroupConfig, CouncilConfig, CouncilElectionConfig, DataObjectStorageRegistryConfig, - DataObjectTypeRegistryConfig, GrandpaConfig, ImOnlineConfig, IndicesConfig, MembersConfig, - Perbill, ProposalsConfig, SessionConfig, SessionKeys, Signature, StakerStatus, StakingConfig, - SudoConfig, SystemConfig, VersionedStoreConfig, DAYS, WASM_BINARY, + DataObjectTypeRegistryConfig, ElectionParameters, GrandpaConfig, ImOnlineConfig, IndicesConfig, + MembersConfig, Perbill, ProposalsConfig, SessionConfig, SessionKeys, Signature, StakerStatus, + StakingConfig, SudoConfig, SystemConfig, VersionedStoreConfig, DAYS, WASM_BINARY, }; pub use node_runtime::{AccountId, GenesisConfig}; use primitives::{sr25519, Pair, Public}; @@ -235,14 +235,16 @@ pub fn testnet_genesis( }), election: Some(CouncilElectionConfig { auto_start: true, - announcing_period: 3 * DAYS, - voting_period: 1 * DAYS, - revealing_period: 1 * DAYS, - council_size: 12, - candidacy_limit: 25, - min_council_stake: 10 * DOLLARS, - new_term_duration: 14 * DAYS, - min_voting_stake: 1 * DOLLARS, + election_parameters: ElectionParameters { + announcing_period: 3 * DAYS, + voting_period: 1 * DAYS, + revealing_period: 1 * DAYS, + council_size: 12, + candidacy_limit: 25, + min_council_stake: 10 * DOLLARS, + new_term_duration: 14 * DAYS, + min_voting_stake: 1 * DOLLARS, + }, }), proposals: Some(ProposalsConfig { approval_quorum: 66, diff --git a/runtime-modules/governance/src/election.rs b/runtime-modules/governance/src/election.rs index bcb4bf4185..b969c15785 100644 --- a/runtime-modules/governance/src/election.rs +++ b/runtime-modules/governance/src/election.rs @@ -126,14 +126,21 @@ decl_storage! { // If both candidacy limit and council size are zero then all applicant become council members // since no filtering occurs at end of announcing stage. // We only guard against these edge cases in the set_election_parameters() call. - AnnouncingPeriod get(announcing_period) config(): T::BlockNumber = T::BlockNumber::from(100); - VotingPeriod get(voting_period) config(): T::BlockNumber = T::BlockNumber::from(100); - RevealingPeriod get(revealing_period) config(): T::BlockNumber = T::BlockNumber::from(100); - CouncilSize get(council_size) config(): u32 = 10; - CandidacyLimit get (candidacy_limit) config(): u32 = 20; - MinCouncilStake get(min_council_stake) config(): BalanceOf = BalanceOf::::from(100); - NewTermDuration get(new_term_duration) config(): T::BlockNumber = T::BlockNumber::from(1000); - MinVotingStake get(min_voting_stake) config(): BalanceOf = BalanceOf::::from(10); + AnnouncingPeriod get(announcing_period): T::BlockNumber; + VotingPeriod get(voting_period): T::BlockNumber; + RevealingPeriod get(revealing_period): T::BlockNumber; + CouncilSize get(council_size): u32; + CandidacyLimit get (candidacy_limit): u32; + MinCouncilStake get(min_council_stake): BalanceOf; + NewTermDuration get(new_term_duration): T::BlockNumber; + MinVotingStake get(min_voting_stake): BalanceOf; + } + add_extra_genesis { + config(election_parameters): ElectionParameters, T::BlockNumber>; + build(|config: &GenesisConfig| { + config.election_parameters.ensure_valid().expect("Invalid Election Parameters"); + Module::::set_verified_election_parameters(config.election_parameters); + }); } } @@ -731,6 +738,17 @@ impl Module { Ok(()) } + + fn set_verified_election_parameters(params: ElectionParameters, T::BlockNumber>) { + >::put(params.announcing_period); + >::put(params.voting_period); + >::put(params.revealing_period); + >::put(params.min_council_stake); + >::put(params.new_term_duration); + CouncilSize::put(params.council_size); + CandidacyLimit::put(params.candidacy_limit); + >::put(params.min_voting_stake); + } } decl_module! { @@ -825,15 +843,7 @@ decl_module! { ensure_root(origin)?; ensure!(!Self::is_election_running(), MSG_CANNOT_CHANGE_PARAMS_DURING_ELECTION); params.ensure_valid()?; - - >::put(params.announcing_period); - >::put(params.voting_period); - >::put(params.revealing_period); - >::put(params.min_council_stake); - >::put(params.new_term_duration); - CouncilSize::put(params.council_size); - CandidacyLimit::put(params.candidacy_limit); - >::put(params.min_voting_stake); + Self::set_verified_election_parameters(params); } fn force_stop_election(origin) { diff --git a/runtime-modules/governance/src/election_params.rs b/runtime-modules/governance/src/election_params.rs index 99d4404b49..f5050860bd 100644 --- a/runtime-modules/governance/src/election_params.rs +++ b/runtime-modules/governance/src/election_params.rs @@ -1,4 +1,6 @@ use codec::{Decode, Encode}; +#[cfg(feature = "std")] +use serde::{Deserialize, Serialize}; use sr_primitives::traits::Zero; use srml_support::{dispatch::Result, ensure}; @@ -8,7 +10,8 @@ pub static MSG_CANDIDACY_LIMIT_WAS_LOWER_THAN_COUNCIL_SIZE: &str = "CandidacyWasLessThanCouncilSize"; /// Combined Election parameters, as argument for set_election_parameters -#[derive(Clone, Copy, Encode, Decode, Default, PartialEq, Debug)] +#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))] +#[derive(Clone, Copy, Encode, Decode, Default, PartialEq)] pub struct ElectionParameters { pub announcing_period: BlockNumber, pub voting_period: BlockNumber, diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index bf1581d52f..a2a1739202 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -396,6 +396,7 @@ impl finality_tracker::Trait for Runtime { } pub use forum; +pub use governance::election_params::ElectionParameters; use governance::{council, election, proposals}; use membership::members; use storage::{data_directory, data_object_storage_registry, data_object_type_registry}; From 61aad966748175ed621484e94cbb690f438acb6e Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Fri, 27 Mar 2020 21:20:40 +0400 Subject: [PATCH 143/286] council election parameters derive Debug --- runtime-modules/governance/src/election_params.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime-modules/governance/src/election_params.rs b/runtime-modules/governance/src/election_params.rs index f5050860bd..f34646e608 100644 --- a/runtime-modules/governance/src/election_params.rs +++ b/runtime-modules/governance/src/election_params.rs @@ -10,8 +10,8 @@ pub static MSG_CANDIDACY_LIMIT_WAS_LOWER_THAN_COUNCIL_SIZE: &str = "CandidacyWasLessThanCouncilSize"; /// Combined Election parameters, as argument for set_election_parameters -#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))] -#[derive(Clone, Copy, Encode, Decode, Default, PartialEq)] +#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive(Clone, Copy, Encode, Decode, Default, PartialEq, Debug)] pub struct ElectionParameters { pub announcing_period: BlockNumber, pub voting_period: BlockNumber, From 51628fbed4b6a45b77c7a7b7dc579e0c517b765d Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 27 Mar 2020 20:55:35 +0300 Subject: [PATCH 144/286] Add CouncilElected hook for the proposals - add CouncilElected hook for the proposals - remove unused error.rs - add some comments - add reset_active_proposals() and tests - add runtime integration test proposal_reset_succeeds() --- runtime-modules/governance/src/election.rs | 13 ++ .../proposals/engine/src/errors.rs | 14 -- runtime-modules/proposals/engine/src/lib.rs | 13 +- .../proposals/engine/src/tests/mod.rs | 43 +++++ .../proposals/engine/src/types/mod.rs | 8 + .../engine/src/types/proposal_statuses.rs | 2 + .../proposals/engine/src/types/stakes.rs | 2 + .../proposals/council_elected_handler.rs | 14 ++ .../proposals/council_origin_validator.rs | 2 + .../proposals/membership_origin_validator.rs | 2 + runtime/src/integration/proposals/mod.rs | 4 + .../proposals/staking_events_handler.rs | 2 + runtime/src/lib.rs | 2 +- runtime/src/test/proposals_integration.rs | 159 ++++++++++++++++-- 14 files changed, 251 insertions(+), 29 deletions(-) delete mode 100644 runtime-modules/proposals/engine/src/errors.rs create mode 100644 runtime/src/integration/proposals/council_elected_handler.rs diff --git a/runtime-modules/governance/src/election.rs b/runtime-modules/governance/src/election.rs index 7e8c5dcf82..865d4dd5a5 100644 --- a/runtime-modules/governance/src/election.rs +++ b/runtime-modules/governance/src/election.rs @@ -73,6 +73,19 @@ impl> CouncilElected, + Y: CouncilElected, + > CouncilElected for (X, Y) +{ + fn council_elected(new_council: Elected, term: Term) { + X::council_elected(new_council.clone(), term.clone()); + Y::council_elected(new_council, term); + } +} #[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))] #[derive(Clone, Copy, Encode, Decode, Default)] diff --git a/runtime-modules/proposals/engine/src/errors.rs b/runtime-modules/proposals/engine/src/errors.rs deleted file mode 100644 index 35e45c8a66..0000000000 --- a/runtime-modules/proposals/engine/src/errors.rs +++ /dev/null @@ -1,14 +0,0 @@ -pub const MSG_EMPTY_TITLE_PROVIDED: &str = "Proposal cannot have an empty title"; -pub const MSG_EMPTY_BODY_PROVIDED: &str = "Proposal cannot have an empty body"; -pub const MSG_TOO_LONG_TITLE: &str = "Title is too long"; -pub const MSG_TOO_LONG_BODY: &str = "Body is too long"; -pub const MSG_PROPOSAL_NOT_FOUND: &str = "This proposal does not exist"; -pub const MSG_PROPOSAL_FINALIZED: &str = "Proposal is finalized already"; -pub const MSG_YOU_ALREADY_VOTED: &str = "You have already voted on this proposal"; -pub const MSG_YOU_DONT_OWN_THIS_PROPOSAL: &str = "You do not own this proposal"; -pub const MSG_MAX_ACTIVE_PROPOSAL_NUMBER_EXCEEDED: &str = "Max active proposals number exceeded"; -pub const MSG_STAKE_IS_EMPTY: &str = "Stake cannot be empty with this proposal"; -pub const MSG_STAKE_SHOULD_BE_EMPTY: &str = "Stake should be empty for this proposal"; -pub const MSG_STAKE_DIFFERS_FROM_REQUIRED: &str = "Stake differs from the proposal requirements"; -pub const MSG_INVALID_PARAMETER_APPROVAL_THRESHOLD: &str = "Approval threshold cannot be zero"; -pub const MSG_INVALID_PARAMETER_SLASHING_THRESHOLD: &str = "Slashing threshold cannot be zero"; diff --git a/runtime-modules/proposals/engine/src/lib.rs b/runtime-modules/proposals/engine/src/lib.rs index dc25791242..19975197f9 100644 --- a/runtime-modules/proposals/engine/src/lib.rs +++ b/runtime-modules/proposals/engine/src/lib.rs @@ -7,10 +7,11 @@ //! - cancel_proposal - cancels the proposal (can be canceled only by owner) //! - veto_proposal - vetoes the proposal //! -//! Public API (requires root origin): +//! Public API: //! - create_proposal - creates proposal using provided parameters //! - ensure_create_proposal_parameters_are_valid - ensures that we can create the proposal //! - refund_proposal_stake - a callback for StakingHandlerEvents +//! - reset_active_proposals - resets voting results for active proposals //! // Ensure we're `no_std` when compiling for Wasm. @@ -461,6 +462,16 @@ impl Module { print("Broken invariant: stake doesn't exist"); } } + + /// Resets voting results for active proposals. + /// Possible application - after the new council elections. + pub fn reset_active_proposals() { + >::enumerate().for_each(|(proposal_id, _)| { + >::mutate(proposal_id, |proposal| { + proposal.reset_proposal(); + }); + }); + } } impl Module { diff --git a/runtime-modules/proposals/engine/src/tests/mod.rs b/runtime-modules/proposals/engine/src/tests/mod.rs index 0293276083..df2e49a9bf 100644 --- a/runtime-modules/proposals/engine/src/tests/mod.rs +++ b/runtime-modules/proposals/engine/src/tests/mod.rs @@ -1326,3 +1326,46 @@ fn create_proposal_fails_with_invalid_threshold_parameters() { .create_proposal_and_assert(Err(Error::InvalidParameterSlashingThreshold.into())); }); } + +#[test] +fn proposal_reset_succeeds() { + initial_test_ext().execute_with(|| { + let dummy_proposal = DummyProposalFixture::default(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); + + let mut vote_generator = VoteGenerator::new(proposal_id); + vote_generator.vote_and_assert_ok(VoteKind::Reject); + vote_generator.vote_and_assert_ok(VoteKind::Abstain); + vote_generator.vote_and_assert_ok(VoteKind::Slash); + + assert!(>::exists(proposal_id)); + + run_to_block_and_finalize(2); + + let proposal = >::get(proposal_id); + + assert_eq!( + proposal.voting_results, + VotingResults { + abstentions: 1, + approvals: 0, + rejections: 1, + slashes: 1, + } + ); + + ProposalsEngine::reset_active_proposals(); + + let updated_proposal = >::get(proposal_id); + + assert_eq!( + updated_proposal.voting_results, + VotingResults { + abstentions: 0, + approvals: 0, + rejections: 0, + slashes: 0, + } + ); + }); +} diff --git a/runtime-modules/proposals/engine/src/types/mod.rs b/runtime-modules/proposals/engine/src/types/mod.rs index 4557297404..4ced301e21 100644 --- a/runtime-modules/proposals/engine/src/types/mod.rs +++ b/runtime-modules/proposals/engine/src/types/mod.rs @@ -212,6 +212,14 @@ where None } } + + /// Reset the proposal in Active status. Proposal with other status won't be changed. + /// Reset proposal operation clears voting results. + pub fn reset_proposal(&mut self) { + if let ProposalStatus::Active(_) = self.status.clone() { + self.voting_results = VotingResults::default(); + } + } } /// Provides data for voting. diff --git a/runtime-modules/proposals/engine/src/types/proposal_statuses.rs b/runtime-modules/proposals/engine/src/types/proposal_statuses.rs index 1a2de64dbd..77ebf17926 100644 --- a/runtime-modules/proposals/engine/src/types/proposal_statuses.rs +++ b/runtime-modules/proposals/engine/src/types/proposal_statuses.rs @@ -1,3 +1,5 @@ +#![warn(missing_docs)] + use codec::{Decode, Encode}; use rstd::prelude::*; diff --git a/runtime-modules/proposals/engine/src/types/stakes.rs b/runtime-modules/proposals/engine/src/types/stakes.rs index 181b055e63..88a378981b 100644 --- a/runtime-modules/proposals/engine/src/types/stakes.rs +++ b/runtime-modules/proposals/engine/src/types/stakes.rs @@ -1,3 +1,5 @@ +#![warn(missing_docs)] + use super::{BalanceOf, CurrencyOf, NegativeImbalance}; use crate::Trait; use rstd::convert::From; diff --git a/runtime/src/integration/proposals/council_elected_handler.rs b/runtime/src/integration/proposals/council_elected_handler.rs new file mode 100644 index 0000000000..24a5e5f360 --- /dev/null +++ b/runtime/src/integration/proposals/council_elected_handler.rs @@ -0,0 +1,14 @@ +#![warn(missing_docs)] + +use crate::Runtime; +use governance::election::CouncilElected; + +/// 'Council elected' event handler. Should be applied to the 'election' substrate module. +/// CouncilEvent is handled by resetting active proposals. +pub struct CouncilElectedHandler; + +impl CouncilElected for CouncilElectedHandler { + fn council_elected(_new_council: Elected, _term: Term) { + >::reset_active_proposals(); + } +} diff --git a/runtime/src/integration/proposals/council_origin_validator.rs b/runtime/src/integration/proposals/council_origin_validator.rs index 95428ca6b2..cd53f83f30 100644 --- a/runtime/src/integration/proposals/council_origin_validator.rs +++ b/runtime/src/integration/proposals/council_origin_validator.rs @@ -1,3 +1,5 @@ +#![warn(missing_docs)] + use rstd::marker::PhantomData; use common::origin_validator::ActorOriginValidator; diff --git a/runtime/src/integration/proposals/membership_origin_validator.rs b/runtime/src/integration/proposals/membership_origin_validator.rs index 82bb88cbbb..abe0a0a8be 100644 --- a/runtime/src/integration/proposals/membership_origin_validator.rs +++ b/runtime/src/integration/proposals/membership_origin_validator.rs @@ -1,3 +1,5 @@ +#![warn(missing_docs)] + use rstd::marker::PhantomData; use common::origin_validator::ActorOriginValidator; diff --git a/runtime/src/integration/proposals/mod.rs b/runtime/src/integration/proposals/mod.rs index 172923a1ff..c38aff5e7f 100644 --- a/runtime/src/integration/proposals/mod.rs +++ b/runtime/src/integration/proposals/mod.rs @@ -1,7 +1,11 @@ +#![warn(missing_docs)] + +mod council_elected_handler; mod council_origin_validator; mod membership_origin_validator; mod staking_events_handler; +pub use council_elected_handler::CouncilElectedHandler; pub use council_origin_validator::CouncilManager; pub use membership_origin_validator::{MemberId, MembershipOriginValidator}; pub use staking_events_handler::StakingEventsHandler; diff --git a/runtime/src/integration/proposals/staking_events_handler.rs b/runtime/src/integration/proposals/staking_events_handler.rs index ddd84e77a8..8adbbb0843 100644 --- a/runtime/src/integration/proposals/staking_events_handler.rs +++ b/runtime/src/integration/proposals/staking_events_handler.rs @@ -1,3 +1,5 @@ +#![warn(missing_docs)] + use rstd::marker::PhantomData; use srml_support::traits::{Currency, Imbalance}; use srml_support::StorageMap; diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index c8cca6c92c..96bc3ff330 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -672,7 +672,7 @@ impl common::currency::GovernanceCurrency for Runtime { impl governance::election::Trait for Runtime { type Event = Event; - type CouncilElected = (Council,); + type CouncilElected = (Council, integration::proposals::CouncilElectedHandler); } impl governance::council::Trait for Runtime { diff --git a/runtime/src/test/proposals_integration.rs b/runtime/src/test/proposals_integration.rs index 2a9d3b3510..1e5939f56a 100644 --- a/runtime/src/test/proposals_integration.rs +++ b/runtime/src/test/proposals_integration.rs @@ -4,16 +4,20 @@ use crate::{ProposalCancellationFee, Runtime}; use codec::Encode; +use governance::election::CouncilElected; use membership::members; use proposals_engine::{ ActiveStake, BalanceOf, Error, FinalizationData, Proposal, ProposalDecisionStatus, - ProposalParameters, ProposalStatus, VotingResults, + ProposalParameters, ProposalStatus, VoteKind, VotersParameters, VotingResults, }; use sr_primitives::traits::DispatchResult; use sr_primitives::AccountId32; use srml_support::traits::Currency; +use srml_support::StorageLinkedMap; use system::RawOrigin; +use crate::CouncilManager; + fn initial_test_ext() -> runtime_io::TestExternalities { let t = system::GenesisConfig::default() .build_storage::() @@ -24,6 +28,91 @@ fn initial_test_ext() -> runtime_io::TestExternalities { type Membership = membership::members::Module; type ProposalsEngine = proposals_engine::Module; +type Council = governance::council::Module; + +fn setup_members(count: u8) { + let authority_account_id = ::AccountId::default(); + Membership::set_screening_authority(RawOrigin::Root.into(), authority_account_id.clone()) + .unwrap(); + + for i in 0..count { + let account_id: [u8; 32] = [i; 32]; + Membership::add_screened_member( + RawOrigin::Signed(authority_account_id.clone().into()).into(), + account_id.clone().into(), + members::UserInfo { + handle: Some(account_id.to_vec()), + avatar_uri: None, + about: None, + }, + ) + .unwrap(); + } +} + +fn setup_council() { + let councilor0 = AccountId32::default(); + let councilor1: [u8; 32] = [1; 32]; + let councilor2: [u8; 32] = [2; 32]; + let councilor3: [u8; 32] = [3; 32]; + let councilor4: [u8; 32] = [4; 32]; + let councilor5: [u8; 32] = [5; 32]; + assert!(Council::set_council( + system::RawOrigin::Root.into(), + vec![ + councilor0, + councilor1.into(), + councilor2.into(), + councilor3.into(), + councilor4.into(), + councilor5.into() + ] + ) + .is_ok()); +} + +struct VoteGenerator { + proposal_id: u32, + current_account_id: AccountId32, + current_account_id_seed: u8, + current_voter_id: u64, + pub auto_increment_voter_id: bool, +} + +impl VoteGenerator { + fn new(proposal_id: u32) -> Self { + VoteGenerator { + proposal_id, + current_voter_id: 0, + current_account_id_seed: 0, + current_account_id: AccountId32::default(), + auto_increment_voter_id: true, + } + } + fn vote_and_assert_ok(&mut self, vote_kind: VoteKind) { + self.vote_and_assert(vote_kind, Ok(())); + } + + fn vote_and_assert(&mut self, vote_kind: VoteKind, expected_result: DispatchResult) { + assert_eq!(self.vote(vote_kind.clone()), expected_result); + } + + fn vote(&mut self, vote_kind: VoteKind) -> DispatchResult { + if self.auto_increment_voter_id { + self.current_account_id_seed += 1; + self.current_voter_id += 1; + let account_id: [u8; 32] = [self.current_account_id_seed; 32]; + self.current_account_id = account_id.into(); + } + + ProposalsEngine::vote( + system::RawOrigin::Signed(self.current_account_id.clone()).into(), + self.current_voter_id, + self.proposal_id, + vote_kind, + ) + } +} #[derive(Clone)] struct DummyProposalFixture { @@ -147,18 +236,7 @@ fn proposal_cancellation_with_slashes_with_balance_checks_succeeds() { initial_test_ext().execute_with(|| { let account_id = ::AccountId::default(); - Membership::set_screening_authority(RawOrigin::Root.into(), account_id.clone()).unwrap(); - - Membership::add_screened_member( - RawOrigin::Signed(account_id.clone()).into(), - account_id.clone(), - members::UserInfo { - handle: Some(b"handle".to_vec()), - avatar_uri: None, - about: None, - }, - ) - .unwrap(); + setup_members(2); let member_id = 0; // newly created member_id let stake_amount = 200u128; @@ -232,3 +310,58 @@ fn proposal_cancellation_with_slashes_with_balance_checks_succeeds() { ); }); } + +#[test] +fn proposal_reset_succeeds() { + initial_test_ext().execute_with(|| { + setup_members(4); + setup_council(); + // create proposal + let dummy_proposal = DummyProposalFixture::default(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); + + // create some votes + let mut vote_generator = VoteGenerator::new(proposal_id); + vote_generator.vote_and_assert_ok(VoteKind::Reject); + vote_generator.vote_and_assert_ok(VoteKind::Abstain); + vote_generator.vote_and_assert_ok(VoteKind::Slash); + + assert!(>::exists( + proposal_id + )); + + // check + let proposal = ProposalsEngine::proposals(proposal_id); + assert_eq!( + proposal.voting_results, + VotingResults { + abstentions: 1, + approvals: 0, + rejections: 1, + slashes: 1, + } + ); + + // Ensure council was elected + assert_eq!(CouncilManager::::total_voters_count(), 6); + + // Check proposals CouncilElected hook + // just trigger the election hook, we don't care about the parameters + ::CouncilElected::council_elected(Vec::new(), 10); + + let updated_proposal = ProposalsEngine::proposals(proposal_id); + + assert_eq!( + updated_proposal.voting_results, + VotingResults { + abstentions: 0, + approvals: 0, + rejections: 0, + slashes: 0, + } + ); + + // Check council CouncilElected hook. It should set current council. And we passed empty council. + assert_eq!(CouncilManager::::total_voters_count(), 0); + }); +} From 01df9ce39d9b87deebc7e5f0ad328741914f4aa2 Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Sat, 28 Mar 2020 10:05:33 +0400 Subject: [PATCH 145/286] election parameters: doc --- runtime-modules/governance/src/election.rs | 43 +++++++++++++++------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/runtime-modules/governance/src/election.rs b/runtime-modules/governance/src/election.rs index b969c15785..d5a91b784a 100644 --- a/runtime-modules/governance/src/election.rs +++ b/runtime-modules/governance/src/election.rs @@ -1,3 +1,26 @@ +//! Council Elections Manager +//! +//! # Election Parameters: +//! We don't currently handle zero periods, zero council term, zero council size and candidacy +//! limit in any special way. The behaviour in such cases: +//! +//! - Setting any period to 0 will mean the election getting stuck in that stage, until force changing +//! the state. +//! +//! - Council Size of 0 - no limit to size of council, all applicants that move beyond +//! announcing stage would become council members, so effectively the candidacy limit will +//! be the size of the council, voting and revealing have no impact on final results. +//! +//! - If candidacy limit is zero and council size > 0, council_size number of applicants will reach the voting stage. +//! and become council members, voting will have no impact on final results. +//! +//! - If both candidacy limit and council size are zero then all applicant become council members +//! since no filtering occurs at end of announcing stage. +//! +//! We only guard against these edge cases in the [`set_election_parameters`] call. +//! +//! [`set_election_parameters`]: struct.Module.html#method.set_election_parameters + use rstd::prelude::*; use srml_support::traits::{Currency, ReservableCurrency}; use srml_support::{decl_event, decl_module, decl_storage, dispatch::Result, ensure}; @@ -113,19 +136,6 @@ decl_storage! { // Should we replace all the individual values with a single ElectionParameters type? // Having them individually makes it more flexible to add and remove new parameters in future // without dealing with migration issues. - - // We don't currently handle zero periods, zero council term, zero council size and candidacy - // limit in any special way. The behaviour in such cases: - // Setting any period to 0 will mean the election getting stuck in that stage, until force changing - // the state. - // Council Size of 0 - no limit to size of council, all applicants that move beyond - // announcing stage would become council members, so effectively the candidacy limit will - // be the size of the council, voting and revealing have no impact on final results. - // If candidacy limit is zero and council size > 0, council_size number of applicants will reach the voting stage. - // and become council members, voting will have no impact on final results. - // If both candidacy limit and council size are zero then all applicant become council members - // since no filtering occurs at end of announcing stage. - // We only guard against these edge cases in the set_election_parameters() call. AnnouncingPeriod get(announcing_period): T::BlockNumber; VotingPeriod get(voting_period): T::BlockNumber; RevealingPeriod get(revealing_period): T::BlockNumber; @@ -839,7 +849,12 @@ decl_module! { >::put(ElectionStage::Voting(ends_at)); } - fn set_election_parameters(origin, params: ElectionParameters, T::BlockNumber>) { + /// Sets new election parameters. Some combination of parameters that are not desirable, so + /// the parameters are checked for validity. + /// The call will fail if an election is in progress. If a council is not being elected for some + /// reaon after multiple rounds, force_stop_election() can be called to stop elections and followed by + /// set_election_parameters(). + pub fn set_election_parameters(origin, params: ElectionParameters, T::BlockNumber>) { ensure_root(origin)?; ensure!(!Self::is_election_running(), MSG_CANNOT_CHANGE_PARAMS_DURING_ELECTION); params.ensure_valid()?; From d510d90940cb6267c687cb7017fbc9a763f65256 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Mon, 30 Mar 2020 12:56:09 +0300 Subject: [PATCH 146/286] =?UTF-8?q?Add=20=E2=80=98set=5Felection=5Fparamet?= =?UTF-8?q?ers=E2=80=99=20extrinsic?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - add ‘set_election_parameters’ extrinsic - add tests - add check for correct proposal type for other extrinsics --- runtime-modules/proposals/codex/Cargo.toml | 10 +- runtime-modules/proposals/codex/src/lib.rs | 70 +++++++- .../proposals/codex/src/proposal_types/mod.rs | 14 ++ .../proposals/codex/src/tests/mock.rs | 5 + .../proposals/codex/src/tests/mod.rs | 169 ++++++++++++++++-- 5 files changed, 246 insertions(+), 22 deletions(-) diff --git a/runtime-modules/proposals/codex/Cargo.toml b/runtime-modules/proposals/codex/Cargo.toml index ebb6ea31a2..be8bc18f6c 100644 --- a/runtime-modules/proposals/codex/Cargo.toml +++ b/runtime-modules/proposals/codex/Cargo.toml @@ -91,6 +91,11 @@ default_features = false package = 'substrate-membership-module' path = '../../membership' +[dependencies.governance] +default_features = false +package = 'substrate-governance-module' +path = '../../governance' + [dependencies.proposal_engine] default_features = false package = 'substrate-proposals-engine-module' @@ -111,8 +116,3 @@ default_features = false git = 'https://github.com/paritytech/substrate.git' package = 'sr-io' rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' - -[dev-dependencies.governance] -default_features = false -package = 'substrate-governance-module' -path = '../../governance' \ No newline at end of file diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index f348e18f67..a7b0c63f16 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -4,6 +4,7 @@ //! Supported extrinsics (proposal type): //! - create_text_proposal //! - create_runtime_upgrade_proposal +//! - create_set_election_parameters_proposal //! //! Proposal implementations of this module: //! - execute_text_proposal - prints the proposal to the log @@ -29,11 +30,16 @@ use srml_support::{decl_error, decl_module, decl_storage, ensure, print}; use system::{ensure_root, RawOrigin}; use common::origin_validator::ActorOriginValidator; +use governance::election_params::ElectionParameters; use proposal_engine::ProposalParameters; /// 'Proposals codex' substrate module Trait pub trait Trait: - system::Trait + proposal_engine::Trait + membership::members::Trait + proposal_discussion::Trait + system::Trait + + proposal_engine::Trait + + membership::members::Trait + + proposal_discussion::Trait + + governance::election::Trait { /// Defines max allowed text proposal length. type TextProposalMaxLength: Get; @@ -54,6 +60,12 @@ use srml_support::traits::{Currency, Get}; pub type BalanceOf = <::Currency as Currency<::AccountId>>::Balance; +/// Balance alias for GovernanceCurrency from common module. TODO: replace with BalanceOf +pub type BalanceOfGovernanceCurrency = + <::Currency as Currency< + ::AccountId, + >>::Balance; + /// Balance alias for staking pub type NegativeImbalance = <::Currency as Currency<::AccountId>>::NegativeImbalance; @@ -124,14 +136,14 @@ decl_module! { /// Predefined errors type Error = Error; - /// Create text (signal) proposal type. On approval prints its content. + /// Create text (signal) proposal type. pub fn create_text_proposal( origin, member_id: MemberId, title: Vec, description: Vec, - text: Vec, stake_balance: Option>, + text: Vec, ) { let account_id = T::MembershipOriginValidator::ensure_actor_origin(origin, member_id.clone())?; @@ -173,14 +185,14 @@ decl_module! { >::insert(proposal_id, discussion_thread_id); } - /// Create runtime upgrade proposal type. On approval prints its content. + /// Create runtime upgrade proposal type. pub fn create_runtime_upgrade_proposal( origin, member_id: MemberId, title: Vec, description: Vec, - wasm: Vec, stake_balance: Option>, + wasm: Vec, ) { let account_id = T::MembershipOriginValidator::ensure_actor_origin(origin, member_id.clone())?; @@ -222,6 +234,54 @@ decl_module! { >::insert(proposal_id, discussion_thread_id); } + /// Create 'Set election parameters' proposal type. This proposal uses set_election_parameters() + /// extrinsic from the governance::election module. + pub fn create_set_election_parameters_proposal( + origin, + member_id: MemberId, + title: Vec, + description: Vec, + stake_balance: Option>, + election_parameters: ElectionParameters, T::BlockNumber>, + ) { + let account_id = T::MembershipOriginValidator::ensure_actor_origin(origin, member_id.clone())?; + + let parameters = proposal_types::parameters::set_election_parameters_proposal::(); + + >::ensure_create_proposal_parameters_are_valid( + ¶meters, + &title, + &description, + stake_balance, + )?; + + >::ensure_can_create_thread( + &title, + member_id.clone(), + )?; + + election_parameters.ensure_valid()?; + + let proposal_code = >::set_election_parameters(election_parameters); + + let discussion_thread_id = >::create_thread( + member_id, + title.clone(), + )?; + + let proposal_id = >::create_proposal( + account_id, + member_id, + parameters, + title, + description, + stake_balance, + proposal_code.encode(), + )?; + + >::insert(proposal_id, discussion_thread_id); + } + // *************** Extrinsic to execute /// Text proposal extrinsic. Should be used as callable object to pass to the engine module. diff --git a/runtime-modules/proposals/codex/src/proposal_types/mod.rs b/runtime-modules/proposals/codex/src/proposal_types/mod.rs index d58cb7b037..cb03c78b87 100644 --- a/runtime-modules/proposals/codex/src/proposal_types/mod.rs +++ b/runtime-modules/proposals/codex/src/proposal_types/mod.rs @@ -28,4 +28,18 @@ pub(crate) mod parameters { required_stake: Some(>::from(500u32)), } } + + // Proposal parameters for the 'Set Election Parameters' proposal + pub(crate) fn set_election_parameters_proposal( + ) -> ProposalParameters> { + ProposalParameters { + voting_period: T::BlockNumber::from(50000u32), + grace_period: T::BlockNumber::from(10000u32), + approval_quorum_percentage: 40, + approval_threshold_percentage: 51, + slashing_quorum_percentage: 80, + slashing_threshold_percentage: 80, + required_stake: Some(>::from(500u32)), + } + } } diff --git a/runtime-modules/proposals/codex/src/tests/mock.rs b/runtime-modules/proposals/codex/src/tests/mock.rs index 5cc6aa4bcc..ce64225df0 100644 --- a/runtime-modules/proposals/codex/src/tests/mock.rs +++ b/runtime-modules/proposals/codex/src/tests/mock.rs @@ -150,6 +150,11 @@ parameter_types! { pub const RuntimeUpgradeWasmProposalMaxLength: u32 = 20_000; } +impl governance::election::Trait for Test { + type Event = (); + type CouncilElected = (); +} + impl crate::Trait for Test { type TextProposalMaxLength = TextProposalMaxLength; type RuntimeUpgradeWasmProposalMaxLength = RuntimeUpgradeWasmProposalMaxLength; diff --git a/runtime-modules/proposals/codex/src/tests/mod.rs b/runtime-modules/proposals/codex/src/tests/mod.rs index dc90276582..fa626005f4 100644 --- a/runtime-modules/proposals/codex/src/tests/mod.rs +++ b/runtime-modules/proposals/codex/src/tests/mod.rs @@ -1,5 +1,6 @@ mod mock; +use governance::election_params::ElectionParameters; use srml_support::traits::Currency; use srml_support::StorageMap; use system::RawOrigin; @@ -23,8 +24,8 @@ fn create_text_proposal_codex_call_succeeds() { proposer_id, b"title".to_vec(), b"body".to_vec(), - b"text".to_vec(), required_stake, + b"text".to_vec(), ), Ok(()) ); @@ -32,6 +33,14 @@ fn create_text_proposal_codex_call_succeeds() { // a discussion was created let thread_id = >::get(1); assert_eq!(thread_id, 1); + + let proposal_id = 1; + let proposal = ProposalsEngine::proposals(proposal_id); + // check for correct proposal parameters + assert_eq!( + proposal.parameters, + crate::proposal_types::parameters::text_proposal::() + ); }); } @@ -44,8 +53,8 @@ fn create_text_proposal_codex_call_fails_with_invalid_stake() { 1, b"title".to_vec(), b"body".to_vec(), - b"text".to_vec(), None, + b"text".to_vec(), ), Err(Error::Other("EmptyStake")) ); @@ -58,8 +67,8 @@ fn create_text_proposal_codex_call_fails_with_invalid_stake() { 1, b"title".to_vec(), b"body".to_vec(), - b"text".to_vec(), invalid_stake, + b"text".to_vec(), ), Err(Error::Other("StakeDiffersFromRequired")) ); @@ -78,8 +87,8 @@ fn create_text_proposal_codex_call_fails_with_incorrect_text_size() { 1, b"title".to_vec(), b"body".to_vec(), - long_text, None, + long_text, ), Err(Error::TextProposalSizeExceeded) ); @@ -90,8 +99,8 @@ fn create_text_proposal_codex_call_fails_with_incorrect_text_size() { 1, b"title".to_vec(), b"body".to_vec(), - Vec::new(), None, + Vec::new(), ), Err(Error::TextProposalIsEmpty) ); @@ -108,8 +117,8 @@ fn create_text_proposal_codex_call_fails_with_insufficient_rights() { 1, b"title".to_vec(), b"body".to_vec(), - b"text".to_vec(), None, + b"text".to_vec(), ) .is_err()); }); @@ -127,8 +136,8 @@ fn create_upgrade_runtime_proposal_codex_call_fails_with_incorrect_wasm_size() { 1, b"title".to_vec(), b"body".to_vec(), - long_wasm, None, + long_wasm, ), Err(Error::RuntimeProposalSizeExceeded) ); @@ -139,8 +148,8 @@ fn create_upgrade_runtime_proposal_codex_call_fails_with_incorrect_wasm_size() { 1, b"title".to_vec(), b"body".to_vec(), - Vec::new(), None, + Vec::new(), ), Err(Error::RuntimeProposalIsEmpty) ); @@ -157,8 +166,8 @@ fn create_upgrade_runtime_proposal_codex_call_fails_with_insufficient_rights() { 1, b"title".to_vec(), b"body".to_vec(), - b"wasm".to_vec(), None, + b"wasm".to_vec(), ) .is_err()); }); @@ -174,8 +183,8 @@ fn create_runtime_upgrade_proposal_codex_call_fails_with_invalid_stake() { proposer_id, b"title".to_vec(), b"body".to_vec(), - b"wasm".to_vec(), None, + b"wasm".to_vec(), ), Err(Error::Other("EmptyStake")) ); @@ -188,8 +197,8 @@ fn create_runtime_upgrade_proposal_codex_call_fails_with_invalid_stake() { proposer_id, b"title".to_vec(), b"body".to_vec(), - b"wasm".to_vec(), invalid_stake, + b"wasm".to_vec(), ), Err(Error::Other("StakeDiffersFromRequired")) ); @@ -212,8 +221,8 @@ fn create_runtime_upgrade_proposal_codex_call_succeeds() { proposer_id, b"title".to_vec(), b"body".to_vec(), - b"wasm".to_vec(), required_stake, + b"wasm".to_vec(), ), Ok(()) ); @@ -221,5 +230,141 @@ fn create_runtime_upgrade_proposal_codex_call_succeeds() { // a discussion was created let thread_id = >::get(1); assert_eq!(thread_id, 1); + + let proposal_id = 1; + let proposal = ProposalsEngine::proposals(proposal_id); + // check for correct proposal parameters + assert_eq!( + proposal.parameters, + crate::proposal_types::parameters::upgrade_runtime::() + ); + }); +} + +#[test] +fn create_set_election_parameters_call_fails_with_insufficient_rights() { + initial_test_ext().execute_with(|| { + let origin = RawOrigin::None.into(); + + assert!(ProposalCodex::create_set_election_parameters_proposal( + origin, + 1, + b"title".to_vec(), + b"body".to_vec(), + None, + ElectionParameters::default(), + ) + .is_err()); + }); +} + +#[test] +fn create_set_election_parameters_call_fails_with_incorrect_parameters() { + initial_test_ext().execute_with(|| { + let account_id = 1; + let origin = RawOrigin::Signed(account_id).into(); + + let required_stake = Some(>::from(500u32)); + let _imbalance = ::Currency::deposit_creating(&account_id, 50000); + + assert_eq!( + ProposalCodex::create_set_election_parameters_proposal( + origin, + 1, + b"title".to_vec(), + b"body".to_vec(), + required_stake, + ElectionParameters::default(), + ), + Err(Error::Other("PeriodCannotBeZero")) + ); + }); +} + +#[test] +fn create_set_election_parameters_call_fails_with_invalid_stake() { + initial_test_ext().execute_with(|| { + let origin = RawOrigin::Signed(1).into(); + + let election_parameters = ElectionParameters { + announcing_period: 1, + voting_period: 2, + revealing_period: 3, + council_size: 4, + candidacy_limit: 5, + min_voting_stake: 6, + min_council_stake: 7, + new_term_duration: 8, + }; + + assert_eq!( + ProposalCodex::create_set_election_parameters_proposal( + origin, + 1, + b"title".to_vec(), + b"body".to_vec(), + None, + election_parameters.clone(), + ), + Err(Error::Other("EmptyStake")) + ); + + let invalid_stake = Some(>::from(5000u32)); + + assert_eq!( + ProposalCodex::create_set_election_parameters_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + invalid_stake, + election_parameters, + ), + Err(Error::Other("StakeDiffersFromRequired")) + ); + }); +} + +#[test] +fn create_set_election_parameters_call_succeeds() { + initial_test_ext().execute_with(|| { + let account_id = 1; + let origin = RawOrigin::Signed(account_id).into(); + + let required_stake = Some(>::from(500u32)); + let _imbalance = ::Currency::deposit_creating(&account_id, 50000); + + let election_parameters = ElectionParameters { + announcing_period: 1, + voting_period: 2, + revealing_period: 3, + council_size: 4, + candidacy_limit: 5, + min_voting_stake: 6, + min_council_stake: 7, + new_term_duration: 8, + }; + + assert!(ProposalCodex::create_set_election_parameters_proposal( + origin, + 1, + b"title".to_vec(), + b"body".to_vec(), + required_stake, + election_parameters, + ) + .is_ok()); + + // a discussion was created + let thread_id = >::get(1); + assert_eq!(thread_id, 1); + + let proposal_id = 1; + let proposal = ProposalsEngine::proposals(proposal_id); + // check for correct proposal parameters + assert_eq!( + proposal.parameters, + crate::proposal_types::parameters::set_election_parameters_proposal::() + ); }); } From 983b34cb326540683e513da47cff6bbfaf5d010c Mon Sep 17 00:00:00 2001 From: Gleb Urvanov Date: Mon, 30 Mar 2020 17:04:41 +0200 Subject: [PATCH 147/286] review feedback applied --- .dockerignore | 3 +- README.md | 3 ++ runtime/src/lib.rs | 2 +- tests/.env | 6 ++- tests/src/tests/membershipCreationTest.ts | 42 ++++++++++---------- tests/src/utils/apiMethods.ts | 48 +++++++++++------------ tests/src/utils/sender.ts | 28 +++++++++++++ tests/src/utils/utils.ts | 23 +++++++++++ 8 files changed, 106 insertions(+), 49 deletions(-) create mode 100644 tests/src/utils/sender.ts diff --git a/.dockerignore b/.dockerignore index 8357df11b9..6bf1151fe0 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1 +1,2 @@ -**target* \ No newline at end of file +**target* +**node_modules* \ No newline at end of file diff --git a/README.md b/README.md index e7a1b45feb..1f3e32b8da 100644 --- a/README.md +++ b/README.md @@ -82,9 +82,12 @@ cargo test ### API integration tests ```bash +./scripts/run-dev-chain.sh yarn test ``` +To run the integration tests with a different chain, you can omit step running the local development chain and set the node URL using `NODE_URL` environment variable. + ## Joystream Runtime ![Joystream Runtime](./runtime/runtime-banner.svg) diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 92c4bbb9f0..d8ef495e40 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -246,7 +246,7 @@ parameter_types! { pub const TransferFee: u128 = 0; pub const CreationFee: u128 = 0; pub const TransactionBaseFee: u128 = 1; - pub const TransactionByteFee: u128 = 0; + pub const TransactionByteFee: u128 = 1; pub const InitialMembersBalance: u32 = 2000; } diff --git a/tests/.env b/tests/.env index c9aba02e40..41f7f38c97 100644 --- a/tests/.env +++ b/tests/.env @@ -1,4 +1,8 @@ +# Address of the Joystream node. NODE_URL = ws://127.0.0.1:9944 -SUDO_ACCOUNT_URL = //Alice +# Account which is expected to provide sufficient funds to test accounts. +SUDO_ACCOUNT_URI = //Alice +# Amount of members able to buy membership in membership creation test. MEMBERSHIP_CREATION_N = 1 +# ID of the membership paid terms used in membership creation test. MEMBERSHIP_PAID_TERMS = 0 diff --git a/tests/src/tests/membershipCreationTest.ts b/tests/src/tests/membershipCreationTest.ts index 7ee1ac4c13..d0966b9742 100644 --- a/tests/src/tests/membershipCreationTest.ts +++ b/tests/src/tests/membershipCreationTest.ts @@ -14,13 +14,13 @@ describe('Membership integration tests', () => { const N: number = +process.env.MEMBERSHIP_CREATION_N!; const paidTerms: number = +process.env.MEMBERSHIP_PAID_TERMS!; const nodeUrl: string = process.env.NODE_URL!; - const sudoUri: string = process.env.SUDO_ACCOUNT_URL!; + const sudoUri: string = process.env.SUDO_ACCOUNT_URI!; const defaultTimeout: number = 30000; let apiMethods: ApiMethods; let sudo: KeyringPair; let aKeyPair: KeyringPair; - let membershipFee: number; - let membershipTransactionFee: number; + let membershipFee: BN; + let membershipTransactionFee: BN; before(async function () { this.timeout(defaultTimeout); @@ -40,46 +40,48 @@ describe('Membership integration tests', () => { ); let nonce = await apiMethods.getNonce(sudo); nonce = nonce.sub(new BN(1)); - await apiMethods.transferBalanceToAccounts(sudo, nKeyPairs, membershipFee + membershipTransactionFee, nonce); - await apiMethods.transferBalance(sudo, aKeyPair.address, membershipTransactionFee * 2); + await apiMethods.transferBalanceToAccounts( + sudo, + nKeyPairs, + membershipTransactionFee.add(new BN(membershipFee)), + nonce + ); + await apiMethods.transferBalance(sudo, aKeyPair.address, membershipTransactionFee); }); it('Buy membeship is accepted with sufficient funds', async () => { await Promise.all( - nKeyPairs.map(async keyPair => { - await apiMethods.buyMembership(keyPair, paidTerms, 'new_member'); + nKeyPairs.map(async (keyPair, index) => { + await apiMethods.buyMembership(keyPair, paidTerms, `new_member_${index}`); }) ); - nKeyPairs.map(keyPair => + nKeyPairs.forEach((keyPair, index) => apiMethods .getMembership(keyPair.address) - .then(membership => assert(!membership.isEmpty, 'Account m is not a member')) + .then(membership => assert(!membership.isEmpty, `Account ${index} is not a member`)) ); }).timeout(defaultTimeout); - it('Accont A has insufficient funds to buy membership', async () => { + it('Account A can not buy the membership with insufficient funds', async () => { apiMethods .getBalance(aKeyPair.address) .then(balance => - assert(balance.toNumber() < membershipFee, 'Account A already have sufficient balance to purchase membership') + assert( + balance.toBn() < membershipFee.add(membershipTransactionFee), + 'Account A already have sufficient balance to purchase membership' + ) ); - }).timeout(defaultTimeout); - - it('Account A can not buy the membership with insufficient funds', async () => { await apiMethods.buyMembership(aKeyPair, paidTerms, 'late_member', true); apiMethods.getMembership(aKeyPair.address).then(membership => assert(membership.isEmpty, 'Account A is a member')); }).timeout(defaultTimeout); - it('Account A has been provided with funds to buy the membership', async () => { - await apiMethods.transferBalance(sudo, aKeyPair.address, membershipFee); + it('Account A was able to buy the membership with insufficient funds', async () => { + await apiMethods.transferBalance(sudo, aKeyPair.address, membershipFee.add(membershipTransactionFee)); apiMethods .getBalance(aKeyPair.address) .then(balance => - assert(balance.toNumber() >= membershipFee, 'The account balance is insufficient to purchase membership') + assert(balance.toBn() >= membershipFee, 'The account balance is insufficient to purchase membership') ); - }).timeout(defaultTimeout); - - it('Account A was able to buy the membership', async () => { await apiMethods.buyMembership(aKeyPair, paidTerms, 'late_member'); apiMethods .getMembership(aKeyPair.address) diff --git a/tests/src/utils/apiMethods.ts b/tests/src/utils/apiMethods.ts index cf395f0919..51e84c7d3b 100644 --- a/tests/src/utils/apiMethods.ts +++ b/tests/src/utils/apiMethods.ts @@ -1,21 +1,25 @@ import { ApiPromise, WsProvider } from '@polkadot/api'; import { Option } from '@polkadot/types'; import { KeyringPair } from '@polkadot/keyring/types'; -import { Utils } from './utils'; import { UserInfo, PaidMembershipTerms } from '@joystream/types/lib/members'; -import { Balance } from '@polkadot/types/interfaces'; +import { Balance, Index } from '@polkadot/types/interfaces'; import BN = require('bn.js'); import { SubmittableExtrinsic } from '@polkadot/api/types'; +import { Sender } from './sender'; +import { Utils } from './utils'; export class ApiMethods { + private readonly api: ApiPromise; + private readonly sender: Sender; + public static async create(provider: WsProvider): Promise { const api = await ApiPromise.create({ provider }); return new ApiMethods(api); } - private readonly api: ApiPromise; constructor(api: ApiPromise) { this.api = api; + this.sender = new Sender(api); } public close() { @@ -44,7 +48,7 @@ export class ApiMethods { return this.api.query.balances.freeBalance(address); } - public async transferBalance(from: KeyringPair, to: string, amount: number, nonce: BN = new BN(-1)): Promise { + public async transferBalance(from: KeyringPair, to: string, amount: BN, nonce: BN = new BN(-1)): Promise { const _nonce = nonce.isNeg() ? await this.getNonce(from) : nonce; return Utils.signAndSend(this.api.tx.balances.transfer(to, amount), from, _nonce); } @@ -53,16 +57,11 @@ export class ApiMethods { return this.api.query.members.paidMembershipTermsById>(paidTermsId); } - public getMembershipFee(paidTermsId: number): Promise { - return this.getPaidMembershipTerms(paidTermsId).then(terms => terms.unwrap().fee.toNumber()); + public getMembershipFee(paidTermsId: number): Promise { + return this.getPaidMembershipTerms(paidTermsId).then(terms => terms.unwrap().fee.toBn()); } - public async transferBalanceToAccounts( - from: KeyringPair, - to: KeyringPair[], - amount: number, - nonce: BN - ): Promise { + public async transferBalanceToAccounts(from: KeyringPair, to: KeyringPair[], amount: BN, nonce: BN): Promise { return Promise.all( to.map(async keyPair => { nonce = nonce.add(new BN(1)); @@ -72,26 +71,23 @@ export class ApiMethods { } public getNonce(account: KeyringPair): Promise { - return this.api.query.system.accountNonce(account.address).then(nonce => new BN(nonce.toString())); + return this.api.query.system.accountNonce(account.address); } - private getBaseTxFee(): number { - return this.api.createType('BalanceOf', this.api.consts.transactionPayment.transactionBaseFee).toNumber(); + private getBaseTxFee(): BN { + return this.api.createType('BalanceOf', this.api.consts.transactionPayment.transactionBaseFee).toBn(); } - private estimateTxFee(tx: SubmittableExtrinsic<'promise'>): number { - const baseFee: number = this.getBaseTxFee(); - const byteFee: number = this.api - .createType('BalanceOf', this.api.consts.transactionPayment.transactionByteFee) - .toNumber(); - return tx.toHex().length * byteFee + baseFee; + private estimateTxFee(tx: SubmittableExtrinsic<'promise'>): BN { + const baseFee: BN = this.getBaseTxFee(); + const byteFee: BN = this.api.createType('BalanceOf', this.api.consts.transactionPayment.transactionByteFee).toBn(); + return Utils.calcTxLength(tx).mul(byteFee).add(baseFee); } - public estimateBuyMembershipFee(account: KeyringPair, paidTermsId: number, name: string): number { + public estimateBuyMembershipFee(account: KeyringPair, paidTermsId: number, name: string): BN { const nonce: BN = new BN(0); - const signedTx = this.api.tx.members - .buyMembership(paidTermsId, new UserInfo({ handle: name, avatar_uri: '', about: '' })) - .sign(account, { nonce }); - return this.estimateTxFee(signedTx); + return this.estimateTxFee( + this.api.tx.members.buyMembership(paidTermsId, new UserInfo({ handle: name, avatar_uri: '', about: '' })) + ); } } diff --git a/tests/src/utils/sender.ts b/tests/src/utils/sender.ts new file mode 100644 index 0000000000..188d680572 --- /dev/null +++ b/tests/src/utils/sender.ts @@ -0,0 +1,28 @@ +import BN = require('bn.js'); +import { ApiPromise } from '@polkadot/api'; +import { Index } from '@polkadot/types/interfaces'; +import { SubmittableExtrinsic } from '@polkadot/api/types'; +import { KeyringPair } from '@polkadot/keyring/types'; + +export class Sender { + private readonly api: ApiPromise; + private nonceMap: Map = new Map(); + + constructor(api: ApiPromise) { + this.api = api; + } + + private async getNonce(address: string): Promise { + let nonce: BN | undefined = this.nonceMap.get(address); + if (!nonce) { + nonce = await this.api.query.system.accountNonce(address); + } + let nextNonce: BN = nonce.addn(1); + this.nonceMap.set(address, nextNonce); + return nonce; + } + + private clearNonce(address: string): void { + this.nonceMap.delete(address); + } +} diff --git a/tests/src/utils/utils.ts b/tests/src/utils/utils.ts index 08e06a342e..563921952f 100644 --- a/tests/src/utils/utils.ts +++ b/tests/src/utils/utils.ts @@ -1,8 +1,26 @@ import { KeyringPair } from '@polkadot/keyring/types'; import { SubmittableExtrinsic } from '@polkadot/api/types'; +import { IExtrinsic } from '@polkadot/types/types'; +import { compactToU8a } from '@polkadot/util'; import BN = require('bn.js'); export class Utils { + private static LENGTH_ADDRESS = 32 + 1; // publicKey + prefix + private static LENGTH_ERA = 2; // assuming mortals + private static LENGTH_SIGNATURE = 64; // assuming ed25519 or sr25519 + private static LENGTH_VERSION = 1; // 0x80 & version + + public static calcTxLength = (extrinsic?: IExtrinsic | null, nonce?: BN): BN => { + return new BN( + Utils.LENGTH_VERSION + + Utils.LENGTH_ADDRESS + + Utils.LENGTH_SIGNATURE + + Utils.LENGTH_ERA + + compactToU8a(nonce || 0).length + + (extrinsic ? extrinsic.encodedLength : 0) + ); + }; + public static async signAndSend( tx: SubmittableExtrinsic<'promise'>, account: KeyringPair, @@ -10,6 +28,7 @@ export class Utils { expectFailure = false ): Promise { return new Promise(async (resolve, reject) => { + // let nonce: BN = await this.getNonce(account.address); const signedTx = tx.sign(account, { nonce }); await signedTx @@ -26,6 +45,10 @@ export class Utils { }); resolve(); } + if (result.status.isFuture) { + this.clearNonce(account.address); + reject(new Error('Extrinsic nonce is in future')); + } }) .catch(error => { reject(error); From 76e88725c2c0fb28a27d1d36d9f715dd72d51d22 Mon Sep 17 00:00:00 2001 From: Gleb Urvanov Date: Mon, 30 Mar 2020 17:19:26 +0200 Subject: [PATCH 148/286] Sender class with nonce management was introduces, apiMethods renamed to apiWrapper to reflect the purpose --- tests/src/tests/membershipCreationTest.ts | 41 ++++++++----------- .../utils/{apiMethods.ts => apiWrapper.ts} | 25 ++++------- tests/src/utils/sender.ts | 34 +++++++++++++++ tests/src/utils/utils.ts | 35 ---------------- 4 files changed, 60 insertions(+), 75 deletions(-) rename tests/src/utils/{apiMethods.ts => apiWrapper.ts} (78%) diff --git a/tests/src/tests/membershipCreationTest.ts b/tests/src/tests/membershipCreationTest.ts index d0966b9742..d6e19c9d0a 100644 --- a/tests/src/tests/membershipCreationTest.ts +++ b/tests/src/tests/membershipCreationTest.ts @@ -4,7 +4,7 @@ import { Keyring } from '@polkadot/keyring'; import { assert } from 'chai'; import { KeyringPair } from '@polkadot/keyring/types'; import BN = require('bn.js'); -import { ApiMethods } from '../utils/apiMethods'; +import { ApiWrapper } from '../utils/apiWrapper'; import { initConfig } from '../utils/config'; describe('Membership integration tests', () => { @@ -16,7 +16,7 @@ describe('Membership integration tests', () => { const nodeUrl: string = process.env.NODE_URL!; const sudoUri: string = process.env.SUDO_ACCOUNT_URI!; const defaultTimeout: number = 30000; - let apiMethods: ApiMethods; + let apiWrapper: ApiWrapper; let sudo: KeyringPair; let aKeyPair: KeyringPair; let membershipFee: BN; @@ -26,44 +26,37 @@ describe('Membership integration tests', () => { this.timeout(defaultTimeout); registerJoystreamTypes(); const provider = new WsProvider(nodeUrl); - apiMethods = await ApiMethods.create(provider); + apiWrapper = await ApiWrapper.create(provider); sudo = keyring.addFromUri(sudoUri); for (let i = 0; i < N; i++) { nKeyPairs.push(keyring.addFromUri(i.toString())); } aKeyPair = keyring.addFromUri('A'); - membershipFee = await apiMethods.getMembershipFee(paidTerms); - membershipTransactionFee = apiMethods.estimateBuyMembershipFee( + membershipFee = await apiWrapper.getMembershipFee(paidTerms); + membershipTransactionFee = apiWrapper.estimateBuyMembershipFee( sudo, paidTerms, 'member_name_which_is_longer_than_expected' ); - let nonce = await apiMethods.getNonce(sudo); - nonce = nonce.sub(new BN(1)); - await apiMethods.transferBalanceToAccounts( - sudo, - nKeyPairs, - membershipTransactionFee.add(new BN(membershipFee)), - nonce - ); - await apiMethods.transferBalance(sudo, aKeyPair.address, membershipTransactionFee); + await apiWrapper.transferBalanceToAccounts(sudo, nKeyPairs, membershipTransactionFee.add(new BN(membershipFee))); + await apiWrapper.transferBalance(sudo, aKeyPair.address, membershipTransactionFee); }); it('Buy membeship is accepted with sufficient funds', async () => { await Promise.all( nKeyPairs.map(async (keyPair, index) => { - await apiMethods.buyMembership(keyPair, paidTerms, `new_member_${index}`); + await apiWrapper.buyMembership(keyPair, paidTerms, `new_member_${index}`); }) ); nKeyPairs.forEach((keyPair, index) => - apiMethods + apiWrapper .getMembership(keyPair.address) .then(membership => assert(!membership.isEmpty, `Account ${index} is not a member`)) ); }).timeout(defaultTimeout); it('Account A can not buy the membership with insufficient funds', async () => { - apiMethods + apiWrapper .getBalance(aKeyPair.address) .then(balance => assert( @@ -71,24 +64,24 @@ describe('Membership integration tests', () => { 'Account A already have sufficient balance to purchase membership' ) ); - await apiMethods.buyMembership(aKeyPair, paidTerms, 'late_member', true); - apiMethods.getMembership(aKeyPair.address).then(membership => assert(membership.isEmpty, 'Account A is a member')); + await apiWrapper.buyMembership(aKeyPair, paidTerms, 'late_member', true); + apiWrapper.getMembership(aKeyPair.address).then(membership => assert(membership.isEmpty, 'Account A is a member')); }).timeout(defaultTimeout); it('Account A was able to buy the membership with insufficient funds', async () => { - await apiMethods.transferBalance(sudo, aKeyPair.address, membershipFee.add(membershipTransactionFee)); - apiMethods + await apiWrapper.transferBalance(sudo, aKeyPair.address, membershipFee.add(membershipTransactionFee)); + apiWrapper .getBalance(aKeyPair.address) .then(balance => assert(balance.toBn() >= membershipFee, 'The account balance is insufficient to purchase membership') ); - await apiMethods.buyMembership(aKeyPair, paidTerms, 'late_member'); - apiMethods + await apiWrapper.buyMembership(aKeyPair, paidTerms, 'late_member'); + apiWrapper .getMembership(aKeyPair.address) .then(membership => assert(!membership.isEmpty, 'Account A is a not member')); }).timeout(defaultTimeout); after(() => { - apiMethods.close(); + apiWrapper.close(); }); }); diff --git a/tests/src/utils/apiMethods.ts b/tests/src/utils/apiWrapper.ts similarity index 78% rename from tests/src/utils/apiMethods.ts rename to tests/src/utils/apiWrapper.ts index 51e84c7d3b..452e0313cc 100644 --- a/tests/src/utils/apiMethods.ts +++ b/tests/src/utils/apiWrapper.ts @@ -2,19 +2,19 @@ import { ApiPromise, WsProvider } from '@polkadot/api'; import { Option } from '@polkadot/types'; import { KeyringPair } from '@polkadot/keyring/types'; import { UserInfo, PaidMembershipTerms } from '@joystream/types/lib/members'; -import { Balance, Index } from '@polkadot/types/interfaces'; +import { Balance } from '@polkadot/types/interfaces'; import BN = require('bn.js'); import { SubmittableExtrinsic } from '@polkadot/api/types'; import { Sender } from './sender'; import { Utils } from './utils'; -export class ApiMethods { +export class ApiWrapper { private readonly api: ApiPromise; private readonly sender: Sender; - public static async create(provider: WsProvider): Promise { + public static async create(provider: WsProvider): Promise { const api = await ApiPromise.create({ provider }); - return new ApiMethods(api); + return new ApiWrapper(api); } constructor(api: ApiPromise) { @@ -32,10 +32,9 @@ export class ApiMethods { name: string, expectFailure = false ): Promise { - return Utils.signAndSend( + return this.sender.signAndSend( this.api.tx.members.buyMembership(paidTermsId, new UserInfo({ handle: name, avatar_uri: '', about: '' })), account, - await this.getNonce(account), expectFailure ); } @@ -48,9 +47,8 @@ export class ApiMethods { return this.api.query.balances.freeBalance(address); } - public async transferBalance(from: KeyringPair, to: string, amount: BN, nonce: BN = new BN(-1)): Promise { - const _nonce = nonce.isNeg() ? await this.getNonce(from) : nonce; - return Utils.signAndSend(this.api.tx.balances.transfer(to, amount), from, _nonce); + public async transferBalance(from: KeyringPair, to: string, amount: BN): Promise { + return this.sender.signAndSend(this.api.tx.balances.transfer(to, amount), from); } public getPaidMembershipTerms(paidTermsId: number): Promise> { @@ -61,19 +59,14 @@ export class ApiMethods { return this.getPaidMembershipTerms(paidTermsId).then(terms => terms.unwrap().fee.toBn()); } - public async transferBalanceToAccounts(from: KeyringPair, to: KeyringPair[], amount: BN, nonce: BN): Promise { + public async transferBalanceToAccounts(from: KeyringPair, to: KeyringPair[], amount: BN): Promise { return Promise.all( to.map(async keyPair => { - nonce = nonce.add(new BN(1)); - await this.transferBalance(from, keyPair.address, amount, nonce); + await this.transferBalance(from, keyPair.address, amount); }) ); } - public getNonce(account: KeyringPair): Promise { - return this.api.query.system.accountNonce(account.address); - } - private getBaseTxFee(): BN { return this.api.createType('BalanceOf', this.api.consts.transactionPayment.transactionBaseFee).toBn(); } diff --git a/tests/src/utils/sender.ts b/tests/src/utils/sender.ts index 188d680572..92a58496a6 100644 --- a/tests/src/utils/sender.ts +++ b/tests/src/utils/sender.ts @@ -25,4 +25,38 @@ export class Sender { private clearNonce(address: string): void { this.nonceMap.delete(address); } + + public async signAndSend( + tx: SubmittableExtrinsic<'promise'>, + account: KeyringPair, + expectFailure = false + ): Promise { + return new Promise(async (resolve, reject) => { + let nonce: BN = await this.getNonce(account.address); + const signedTx = tx.sign(account, { nonce }); + + await signedTx + .send(async result => { + if (result.status.isFinalized === true && result.events !== undefined) { + result.events.forEach(event => { + if (event.event.method === 'ExtrinsicFailed') { + if (expectFailure) { + resolve(); + } else { + reject(new Error('Extrinsic failed unexpectedly')); + } + } + }); + resolve(); + } + if (result.status.isFuture) { + this.clearNonce(account.address); + reject(new Error('Extrinsic nonce is in future')); + } + }) + .catch(error => { + reject(error); + }); + }); + } } diff --git a/tests/src/utils/utils.ts b/tests/src/utils/utils.ts index 563921952f..f1cca8988c 100644 --- a/tests/src/utils/utils.ts +++ b/tests/src/utils/utils.ts @@ -20,39 +20,4 @@ export class Utils { (extrinsic ? extrinsic.encodedLength : 0) ); }; - - public static async signAndSend( - tx: SubmittableExtrinsic<'promise'>, - account: KeyringPair, - nonce: BN, - expectFailure = false - ): Promise { - return new Promise(async (resolve, reject) => { - // let nonce: BN = await this.getNonce(account.address); - const signedTx = tx.sign(account, { nonce }); - - await signedTx - .send(async result => { - if (result.status.isFinalized === true && result.events !== undefined) { - result.events.forEach(event => { - if (event.event.method === 'ExtrinsicFailed') { - if (expectFailure) { - resolve(); - } else { - reject(new Error('Extrinsic failed unexpectedly')); - } - } - }); - resolve(); - } - if (result.status.isFuture) { - this.clearNonce(account.address); - reject(new Error('Extrinsic nonce is in future')); - } - }) - .catch(error => { - reject(error); - }); - }); - } } From cb6f3ec4e617b592c35a3ba8634a817e6c08412f Mon Sep 17 00:00:00 2001 From: Gleb Urvanov Date: Mon, 30 Mar 2020 17:20:48 +0200 Subject: [PATCH 149/286] unused import removal --- tests/src/utils/utils.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/src/utils/utils.ts b/tests/src/utils/utils.ts index f1cca8988c..5e07a795bc 100644 --- a/tests/src/utils/utils.ts +++ b/tests/src/utils/utils.ts @@ -1,5 +1,3 @@ -import { KeyringPair } from '@polkadot/keyring/types'; -import { SubmittableExtrinsic } from '@polkadot/api/types'; import { IExtrinsic } from '@polkadot/types/types'; import { compactToU8a } from '@polkadot/util'; import BN = require('bn.js'); From 6667cd3ac4a6c75db516bdf3dc9eff3a7441eb4b Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Mon, 30 Mar 2020 18:21:04 +0300 Subject: [PATCH 150/286] Add create_set_council_mint_capacity_proposal() extrinsic --- runtime-modules/proposals/codex/Cargo.toml | 10 ++-- runtime-modules/proposals/codex/src/lib.rs | 51 +++++++++++++++++++ .../proposals/codex/src/proposal_types/mod.rs | 18 ++++++- 3 files changed, 72 insertions(+), 7 deletions(-) diff --git a/runtime-modules/proposals/codex/Cargo.toml b/runtime-modules/proposals/codex/Cargo.toml index 9acd86efbb..136b0182b5 100644 --- a/runtime-modules/proposals/codex/Cargo.toml +++ b/runtime-modules/proposals/codex/Cargo.toml @@ -96,6 +96,11 @@ default_features = false package = 'substrate-governance-module' path = '../../governance' +[dependencies.mint] +default_features = false +package = 'substrate-token-mint-module' +path = '../../token-minting' + [dependencies.proposal_engine] default_features = false package = 'substrate-proposals-engine-module' @@ -116,8 +121,3 @@ default_features = false git = 'https://github.com/paritytech/substrate.git' package = 'sr-io' rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' - -[dev-dependencies.mint] -default_features = false -package = 'substrate-token-mint-module' -path = '../../token-minting' \ No newline at end of file diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index a7b0c63f16..3aced2f0b4 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -66,6 +66,10 @@ pub type BalanceOfGovernanceCurrency = ::AccountId, >>::Balance; +/// Balance alias for token mint balance from token mint module. TODO: replace with BalanceOf +pub type BalanceOfMint = + <::Currency as Currency<::AccountId>>::Balance; + /// Balance alias for staking pub type NegativeImbalance = <::Currency as Currency<::AccountId>>::NegativeImbalance; @@ -282,6 +286,53 @@ decl_module! { >::insert(proposal_id, discussion_thread_id); } + + /// Create 'Set council mint capacity' proposal type. This proposal uses set_mint_capacity() + /// extrinsic from the governance::council module. + pub fn create_set_council_mint_capacity_proposal( + origin, + member_id: MemberId, + title: Vec, + description: Vec, + stake_balance: Option>, + mint_balance: BalanceOfMint, + ) { + let account_id = T::MembershipOriginValidator::ensure_actor_origin(origin, member_id.clone())?; + + let parameters = proposal_types::parameters::set_council_mint_capacity_proposal::(); + + >::ensure_create_proposal_parameters_are_valid( + ¶meters, + &title, + &description, + stake_balance, + )?; + + >::ensure_can_create_thread( + &title, + member_id.clone(), + )?; + + let proposal_code = >::set_council_mint_capacity(mint_balance); + + let discussion_thread_id = >::create_thread( + member_id, + title.clone(), + )?; + + let proposal_id = >::create_proposal( + account_id, + member_id, + parameters, + title, + description, + stake_balance, + proposal_code.encode(), + )?; + + >::insert(proposal_id, discussion_thread_id); + } + // *************** Extrinsic to execute /// Text proposal extrinsic. Should be used as callable object to pass to the engine module. diff --git a/runtime-modules/proposals/codex/src/proposal_types/mod.rs b/runtime-modules/proposals/codex/src/proposal_types/mod.rs index cb03c78b87..5409db0ad0 100644 --- a/runtime-modules/proposals/codex/src/proposal_types/mod.rs +++ b/runtime-modules/proposals/codex/src/proposal_types/mod.rs @@ -24,7 +24,7 @@ pub(crate) mod parameters { approval_quorum_percentage: 40, approval_threshold_percentage: 51, slashing_quorum_percentage: 80, - slashing_threshold_percentage: 80, + slashing_threshold_percentage: 82, required_stake: Some(>::from(500u32)), } } @@ -37,7 +37,21 @@ pub(crate) mod parameters { grace_period: T::BlockNumber::from(10000u32), approval_quorum_percentage: 40, approval_threshold_percentage: 51, - slashing_quorum_percentage: 80, + slashing_quorum_percentage: 81, + slashing_threshold_percentage: 80, + required_stake: Some(>::from(500u32)), + } + } + + // Proposal parameters for the 'Set council mint capacity' proposal + pub(crate) fn set_council_mint_capacity_proposal( + ) -> ProposalParameters> { + ProposalParameters { + voting_period: T::BlockNumber::from(50000u32), + grace_period: T::BlockNumber::from(10000u32), + approval_quorum_percentage: 40, + approval_threshold_percentage: 51, + slashing_quorum_percentage: 81, slashing_threshold_percentage: 80, required_stake: Some(>::from(500u32)), } From 2bdaa184a97191e1cab5103ce3e9031c86473bdb Mon Sep 17 00:00:00 2001 From: Gleb Urvanov Date: Mon, 30 Mar 2020 17:25:55 +0200 Subject: [PATCH 151/286] lint recommendations applied --- tests/src/utils/sender.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/src/utils/sender.ts b/tests/src/utils/sender.ts index 92a58496a6..8069c4e334 100644 --- a/tests/src/utils/sender.ts +++ b/tests/src/utils/sender.ts @@ -17,7 +17,7 @@ export class Sender { if (!nonce) { nonce = await this.api.query.system.accountNonce(address); } - let nextNonce: BN = nonce.addn(1); + const nextNonce: BN = nonce.addn(1); this.nonceMap.set(address, nextNonce); return nonce; } @@ -32,7 +32,7 @@ export class Sender { expectFailure = false ): Promise { return new Promise(async (resolve, reject) => { - let nonce: BN = await this.getNonce(account.address); + const nonce: BN = await this.getNonce(account.address); const signedTx = tx.sign(account, { nonce }); await signedTx From 9323f6a98e2e09fd83191fa77a5475bed2107568 Mon Sep 17 00:00:00 2001 From: Gleb Urvanov Date: Mon, 30 Mar 2020 17:47:01 +0200 Subject: [PATCH 152/286] testing runtime alteration reverted --- runtime/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index d8ef495e40..92c4bbb9f0 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -246,7 +246,7 @@ parameter_types! { pub const TransferFee: u128 = 0; pub const CreationFee: u128 = 0; pub const TransactionBaseFee: u128 = 1; - pub const TransactionByteFee: u128 = 1; + pub const TransactionByteFee: u128 = 0; pub const InitialMembersBalance: u32 = 2000; } From 9e2f9e964dec17852fc36e698aed7c6a59542489 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Mon, 30 Mar 2020 18:51:49 +0300 Subject: [PATCH 153/286] Refactor codex proposal creation --- runtime-modules/proposals/codex/src/lib.rs | 172 ++++++++------------- 1 file changed, 67 insertions(+), 105 deletions(-) diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index 3aced2f0b4..d52594984a 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -54,6 +54,7 @@ pub trait Trait: Self::AccountId, >; } +use srml_support::dispatch::DispatchResult; use srml_support::traits::{Currency, Get}; /// Balance alias @@ -149,44 +150,23 @@ decl_module! { stake_balance: Option>, text: Vec, ) { - let account_id = T::MembershipOriginValidator::ensure_actor_origin(origin, member_id.clone())?; - - let parameters = proposal_types::parameters::text_proposal::(); - ensure!(!text.is_empty(), Error::TextProposalIsEmpty); ensure!(text.len() as u32 <= T::TextProposalMaxLength::get(), Error::TextProposalSizeExceeded); - >::ensure_create_proposal_parameters_are_valid( - ¶meters, - &title, - &description, - stake_balance, - )?; - - >::ensure_can_create_thread( - &title, - member_id.clone(), - )?; + let proposal_parameters = proposal_types::parameters::text_proposal::(); + let proposal_code = + >::execute_text_proposal(title.clone(), description.clone(), text); - let proposal_code = >::execute_text_proposal(title.clone(), description.clone(), text); - - let discussion_thread_id = >::create_thread( + Self::create_proposal( + origin, member_id, - title.clone(), - )?; - - let proposal_id = >::create_proposal( - account_id, - member_id, - parameters, title, description, stake_balance, proposal_code.encode(), + proposal_parameters, )?; - - >::insert(proposal_id, discussion_thread_id); } /// Create runtime upgrade proposal type. @@ -198,44 +178,24 @@ decl_module! { stake_balance: Option>, wasm: Vec, ) { - let account_id = T::MembershipOriginValidator::ensure_actor_origin(origin, member_id.clone())?; - - let parameters = proposal_types::parameters::upgrade_runtime::(); - ensure!(!wasm.is_empty(), Error::RuntimeProposalIsEmpty); ensure!(wasm.len() as u32 <= T::RuntimeUpgradeWasmProposalMaxLength::get(), Error::RuntimeProposalSizeExceeded); - >::ensure_create_proposal_parameters_are_valid( - ¶meters, - &title, - &description, - stake_balance, - )?; - - >::ensure_can_create_thread( - &title, - member_id.clone(), - )?; + let proposal_code = + >::execute_runtime_upgrade_proposal(title.clone(), description.clone(), wasm); - let proposal_code = >::execute_runtime_upgrade_proposal(title.clone(), description.clone(), wasm); + let proposal_parameters = proposal_types::parameters::upgrade_runtime::(); - let discussion_thread_id = >::create_thread( + Self::create_proposal( + origin, member_id, - title.clone(), - )?; - - let proposal_id = >::create_proposal( - account_id, - member_id, - parameters, title, description, stake_balance, proposal_code.encode(), + proposal_parameters, )?; - - >::insert(proposal_id, discussion_thread_id); } /// Create 'Set election parameters' proposal type. This proposal uses set_election_parameters() @@ -248,42 +208,23 @@ decl_module! { stake_balance: Option>, election_parameters: ElectionParameters, T::BlockNumber>, ) { - let account_id = T::MembershipOriginValidator::ensure_actor_origin(origin, member_id.clone())?; - - let parameters = proposal_types::parameters::set_election_parameters_proposal::(); - - >::ensure_create_proposal_parameters_are_valid( - ¶meters, - &title, - &description, - stake_balance, - )?; - - >::ensure_can_create_thread( - &title, - member_id.clone(), - )?; - election_parameters.ensure_valid()?; - let proposal_code = >::set_election_parameters(election_parameters); + let proposal_code = + >::set_election_parameters(election_parameters); - let discussion_thread_id = >::create_thread( - member_id, - title.clone(), - )?; + let proposal_parameters = + proposal_types::parameters::set_election_parameters_proposal::(); - let proposal_id = >::create_proposal( - account_id, + Self::create_proposal( + origin, member_id, - parameters, title, description, stake_balance, proposal_code.encode(), + proposal_parameters, )?; - - >::insert(proposal_id, discussion_thread_id); } @@ -297,40 +238,21 @@ decl_module! { stake_balance: Option>, mint_balance: BalanceOfMint, ) { - let account_id = T::MembershipOriginValidator::ensure_actor_origin(origin, member_id.clone())?; + let proposal_code = + >::set_council_mint_capacity(mint_balance); - let parameters = proposal_types::parameters::set_council_mint_capacity_proposal::(); + let proposal_parameters = + proposal_types::parameters::set_council_mint_capacity_proposal::(); - >::ensure_create_proposal_parameters_are_valid( - ¶meters, - &title, - &description, - stake_balance, - )?; - - >::ensure_can_create_thread( - &title, - member_id.clone(), - )?; - - let proposal_code = >::set_council_mint_capacity(mint_balance); - - let discussion_thread_id = >::create_thread( - member_id, - title.clone(), - )?; - - let proposal_id = >::create_proposal( - account_id, + Self::create_proposal( + origin, member_id, - parameters, title, description, stake_balance, proposal_code.encode(), + proposal_parameters, )?; - - >::insert(proposal_id, discussion_thread_id); } // *************** Extrinsic to execute @@ -391,4 +313,44 @@ impl Module { (cloned_origin1.into(), cloned_origin2.into()) } + + /// Generic template proposal builder + fn create_proposal( + origin: T::Origin, + member_id: MemberId, + title: Vec, + description: Vec, + stake_balance: Option>, + proposal_code: Vec, + proposal_parameters: ProposalParameters>, + ) -> DispatchResult { + let account_id = + T::MembershipOriginValidator::ensure_actor_origin(origin, member_id.clone())?; + + >::ensure_create_proposal_parameters_are_valid( + &proposal_parameters, + &title, + &description, + stake_balance, + )?; + + >::ensure_can_create_thread(&title, member_id.clone())?; + + let discussion_thread_id = + >::create_thread(member_id, title.clone())?; + + let proposal_id = >::create_proposal( + account_id, + member_id, + proposal_parameters, + title, + description, + stake_balance, + proposal_code, + )?; + + >::insert(proposal_id, discussion_thread_id); + + Ok(()) + } } From 4f1aa44842e97c7ef2bc4185653a95c615dacaaf Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Mon, 30 Mar 2020 19:07:49 +0300 Subject: [PATCH 154/286] Add tests for create_set_council_mint_capacity_proposal() in codex --- .../proposals/codex/src/proposal_types/mod.rs | 2 +- .../proposals/codex/src/tests/mod.rs | 83 +++++++++++++++++++ 2 files changed, 84 insertions(+), 1 deletion(-) diff --git a/runtime-modules/proposals/codex/src/proposal_types/mod.rs b/runtime-modules/proposals/codex/src/proposal_types/mod.rs index 5409db0ad0..3184657512 100644 --- a/runtime-modules/proposals/codex/src/proposal_types/mod.rs +++ b/runtime-modules/proposals/codex/src/proposal_types/mod.rs @@ -52,7 +52,7 @@ pub(crate) mod parameters { approval_quorum_percentage: 40, approval_threshold_percentage: 51, slashing_quorum_percentage: 81, - slashing_threshold_percentage: 80, + slashing_threshold_percentage: 84, required_stake: Some(>::from(500u32)), } } diff --git a/runtime-modules/proposals/codex/src/tests/mod.rs b/runtime-modules/proposals/codex/src/tests/mod.rs index fa626005f4..4ba98783a6 100644 --- a/runtime-modules/proposals/codex/src/tests/mod.rs +++ b/runtime-modules/proposals/codex/src/tests/mod.rs @@ -368,3 +368,86 @@ fn create_set_election_parameters_call_succeeds() { ); }); } + +#[test] +fn create_set_council_mint_call_succeeds() { + initial_test_ext().execute_with(|| { + let account_id = 1; + let origin = RawOrigin::Signed(account_id).into(); + + let required_stake = Some(>::from(500u32)); + let _imbalance = ::Currency::deposit_creating(&account_id, 50000); + + assert!(ProposalCodex::create_set_council_mint_capacity_proposal( + origin, + 1, + b"title".to_vec(), + b"body".to_vec(), + required_stake, + 0, + ) + .is_ok()); + + // a discussion was created + let thread_id = >::get(1); + assert_eq!(thread_id, 1); + + let proposal_id = 1; + let proposal = ProposalsEngine::proposals(proposal_id); + // check for correct proposal parameters + assert_eq!( + proposal.parameters, + crate::proposal_types::parameters::set_council_mint_capacity_proposal::() + ); + }); +} + +#[test] +fn create_set_council_mint_capacity_proposal_call_fails_with_invalid_stake() { + initial_test_ext().execute_with(|| { + let origin = RawOrigin::Signed(1).into(); + + assert_eq!( + ProposalCodex::create_set_council_mint_capacity_proposal( + origin, + 1, + b"title".to_vec(), + b"body".to_vec(), + None, + 0, + ), + Err(Error::Other("EmptyStake")) + ); + + let invalid_stake = Some(>::from(5000u32)); + + assert_eq!( + ProposalCodex::create_set_council_mint_capacity_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + invalid_stake, + 0, + ), + Err(Error::Other("StakeDiffersFromRequired")) + ); + }); +} + +#[test] +fn create_set_council_mint_capacity_proposal_call_fails_with_insufficient_rights() { + initial_test_ext().execute_with(|| { + let origin = RawOrigin::None.into(); + + assert!(ProposalCodex::create_set_council_mint_capacity_proposal( + origin, + 1, + b"title".to_vec(), + b"body".to_vec(), + None, + 0, + ) + .is_err()); + }); +} From 552de6b35ec10a1a658d71a25c1938bacab21047 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 31 Mar 2020 12:37:09 +0300 Subject: [PATCH 155/286] Add create_set_content_working_group_mint_capacity_proposal() extrinsic - add create_set_content_working_group_mint_capacity_proposal() extrinsic to the codex module - add tests - refactor codex module tests --- Cargo.lock | 5 + runtime-modules/proposals/codex/Cargo.toml | 32 + runtime-modules/proposals/codex/src/lib.rs | 30 + .../proposals/codex/src/proposal_types/mod.rs | 14 + .../proposals/codex/src/tests/mock.rs | 27 + .../proposals/codex/src/tests/mod.rs | 601 ++++++++---------- 6 files changed, 390 insertions(+), 319 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a174b304eb..92f3f5dd76 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5109,13 +5109,18 @@ dependencies = [ "srml-system", "srml-timestamp", "substrate-common-module", + "substrate-content-working-group-module", "substrate-governance-module", + "substrate-hiring-module", "substrate-membership-module", "substrate-primitives", "substrate-proposals-discussion-module", "substrate-proposals-engine-module", + "substrate-recurring-reward-module", "substrate-stake-module", "substrate-token-mint-module", + "substrate-versioned-store", + "substrate-versioned-store-permissions-module", ] [[package]] diff --git a/runtime-modules/proposals/codex/Cargo.toml b/runtime-modules/proposals/codex/Cargo.toml index 136b0182b5..47390bea5f 100644 --- a/runtime-modules/proposals/codex/Cargo.toml +++ b/runtime-modules/proposals/codex/Cargo.toml @@ -21,6 +21,8 @@ std = [ 'stake/std', 'balances/std', 'membership/std', + 'governance/std', + 'mint/std', ] @@ -116,8 +118,38 @@ default_features = false package = 'substrate-common-module' path = '../../common' +[dependencies.content_working_group] +default_features = false +package = 'substrate-content-working-group-module' +path = '../../content-working-group' + [dev-dependencies.runtime-io] default_features = false git = 'https://github.com/paritytech/substrate.git' package = 'sr-io' rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' + +[dev-dependencies.hiring] +default_features = false +package = 'substrate-hiring-module' +path = '../../hiring' + +[dev-dependencies.versioned_store] +default_features = false +package ='substrate-versioned-store' +path = '../../versioned-store' + +[dependencies.versioned_store] +default_features = false +package ='substrate-versioned-store' +path = '../../versioned-store' + +[dev-dependencies.versioned_store_permissions] +default_features = false +package = 'substrate-versioned-store-permissions-module' +path = '../../versioned-store-permissions' + +[dev-dependencies.recurring_rewards] +default_features = false +package = 'substrate-recurring-reward-module' +path = '../../recurring-reward' \ No newline at end of file diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index d52594984a..ebacc066e5 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -5,6 +5,8 @@ //! - create_text_proposal //! - create_runtime_upgrade_proposal //! - create_set_election_parameters_proposal +//! - create_set_council_mint_capacity_proposal +//! - create_set_content_working_group_mint_capacity_proposal //! //! Proposal implementations of this module: //! - execute_text_proposal - prints the proposal to the log @@ -40,6 +42,7 @@ pub trait Trait: + membership::members::Trait + proposal_discussion::Trait + governance::election::Trait + + content_working_group::Trait { /// Defines max allowed text proposal length. type TextProposalMaxLength: Get; @@ -255,6 +258,33 @@ decl_module! { )?; } + /// Create 'Set content working group mint capacity' proposal type. + /// This proposal uses set_mint_capacity() extrinsic from the content-working-group module. + pub fn create_set_content_working_group_mint_capacity_proposal( + origin, + member_id: MemberId, + title: Vec, + description: Vec, + stake_balance: Option>, + mint_balance: BalanceOfMint, + ) { + let proposal_code = + >::set_mint_capacity(mint_balance); + + let proposal_parameters = + proposal_types::parameters::set_content_working_group_mint_capacity_proposal::(); + + Self::create_proposal( + origin, + member_id, + title, + description, + stake_balance, + proposal_code.encode(), + proposal_parameters, + )?; + } + // *************** Extrinsic to execute /// Text proposal extrinsic. Should be used as callable object to pass to the engine module. diff --git a/runtime-modules/proposals/codex/src/proposal_types/mod.rs b/runtime-modules/proposals/codex/src/proposal_types/mod.rs index 3184657512..155e2a76fa 100644 --- a/runtime-modules/proposals/codex/src/proposal_types/mod.rs +++ b/runtime-modules/proposals/codex/src/proposal_types/mod.rs @@ -56,4 +56,18 @@ pub(crate) mod parameters { required_stake: Some(>::from(500u32)), } } + + // Proposal parameters for the 'Set content working group mint capacity' proposal + pub(crate) fn set_content_working_group_mint_capacity_proposal( + ) -> ProposalParameters> { + ProposalParameters { + voting_period: T::BlockNumber::from(50000u32), + grace_period: T::BlockNumber::from(10000u32), + approval_quorum_percentage: 40, + approval_threshold_percentage: 51, + slashing_quorum_percentage: 81, + slashing_threshold_percentage: 85, + required_stake: Some(>::from(500u32)), + } + } } diff --git a/runtime-modules/proposals/codex/src/tests/mock.rs b/runtime-modules/proposals/codex/src/tests/mock.rs index 4f9b40d217..ce495fa6c7 100644 --- a/runtime-modules/proposals/codex/src/tests/mock.rs +++ b/runtime-modules/proposals/codex/src/tests/mock.rs @@ -160,6 +160,33 @@ impl governance::election::Trait for Test { type CouncilElected = (); } +impl content_working_group::Trait for Test { + type Event = (); +} + +impl recurring_rewards::Trait for Test { + type PayoutStatusHandler = (); + type RecipientId = u64; + type RewardRelationshipId = u64; +} + +impl versioned_store_permissions::Trait for Test { + type Credential = u64; + type CredentialChecker = (); + type CreateClassPermissionsChecker = (); +} + +impl versioned_store::Trait for Test { + type Event = (); +} + +impl hiring::Trait for Test { + type OpeningId = u64; + type ApplicationId = u64; + type ApplicationDeactivatedHandler = (); + type StakeHandlerProvider = hiring::Module; +} + impl crate::Trait for Test { type TextProposalMaxLength = TextProposalMaxLength; type RuntimeUpgradeWasmProposalMaxLength = RuntimeUpgradeWasmProposalMaxLength; diff --git a/runtime-modules/proposals/codex/src/tests/mod.rs b/runtime-modules/proposals/codex/src/tests/mod.rs index 4ba98783a6..06e5bbde45 100644 --- a/runtime-modules/proposals/codex/src/tests/mod.rs +++ b/runtime-modules/proposals/codex/src/tests/mod.rs @@ -7,28 +7,49 @@ use system::RawOrigin; use crate::{BalanceOf, Error}; use mock::*; +use proposal_engine::ProposalParameters; +use srml_support::dispatch::DispatchResult; + +struct ProposalTestFixture +where + InsufficientRightsCall: Fn() -> DispatchResult, + EmptyStakeCall: Fn() -> DispatchResult, + InvalidStakeCall: Fn() -> DispatchResult, + SuccessfulCall: Fn() -> DispatchResult, +{ + insufficient_rights_call: InsufficientRightsCall, + empty_stake_call: EmptyStakeCall, + invalid_stake_call: InvalidStakeCall, + successful_call: SuccessfulCall, + proposal_parameters: ProposalParameters, +} -#[test] -fn create_text_proposal_codex_call_succeeds() { - initial_test_ext().execute_with(|| { - let account_id = 1; - let proposer_id = 1; - let origin = RawOrigin::Signed(account_id).into(); - - let required_stake = Some(>::from(500u32)); - let _imbalance = ::Currency::deposit_creating(&account_id, 50000); +impl + ProposalTestFixture +where + InsufficientRightsCall: Fn() -> DispatchResult, + EmptyStakeCall: Fn() -> DispatchResult, + InvalidStakeCall: Fn() -> DispatchResult, + SuccessfulCall: Fn() -> DispatchResult, +{ + fn check_for_invalid_stakes(&self) { + assert_eq!((self.empty_stake_call)(), Err(Error::Other("EmptyStake"))); assert_eq!( - ProposalCodex::create_text_proposal( - origin, - proposer_id, - b"title".to_vec(), - b"body".to_vec(), - required_stake, - b"text".to_vec(), - ), - Ok(()) + (self.invalid_stake_call)(), + Err(Error::Other("StakeDiffersFromRequired")) ); + } + + fn check_call_for_insufficient_rights(&self) { + assert!((self.insufficient_rights_call)().is_err()); + } + + fn check_for_successful_call(&self) { + let account_id = 1; + let _imbalance = ::Currency::deposit_creating(&account_id, 50000); + + assert!((self.successful_call)().is_ok()); // a discussion was created let thread_id = >::get(1); @@ -37,41 +58,63 @@ fn create_text_proposal_codex_call_succeeds() { let proposal_id = 1; let proposal = ProposalsEngine::proposals(proposal_id); // check for correct proposal parameters - assert_eq!( - proposal.parameters, - crate::proposal_types::parameters::text_proposal::() - ); - }); + assert_eq!(proposal.parameters, self.proposal_parameters); + } + + pub fn check_all(&self) { + self.check_call_for_insufficient_rights(); + self.check_for_invalid_stakes(); + self.check_for_successful_call(); + } } #[test] -fn create_text_proposal_codex_call_fails_with_invalid_stake() { +fn create_text_proposal_common_checks_succeed() { initial_test_ext().execute_with(|| { - assert_eq!( - ProposalCodex::create_text_proposal( - RawOrigin::Signed(1).into(), - 1, - b"title".to_vec(), - b"body".to_vec(), - None, - b"text".to_vec(), - ), - Err(Error::Other("EmptyStake")) - ); - - let invalid_stake = Some(>::from(5000u32)); - - assert_eq!( - ProposalCodex::create_text_proposal( - RawOrigin::Signed(1).into(), - 1, - b"title".to_vec(), - b"body".to_vec(), - invalid_stake, - b"text".to_vec(), - ), - Err(Error::Other("StakeDiffersFromRequired")) - ); + let proposal_fixture = ProposalTestFixture { + insufficient_rights_call: || { + ProposalCodex::create_text_proposal( + RawOrigin::None.into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + None, + b"text".to_vec(), + ) + }, + empty_stake_call: || { + ProposalCodex::create_text_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + None, + b"text".to_vec(), + ) + }, + invalid_stake_call: || { + ProposalCodex::create_text_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + Some(>::from(5000u32)), + b"text".to_vec(), + ) + }, + successful_call: || { + ProposalCodex::create_text_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + Some(>::from(500u32)), + b"text".to_vec(), + ) + }, + proposal_parameters: crate::proposal_types::parameters::text_proposal::(), + }; + proposal_fixture.check_all(); }); } @@ -108,19 +151,52 @@ fn create_text_proposal_codex_call_fails_with_incorrect_text_size() { } #[test] -fn create_text_proposal_codex_call_fails_with_insufficient_rights() { +fn create_runtime_upgrade_common_checks_succeed() { initial_test_ext().execute_with(|| { - let origin = RawOrigin::None.into(); - - assert!(ProposalCodex::create_text_proposal( - origin, - 1, - b"title".to_vec(), - b"body".to_vec(), - None, - b"text".to_vec(), - ) - .is_err()); + let proposal_fixture = ProposalTestFixture { + insufficient_rights_call: || { + ProposalCodex::create_runtime_upgrade_proposal( + RawOrigin::None.into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + None, + b"wasm".to_vec(), + ) + }, + empty_stake_call: || { + ProposalCodex::create_runtime_upgrade_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + None, + b"wasm".to_vec(), + ) + }, + invalid_stake_call: || { + ProposalCodex::create_runtime_upgrade_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + Some(>::from(500u32)), + b"wasm".to_vec(), + ) + }, + successful_call: || { + ProposalCodex::create_runtime_upgrade_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + Some(>::from(50000u32)), + b"wasm".to_vec(), + ) + }, + proposal_parameters: crate::proposal_types::parameters::upgrade_runtime::(), + }; + proposal_fixture.check_all(); }); } @@ -157,135 +233,8 @@ fn create_upgrade_runtime_proposal_codex_call_fails_with_incorrect_wasm_size() { } #[test] -fn create_upgrade_runtime_proposal_codex_call_fails_with_insufficient_rights() { - initial_test_ext().execute_with(|| { - let origin = RawOrigin::None.into(); - - assert!(ProposalCodex::create_runtime_upgrade_proposal( - origin, - 1, - b"title".to_vec(), - b"body".to_vec(), - None, - b"wasm".to_vec(), - ) - .is_err()); - }); -} - -#[test] -fn create_runtime_upgrade_proposal_codex_call_fails_with_invalid_stake() { - initial_test_ext().execute_with(|| { - let proposer_id = 1; - assert_eq!( - ProposalCodex::create_runtime_upgrade_proposal( - RawOrigin::Signed(1).into(), - proposer_id, - b"title".to_vec(), - b"body".to_vec(), - None, - b"wasm".to_vec(), - ), - Err(Error::Other("EmptyStake")) - ); - - let invalid_stake = Some(>::from(500u32)); - - assert_eq!( - ProposalCodex::create_runtime_upgrade_proposal( - RawOrigin::Signed(1).into(), - proposer_id, - b"title".to_vec(), - b"body".to_vec(), - invalid_stake, - b"wasm".to_vec(), - ), - Err(Error::Other("StakeDiffersFromRequired")) - ); - }); -} - -#[test] -fn create_runtime_upgrade_proposal_codex_call_succeeds() { - initial_test_ext().execute_with(|| { - let account_id = 1; - let proposer_id = 1; - let origin = RawOrigin::Signed(account_id).into(); - - let required_stake = Some(>::from(50000u32)); - let _imbalance = ::Currency::deposit_creating(&account_id, 50000); - - assert_eq!( - ProposalCodex::create_runtime_upgrade_proposal( - origin, - proposer_id, - b"title".to_vec(), - b"body".to_vec(), - required_stake, - b"wasm".to_vec(), - ), - Ok(()) - ); - - // a discussion was created - let thread_id = >::get(1); - assert_eq!(thread_id, 1); - - let proposal_id = 1; - let proposal = ProposalsEngine::proposals(proposal_id); - // check for correct proposal parameters - assert_eq!( - proposal.parameters, - crate::proposal_types::parameters::upgrade_runtime::() - ); - }); -} - -#[test] -fn create_set_election_parameters_call_fails_with_insufficient_rights() { - initial_test_ext().execute_with(|| { - let origin = RawOrigin::None.into(); - - assert!(ProposalCodex::create_set_election_parameters_proposal( - origin, - 1, - b"title".to_vec(), - b"body".to_vec(), - None, - ElectionParameters::default(), - ) - .is_err()); - }); -} - -#[test] -fn create_set_election_parameters_call_fails_with_incorrect_parameters() { - initial_test_ext().execute_with(|| { - let account_id = 1; - let origin = RawOrigin::Signed(account_id).into(); - - let required_stake = Some(>::from(500u32)); - let _imbalance = ::Currency::deposit_creating(&account_id, 50000); - - assert_eq!( - ProposalCodex::create_set_election_parameters_proposal( - origin, - 1, - b"title".to_vec(), - b"body".to_vec(), - required_stake, - ElectionParameters::default(), - ), - Err(Error::Other("PeriodCannotBeZero")) - ); - }); -} - -#[test] -fn create_set_election_parameters_call_fails_with_invalid_stake() { +fn create_set_election_parameters_proposal_common_checks_succeed() { initial_test_ext().execute_with(|| { - let origin = RawOrigin::Signed(1).into(); - let election_parameters = ElectionParameters { announcing_period: 1, voting_period: 2, @@ -297,157 +246,171 @@ fn create_set_election_parameters_call_fails_with_invalid_stake() { new_term_duration: 8, }; - assert_eq!( - ProposalCodex::create_set_election_parameters_proposal( - origin, - 1, - b"title".to_vec(), - b"body".to_vec(), - None, - election_parameters.clone(), - ), - Err(Error::Other("EmptyStake")) - ); - - let invalid_stake = Some(>::from(5000u32)); - - assert_eq!( - ProposalCodex::create_set_election_parameters_proposal( - RawOrigin::Signed(1).into(), - 1, - b"title".to_vec(), - b"body".to_vec(), - invalid_stake, - election_parameters, - ), - Err(Error::Other("StakeDiffersFromRequired")) - ); - }); -} - -#[test] -fn create_set_election_parameters_call_succeeds() { - initial_test_ext().execute_with(|| { - let account_id = 1; - let origin = RawOrigin::Signed(account_id).into(); - - let required_stake = Some(>::from(500u32)); - let _imbalance = ::Currency::deposit_creating(&account_id, 50000); - - let election_parameters = ElectionParameters { - announcing_period: 1, - voting_period: 2, - revealing_period: 3, - council_size: 4, - candidacy_limit: 5, - min_voting_stake: 6, - min_council_stake: 7, - new_term_duration: 8, + let proposal_fixture = ProposalTestFixture { + insufficient_rights_call: || { + ProposalCodex::create_set_election_parameters_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + Some(>::from(500u32)), + ElectionParameters::default(), + ) + }, + empty_stake_call: || { + ProposalCodex::create_set_election_parameters_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + None, + election_parameters.clone(), + ) + }, + invalid_stake_call: || { + ProposalCodex::create_set_election_parameters_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + Some(>::from(50000u32)), + election_parameters.clone(), + ) + }, + successful_call: || { + ProposalCodex::create_set_election_parameters_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + Some(>::from(500u32)), + election_parameters.clone(), + ) + }, + proposal_parameters: + crate::proposal_types::parameters::set_election_parameters_proposal::(), }; - - assert!(ProposalCodex::create_set_election_parameters_proposal( - origin, - 1, - b"title".to_vec(), - b"body".to_vec(), - required_stake, - election_parameters, - ) - .is_ok()); - - // a discussion was created - let thread_id = >::get(1); - assert_eq!(thread_id, 1); - - let proposal_id = 1; - let proposal = ProposalsEngine::proposals(proposal_id); - // check for correct proposal parameters - assert_eq!( - proposal.parameters, - crate::proposal_types::parameters::set_election_parameters_proposal::() - ); + proposal_fixture.check_all(); }); } - #[test] -fn create_set_council_mint_call_succeeds() { +fn create_set_election_parameters_call_fails_with_incorrect_parameters() { initial_test_ext().execute_with(|| { let account_id = 1; - let origin = RawOrigin::Signed(account_id).into(); - let required_stake = Some(>::from(500u32)); let _imbalance = ::Currency::deposit_creating(&account_id, 50000); - assert!(ProposalCodex::create_set_council_mint_capacity_proposal( - origin, - 1, - b"title".to_vec(), - b"body".to_vec(), - required_stake, - 0, - ) - .is_ok()); - - // a discussion was created - let thread_id = >::get(1); - assert_eq!(thread_id, 1); - - let proposal_id = 1; - let proposal = ProposalsEngine::proposals(proposal_id); - // check for correct proposal parameters assert_eq!( - proposal.parameters, - crate::proposal_types::parameters::set_council_mint_capacity_proposal::() - ); - }); -} - -#[test] -fn create_set_council_mint_capacity_proposal_call_fails_with_invalid_stake() { - initial_test_ext().execute_with(|| { - let origin = RawOrigin::Signed(1).into(); - - assert_eq!( - ProposalCodex::create_set_council_mint_capacity_proposal( - origin, - 1, - b"title".to_vec(), - b"body".to_vec(), - None, - 0, - ), - Err(Error::Other("EmptyStake")) - ); - - let invalid_stake = Some(>::from(5000u32)); - - assert_eq!( - ProposalCodex::create_set_council_mint_capacity_proposal( + ProposalCodex::create_set_election_parameters_proposal( RawOrigin::Signed(1).into(), 1, b"title".to_vec(), b"body".to_vec(), - invalid_stake, - 0, + required_stake, + ElectionParameters::default(), ), - Err(Error::Other("StakeDiffersFromRequired")) + Err(Error::Other("PeriodCannotBeZero")) ); }); } #[test] -fn create_set_council_mint_capacity_proposal_call_fails_with_insufficient_rights() { +fn create_set_council_mint_capacity_proposal_common_checks_succeed() { initial_test_ext().execute_with(|| { - let origin = RawOrigin::None.into(); + let proposal_fixture = ProposalTestFixture { + insufficient_rights_call: || { + ProposalCodex::create_set_council_mint_capacity_proposal( + RawOrigin::None.into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + None, + 0, + ) + }, + empty_stake_call: || { + ProposalCodex::create_set_council_mint_capacity_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + None, + 0, + ) + }, + invalid_stake_call: || { + ProposalCodex::create_set_council_mint_capacity_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + Some(>::from(5000u32)), + 0, + ) + }, + successful_call: || { + ProposalCodex::create_set_council_mint_capacity_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + Some(>::from(500u32)), + 0, + ) + }, + proposal_parameters: + crate::proposal_types::parameters::set_council_mint_capacity_proposal::(), + }; + proposal_fixture.check_all(); + }); +} - assert!(ProposalCodex::create_set_council_mint_capacity_proposal( - origin, - 1, - b"title".to_vec(), - b"body".to_vec(), - None, - 0, - ) - .is_err()); +#[test] +fn create_set_content_working_group_mint_capacity_proposal_common_checks_succeed() { + initial_test_ext().execute_with(|| { + let proposal_fixture = ProposalTestFixture { + insufficient_rights_call: || { + ProposalCodex::create_set_content_working_group_mint_capacity_proposal( + RawOrigin::None.into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + None, + 0, + ) + }, + empty_stake_call: || { + ProposalCodex::create_set_content_working_group_mint_capacity_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + None, + 0, + ) + }, + invalid_stake_call: || { + ProposalCodex::create_set_content_working_group_mint_capacity_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + Some(>::from(5000u32)), + 0, + ) + }, + successful_call: || { + ProposalCodex::create_set_content_working_group_mint_capacity_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + Some(>::from(500u32)), + 0, + ) + }, + proposal_parameters: crate::proposal_types::parameters::set_content_working_group_mint_capacity_proposal::(), + }; + proposal_fixture.check_all(); }); } From 267b7c99fae89d4174963e7240977d761f7508c6 Mon Sep 17 00:00:00 2001 From: Gleb Urvanov Date: Tue, 31 Mar 2020 11:54:21 +0200 Subject: [PATCH 156/286] async nonce usage fix --- tests/src/utils/sender.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/src/utils/sender.ts b/tests/src/utils/sender.ts index 8069c4e334..5afbb0eae7 100644 --- a/tests/src/utils/sender.ts +++ b/tests/src/utils/sender.ts @@ -13,9 +13,13 @@ export class Sender { } private async getNonce(address: string): Promise { + let oncahinNonce: BN = new BN(0); + if (!this.nonceMap.get(address)) { + oncahinNonce = await this.api.query.system.accountNonce(address); + } let nonce: BN | undefined = this.nonceMap.get(address); if (!nonce) { - nonce = await this.api.query.system.accountNonce(address); + nonce = oncahinNonce; } const nextNonce: BN = nonce.addn(1); this.nonceMap.set(address, nextNonce); @@ -34,7 +38,6 @@ export class Sender { return new Promise(async (resolve, reject) => { const nonce: BN = await this.getNonce(account.address); const signedTx = tx.sign(account, { nonce }); - await signedTx .send(async result => { if (result.status.isFinalized === true && result.events !== undefined) { From 17ea5f1f0384a49a6194e64f42701e6ef15d90b6 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 31 Mar 2020 13:32:16 +0300 Subject: [PATCH 157/286] =?UTF-8?q?Add=20=E2=80=98spending=20proposal?= =?UTF-8?q?=E2=80=99=20extrinsic?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - add ‘spending proposal’ extrinsic to the codex module - add tests --- runtime-modules/proposals/codex/Cargo.toml | 4 +- runtime-modules/proposals/codex/src/lib.rs | 42 ++++++++++- .../proposals/codex/src/proposal_types/mod.rs | 14 ++++ .../proposals/codex/src/tests/mock.rs | 2 +- .../proposals/codex/src/tests/mod.rs | 74 ++++++++++++++++++- 5 files changed, 128 insertions(+), 8 deletions(-) diff --git a/runtime-modules/proposals/codex/Cargo.toml b/runtime-modules/proposals/codex/Cargo.toml index 47390bea5f..585007a018 100644 --- a/runtime-modules/proposals/codex/Cargo.toml +++ b/runtime-modules/proposals/codex/Cargo.toml @@ -12,7 +12,7 @@ std = [ 'rstd/std', 'srml-support/std', 'primitives/std', - 'runtime-primitives/std', + 'sr-primitives/std', 'system/std', 'timestamp/std', 'serde', @@ -53,7 +53,7 @@ git = 'https://github.com/paritytech/substrate.git' package = 'sr-std' rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' -[dependencies.runtime-primitives] +[dependencies.sr-primitives] default_features = false git = 'https://github.com/paritytech/substrate.git' package = 'sr-primitives' diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index ebacc066e5..16ddd3c87d 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -7,6 +7,7 @@ //! - create_set_election_parameters_proposal //! - create_set_council_mint_capacity_proposal //! - create_set_content_working_group_mint_capacity_proposal +//! - create_spending_proposal //! //! Proposal implementations of this module: //! - execute_text_proposal - prints the proposal to the log @@ -24,17 +25,17 @@ mod proposal_types; mod tests; use codec::Encode; +use common::origin_validator::ActorOriginValidator; +use governance::election_params::ElectionParameters; +use proposal_engine::ProposalParameters; use rstd::clone::Clone; use rstd::prelude::*; use rstd::str::from_utf8; use rstd::vec::Vec; +use sr_primitives::traits::Zero; use srml_support::{decl_error, decl_module, decl_storage, ensure, print}; use system::{ensure_root, RawOrigin}; -use common::origin_validator::ActorOriginValidator; -use governance::election_params::ElectionParameters; -use proposal_engine::ProposalParameters; - /// 'Proposals codex' substrate module Trait pub trait Trait: system::Trait @@ -94,6 +95,9 @@ decl_error! { /// Provided WASM code for the runtime upgrade proposal is empty RuntimeProposalIsEmpty, + /// Invalid balance value for the spending proposal + SpendingProposalZeroBalance, + /// Require root origin in extrinsics RequireRootOrigin, } @@ -285,6 +289,36 @@ decl_module! { )?; } + /// Create 'Spending' proposal type. + /// This proposal uses spend_from_council_mint() extrinsic from the governance::council module. + pub fn create_spending_proposal( + origin, + member_id: MemberId, + title: Vec, + description: Vec, + stake_balance: Option>, + balance: BalanceOfMint, + destination: T::AccountId, + ) { + ensure!(balance != BalanceOfMint::::zero(), Error::SpendingProposalZeroBalance); + + let proposal_code = + >::spend_from_council_mint(balance, destination); + + let proposal_parameters = + proposal_types::parameters::spending_proposal::(); + + Self::create_proposal( + origin, + member_id, + title, + description, + stake_balance, + proposal_code.encode(), + proposal_parameters, + )?; + } + // *************** Extrinsic to execute /// Text proposal extrinsic. Should be used as callable object to pass to the engine module. diff --git a/runtime-modules/proposals/codex/src/proposal_types/mod.rs b/runtime-modules/proposals/codex/src/proposal_types/mod.rs index 155e2a76fa..f731f10882 100644 --- a/runtime-modules/proposals/codex/src/proposal_types/mod.rs +++ b/runtime-modules/proposals/codex/src/proposal_types/mod.rs @@ -70,4 +70,18 @@ pub(crate) mod parameters { required_stake: Some(>::from(500u32)), } } + + // Proposal parameters for the 'Spending' proposal + pub(crate) fn spending_proposal( + ) -> ProposalParameters> { + ProposalParameters { + voting_period: T::BlockNumber::from(50000u32), + grace_period: T::BlockNumber::from(10000u32), + approval_quorum_percentage: 40, + approval_threshold_percentage: 51, + slashing_quorum_percentage: 84, + slashing_threshold_percentage: 85, + required_stake: Some(>::from(500u32)), + } + } } diff --git a/runtime-modules/proposals/codex/src/tests/mock.rs b/runtime-modules/proposals/codex/src/tests/mock.rs index ce495fa6c7..37a958aa68 100644 --- a/runtime-modules/proposals/codex/src/tests/mock.rs +++ b/runtime-modules/proposals/codex/src/tests/mock.rs @@ -3,7 +3,7 @@ pub use system; pub use primitives::{Blake2Hasher, H256}; -pub use runtime_primitives::{ +pub use sr_primitives::{ testing::{Digest, DigestItem, Header, UintAuthorityId}, traits::{BlakeTwo256, Convert, IdentityLookup, OnFinalize}, weights::Weight, diff --git a/runtime-modules/proposals/codex/src/tests/mod.rs b/runtime-modules/proposals/codex/src/tests/mod.rs index 06e5bbde45..487a375f0e 100644 --- a/runtime-modules/proposals/codex/src/tests/mod.rs +++ b/runtime-modules/proposals/codex/src/tests/mod.rs @@ -49,7 +49,7 @@ where let account_id = 1; let _imbalance = ::Currency::deposit_creating(&account_id, 50000); - assert!((self.successful_call)().is_ok()); + assert_eq!((self.successful_call)(), Ok(())); // a discussion was created let thread_id = >::get(1); @@ -414,3 +414,75 @@ fn create_set_content_working_group_mint_capacity_proposal_common_checks_succeed proposal_fixture.check_all(); }); } + +#[test] +fn create_spending_proposal_common_checks_succeed() { + initial_test_ext().execute_with(|| { + let proposal_fixture = ProposalTestFixture { + insufficient_rights_call: || { + ProposalCodex::create_spending_proposal( + RawOrigin::None.into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + None, + 20, + 10, + ) + }, + empty_stake_call: || { + ProposalCodex::create_spending_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + None, + 20, + 10, + ) + }, + invalid_stake_call: || { + ProposalCodex::create_spending_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + Some(>::from(5000u32)), + 20, + 10, + ) + }, + successful_call: || { + ProposalCodex::create_spending_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + Some(>::from(500u32)), + 100, + 2, + ) + }, + proposal_parameters: crate::proposal_types::parameters::spending_proposal::(), + }; + proposal_fixture.check_all(); + }); +} + +#[test] +fn create_spending_proposal_call_fails_with_incorrect_balance() { + initial_test_ext().execute_with(|| { + assert_eq!( + ProposalCodex::create_spending_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + Some(>::from(500u32)), + 0, + 2, + ), + Err(Error::SpendingProposalZeroBalance) + ); + }); +} From a7f8fa66dedf19b3ebd6dc8ed0c5b9ad1fd456ff Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 31 Mar 2020 15:39:35 +0300 Subject: [PATCH 158/286] =?UTF-8?q?Add=20=E2=80=98create=5Fset=5Flead=5Fpr?= =?UTF-8?q?oposal()=E2=80=99=20extrinsic?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - add ‘create_set_lead_proposal()’ extrinsic in the codex module - add tests --- runtime-modules/proposals/codex/src/lib.rs | 28 +++++++++++ .../proposals/codex/src/proposal_types/mod.rs | 14 ++++++ .../proposals/codex/src/tests/mod.rs | 50 +++++++++++++++++++ 3 files changed, 92 insertions(+) diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index 16ddd3c87d..1971270324 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -319,6 +319,34 @@ decl_module! { )?; } + + /// Create 'Set lead' proposal type. + /// This proposal uses replace_lead() extrinsic from the content_working_group module. + pub fn create_set_lead_proposal( + origin, + member_id: MemberId, + title: Vec, + description: Vec, + stake_balance: Option>, + new_lead: Option<(T::MemberId, T::AccountId)> + ) { + let proposal_code = + >::replace_lead(new_lead); + + let proposal_parameters = + proposal_types::parameters::set_lead_proposal::(); + + Self::create_proposal( + origin, + member_id, + title, + description, + stake_balance, + proposal_code.encode(), + proposal_parameters, + )?; + } + // *************** Extrinsic to execute /// Text proposal extrinsic. Should be used as callable object to pass to the engine module. diff --git a/runtime-modules/proposals/codex/src/proposal_types/mod.rs b/runtime-modules/proposals/codex/src/proposal_types/mod.rs index f731f10882..ee65d7af17 100644 --- a/runtime-modules/proposals/codex/src/proposal_types/mod.rs +++ b/runtime-modules/proposals/codex/src/proposal_types/mod.rs @@ -84,4 +84,18 @@ pub(crate) mod parameters { required_stake: Some(>::from(500u32)), } } + + // Proposal parameters for the 'Set lead' proposal + pub(crate) fn set_lead_proposal( + ) -> ProposalParameters> { + ProposalParameters { + voting_period: T::BlockNumber::from(50000u32), + grace_period: T::BlockNumber::from(10000u32), + approval_quorum_percentage: 40, + approval_threshold_percentage: 51, + slashing_quorum_percentage: 81, + slashing_threshold_percentage: 86, + required_stake: Some(>::from(500u32)), + } + } } diff --git a/runtime-modules/proposals/codex/src/tests/mod.rs b/runtime-modules/proposals/codex/src/tests/mod.rs index 487a375f0e..71d691ecd2 100644 --- a/runtime-modules/proposals/codex/src/tests/mod.rs +++ b/runtime-modules/proposals/codex/src/tests/mod.rs @@ -486,3 +486,53 @@ fn create_spending_proposal_call_fails_with_incorrect_balance() { ); }); } + +#[test] +fn create_set_lead_proposal_common_checks_succeed() { + initial_test_ext().execute_with(|| { + let proposal_fixture = ProposalTestFixture { + insufficient_rights_call: || { + ProposalCodex::create_set_lead_proposal( + RawOrigin::None.into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + None, + Some((20, 10)), + ) + }, + empty_stake_call: || { + ProposalCodex::create_set_lead_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + None, + Some((20, 10)), + ) + }, + invalid_stake_call: || { + ProposalCodex::create_set_lead_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + Some(>::from(5000u32)), + Some((20, 10)), + ) + }, + successful_call: || { + ProposalCodex::create_set_lead_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + Some(>::from(500u32)), + Some((20, 10)), + ) + }, + proposal_parameters: crate::proposal_types::parameters::set_lead_proposal::(), + }; + proposal_fixture.check_all(); + }); +} From 0044ee24530b47ad417d45fbf6dd10f488b2edd7 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 31 Mar 2020 20:02:33 +0300 Subject: [PATCH 159/286] Add comments for the codex module --- runtime-modules/proposals/codex/src/lib.rs | 79 ++++++++++++++-------- 1 file changed, 49 insertions(+), 30 deletions(-) diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index 1971270324..0ed555210e 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -1,18 +1,36 @@ -//! Proposals codex module for the Joystream platform. Version 2. -//! Contains preset proposal types. +//! # Proposals codex module +//! Proposals `codex` module for the Joystream platform. Version 2. +//! Component of the proposals system. Contains preset proposal types. //! -//! Supported extrinsics (proposal type): -//! - create_text_proposal -//! - create_runtime_upgrade_proposal -//! - create_set_election_parameters_proposal -//! - create_set_council_mint_capacity_proposal -//! - create_set_content_working_group_mint_capacity_proposal -//! - create_spending_proposal +//! ## Overview //! -//! Proposal implementations of this module: +//! The proposals codex module serves as facade and entry point of the proposals system. It uses +//! proposals `engine` module to maintain a lifecycle of the proposal and to execute proposals. +//! During the proposal creation `codex` also create a discussion thread using the `discussion` +//! proposals module. `Codex` uses predefined parameters (eg.:`voting_period`) for each proposal and +//! encodes extrinsic calls from dependency modules in order to create proposals inside the `engine` +//! module. +//! +//! ### Supported extrinsics (proposal types) +//! - [create_text_proposal](./struct.Module.html#method.create_text_proposal) +//! - [create_runtime_upgrade_proposal](./struct.Module.html#method.create_runtime_upgrade_proposal) +//! - [create_set_election_parameters_proposal](./struct.Module.html#method.create_set_election_parameters_proposal) +//! - [create_set_council_mint_capacity_proposal](./struct.Module.html#method.create_set_council_mint_capacity_proposal) +//! - [create_set_content_working_group_mint_capacity_proposal](./struct.Module.html#method.create_set_content_working_group_mint_capacity_proposal) +//! - [create_spending_proposal](./struct.Module.html#method.create_spending_proposal) +//! - [create_set_lead_proposal](./struct.Module.html#method.create_set_lead_proposal) +//! +//! ### Proposal implementations of this module //! - execute_text_proposal - prints the proposal to the log //! - execute_runtime_upgrade_proposal - sets the runtime code //! +//! ### Dependencies: +//! - [proposals engine](../substrate_proposals_engine_module/index.html) +//! - [proposals discussion](../substrate_proposals_discussion_module/index.html) +//! - [membership](../substrate_membership_module/index.html) +//! - [governance](../substrate_governance_module/index.html) +//! - [content_working_group](../substrate_content_working_group_module/index.html) +//! // Ensure we're `no_std` when compiling for Wasm. #![cfg_attr(not(feature = "std"), no_std)] @@ -33,6 +51,8 @@ use rstd::prelude::*; use rstd::str::from_utf8; use rstd::vec::Vec; use sr_primitives::traits::Zero; +use srml_support::dispatch::DispatchResult; +use srml_support::traits::{Currency, Get}; use srml_support::{decl_error, decl_module, decl_storage, ensure, print}; use system::{ensure_root, RawOrigin}; @@ -40,8 +60,8 @@ use system::{ensure_root, RawOrigin}; pub trait Trait: system::Trait + proposal_engine::Trait - + membership::members::Trait + proposal_discussion::Trait + + membership::members::Trait + governance::election::Trait + content_working_group::Trait { @@ -58,30 +78,29 @@ pub trait Trait: Self::AccountId, >; } -use srml_support::dispatch::DispatchResult; -use srml_support::traits::{Currency, Get}; -/// Balance alias +/// Balance alias for `stake` module pub type BalanceOf = <::Currency as Currency<::AccountId>>::Balance; -/// Balance alias for GovernanceCurrency from common module. TODO: replace with BalanceOf +/// Balance alias for GovernanceCurrency from `common` module. TODO: replace with BalanceOf pub type BalanceOfGovernanceCurrency = <::Currency as Currency< ::AccountId, >>::Balance; -/// Balance alias for token mint balance from token mint module. TODO: replace with BalanceOf +/// Balance alias for token mint balance from `token mint` module. TODO: replace with BalanceOf pub type BalanceOfMint = <::Currency as Currency<::AccountId>>::Balance; -/// Balance alias for staking +/// Negative imbalance alias for staking pub type NegativeImbalance = <::Currency as Currency<::AccountId>>::NegativeImbalance; type MemberId = ::MemberId; decl_error! { + /// Codex module predefined errors pub enum Error { /// The size of the provided text for text proposal exceeded the limit TextProposalSizeExceeded, @@ -143,12 +162,12 @@ decl_storage! { } decl_module! { - /// 'Proposal codex' substrate module + /// Proposal codex substrate module Call pub struct Module for enum Call where origin: T::Origin { /// Predefined errors type Error = Error; - /// Create text (signal) proposal type. + /// Create 'Text (signal)' proposal type. pub fn create_text_proposal( origin, member_id: MemberId, @@ -176,7 +195,7 @@ decl_module! { )?; } - /// Create runtime upgrade proposal type. + /// Create 'Runtime upgrade' proposal type. pub fn create_runtime_upgrade_proposal( origin, member_id: MemberId, @@ -205,8 +224,8 @@ decl_module! { )?; } - /// Create 'Set election parameters' proposal type. This proposal uses set_election_parameters() - /// extrinsic from the governance::election module. + /// Create 'Set election parameters' proposal type. This proposal uses `set_election_parameters()` + /// extrinsic from the `governance::election module`. pub fn create_set_election_parameters_proposal( origin, member_id: MemberId, @@ -235,8 +254,8 @@ decl_module! { } - /// Create 'Set council mint capacity' proposal type. This proposal uses set_mint_capacity() - /// extrinsic from the governance::council module. + /// Create 'Set council mint capacity' proposal type. This proposal uses `set_mint_capacity()` + /// extrinsic from the `governance::council` module. pub fn create_set_council_mint_capacity_proposal( origin, member_id: MemberId, @@ -263,7 +282,7 @@ decl_module! { } /// Create 'Set content working group mint capacity' proposal type. - /// This proposal uses set_mint_capacity() extrinsic from the content-working-group module. + /// This proposal uses `set_mint_capacity()` extrinsic from the `content-working-group` module. pub fn create_set_content_working_group_mint_capacity_proposal( origin, member_id: MemberId, @@ -290,7 +309,7 @@ decl_module! { } /// Create 'Spending' proposal type. - /// This proposal uses spend_from_council_mint() extrinsic from the governance::council module. + /// This proposal uses `spend_from_council_mint()` extrinsic from the `governance::council` module. pub fn create_spending_proposal( origin, member_id: MemberId, @@ -321,7 +340,7 @@ decl_module! { /// Create 'Set lead' proposal type. - /// This proposal uses replace_lead() extrinsic from the content_working_group module. + /// This proposal uses `replace_lead()` extrinsic from the `content_working_group` module. pub fn create_set_lead_proposal( origin, member_id: MemberId, @@ -349,7 +368,7 @@ decl_module! { // *************** Extrinsic to execute - /// Text proposal extrinsic. Should be used as callable object to pass to the engine module. + /// Text proposal extrinsic. Should be used as callable object to pass to the `engine` module. fn execute_text_proposal( origin, title: Vec, @@ -365,7 +384,7 @@ decl_module! { } /// Runtime upgrade proposal extrinsic. - /// Should be used as callable object to pass to the engine module. + /// Should be used as callable object to pass to the `engine` module. fn execute_runtime_upgrade_proposal( origin, title: Vec, @@ -406,7 +425,7 @@ impl Module { (cloned_origin1.into(), cloned_origin2.into()) } - /// Generic template proposal builder + // Generic template proposal builder fn create_proposal( origin: T::Origin, member_id: MemberId, From 61ff5f083b98eb46a66fe6963bd2fe2947992aa4 Mon Sep 17 00:00:00 2001 From: Gleb Urvanov Date: Wed, 1 Apr 2020 18:23:50 +0200 Subject: [PATCH 160/286] test scenario implementation started --- tests/.env | 6 + tests/package.json | 4 +- tests/src/tests/electingCouncilTest.ts | 39 ++++++ tests/src/tests/membershipCreationTest.ts | 148 ++++++++++++---------- tests/src/utils/apiWrapper.ts | 17 ++- 5 files changed, 142 insertions(+), 72 deletions(-) create mode 100644 tests/src/tests/electingCouncilTest.ts diff --git a/tests/.env b/tests/.env index 41f7f38c97..5dc96608e2 100644 --- a/tests/.env +++ b/tests/.env @@ -6,3 +6,9 @@ SUDO_ACCOUNT_URI = //Alice MEMBERSHIP_CREATION_N = 1 # ID of the membership paid terms used in membership creation test. MEMBERSHIP_PAID_TERMS = 0 +# Council stake amount for first K accounts in council election test. +COUNCIL_STAKE_GREATER_AMOUNT = 100 +# Council stake amount for first the rest participants in council election test. +COUNCIL_STAKE_LESSER_AMOUNT = 10 +# Number of members with greater stake in council election test. +COUNCIL_ELECTION_K = 1 \ No newline at end of file diff --git a/tests/package.json b/tests/package.json index 263cb01362..d04df9f9f9 100644 --- a/tests/package.json +++ b/tests/package.json @@ -14,12 +14,14 @@ "@polkadot/keyring": "^1.7.0-beta.5", "@types/bn.js": "^4.11.5", "bn.js": "^4.11.8", - "dotenv": "^8.2.0" + "dotenv": "^8.2.0", + "uuid": "^7.0.3" }, "devDependencies": { "@polkadot/ts": "^0.3.14", "@types/chai": "^4.2.11", "@types/mocha": "^7.0.2", + "@types/uuid": "^7.0.2", "chai": "^4.2.0", "mocha": "^7.1.1", "prettier": "2.0.2", diff --git a/tests/src/tests/electingCouncilTest.ts b/tests/src/tests/electingCouncilTest.ts new file mode 100644 index 0000000000..4f2b201e2c --- /dev/null +++ b/tests/src/tests/electingCouncilTest.ts @@ -0,0 +1,39 @@ +import { membershipTest } from './membershipCreationTest'; +import { KeyringPair } from '@polkadot/keyring/types'; +import { ApiWrapper } from '../utils/apiWrapper'; +import { WsProvider, Keyring } from '@polkadot/api'; +import { initConfig } from '../utils/config'; +import BN = require('bn.js'); +import { registerJoystreamTypes } from '@joystream/types'; + +describe('Council integration tests', () => { + initConfig(); + const keyring = new Keyring({ type: 'sr25519' }); + const nodeUrl: string = process.env.NODE_URL!; + const sudoUri: string = process.env.SUDO_ACCOUNT_URI!; + const K: number = +process.env.COUNCIL_ELECTION_K!; + const greaterStake: BN = new BN(+process.env.COUNCIL_STAKE_GREATER_AMOUNT!); + const lesserStake: BN = new BN(+process.env.COUNCIL_STAKE_LESSER_AMOUNT!); + const defaultTimeout: number = 30000; + let sudo: KeyringPair; + let apiWrapper: ApiWrapper; + let m1KeyPairs: KeyringPair[] = new Array(); + let m2KeyPairs: KeyringPair[] = new Array(); + + before(async function () { + this.timeout(defaultTimeout); + registerJoystreamTypes(); + m1KeyPairs = membershipTest(); + m2KeyPairs = membershipTest(); + const provider = new WsProvider(nodeUrl); + apiWrapper = await ApiWrapper.create(provider); + sudo = keyring.addFromUri(sudoUri); + const applyForCouncilFee: BN = apiWrapper.estimateApplyForCouncilFee(greaterStake); + await apiWrapper.transferBalanceToAccounts(sudo, m2KeyPairs, applyForCouncilFee); + }); + + it('Electing a council test', async () => { + apiWrapper.batchApplyForCouncilElection(m2KeyPairs.slice(0, K), greaterStake); + apiWrapper.batchApplyForCouncilElection(m2KeyPairs.slice(K), lesserStake); + }); +}); diff --git a/tests/src/tests/membershipCreationTest.ts b/tests/src/tests/membershipCreationTest.ts index d6e19c9d0a..ddab5473a3 100644 --- a/tests/src/tests/membershipCreationTest.ts +++ b/tests/src/tests/membershipCreationTest.ts @@ -6,82 +6,90 @@ import { KeyringPair } from '@polkadot/keyring/types'; import BN = require('bn.js'); import { ApiWrapper } from '../utils/apiWrapper'; import { initConfig } from '../utils/config'; +import { v4 as uuid } from 'uuid'; -describe('Membership integration tests', () => { - initConfig(); - const keyring = new Keyring({ type: 'sr25519' }); +export function membershipTest(): KeyringPair[] { const nKeyPairs: KeyringPair[] = new Array(); - const N: number = +process.env.MEMBERSHIP_CREATION_N!; - const paidTerms: number = +process.env.MEMBERSHIP_PAID_TERMS!; - const nodeUrl: string = process.env.NODE_URL!; - const sudoUri: string = process.env.SUDO_ACCOUNT_URI!; - const defaultTimeout: number = 30000; - let apiWrapper: ApiWrapper; - let sudo: KeyringPair; - let aKeyPair: KeyringPair; - let membershipFee: BN; - let membershipTransactionFee: BN; - before(async function () { - this.timeout(defaultTimeout); - registerJoystreamTypes(); - const provider = new WsProvider(nodeUrl); - apiWrapper = await ApiWrapper.create(provider); - sudo = keyring.addFromUri(sudoUri); - for (let i = 0; i < N; i++) { - nKeyPairs.push(keyring.addFromUri(i.toString())); - } - aKeyPair = keyring.addFromUri('A'); - membershipFee = await apiWrapper.getMembershipFee(paidTerms); - membershipTransactionFee = apiWrapper.estimateBuyMembershipFee( - sudo, - paidTerms, - 'member_name_which_is_longer_than_expected' - ); - await apiWrapper.transferBalanceToAccounts(sudo, nKeyPairs, membershipTransactionFee.add(new BN(membershipFee))); - await apiWrapper.transferBalance(sudo, aKeyPair.address, membershipTransactionFee); - }); - - it('Buy membeship is accepted with sufficient funds', async () => { - await Promise.all( - nKeyPairs.map(async (keyPair, index) => { - await apiWrapper.buyMembership(keyPair, paidTerms, `new_member_${index}`); - }) - ); - nKeyPairs.forEach((keyPair, index) => - apiWrapper - .getMembership(keyPair.address) - .then(membership => assert(!membership.isEmpty, `Account ${index} is not a member`)) - ); - }).timeout(defaultTimeout); + describe('Membership integration tests', () => { + initConfig(); + const keyring = new Keyring({ type: 'sr25519' }); + const N: number = +process.env.MEMBERSHIP_CREATION_N!; + const paidTerms: number = +process.env.MEMBERSHIP_PAID_TERMS!; + const nodeUrl: string = process.env.NODE_URL!; + const sudoUri: string = process.env.SUDO_ACCOUNT_URI!; + const defaultTimeout: number = 30000; + let apiWrapper: ApiWrapper; + let sudo: KeyringPair; + let aKeyPair: KeyringPair; + let membershipFee: BN; + let membershipTransactionFee: BN; - it('Account A can not buy the membership with insufficient funds', async () => { - apiWrapper - .getBalance(aKeyPair.address) - .then(balance => - assert( - balance.toBn() < membershipFee.add(membershipTransactionFee), - 'Account A already have sufficient balance to purchase membership' - ) + before(async function () { + this.timeout(defaultTimeout); + registerJoystreamTypes(); + const provider = new WsProvider(nodeUrl); + apiWrapper = await ApiWrapper.create(provider); + sudo = keyring.addFromUri(sudoUri); + for (let i = 0; i < N; i++) { + nKeyPairs.push(keyring.addFromUri(i + uuid().substring(0, 8))); + } + aKeyPair = keyring.addFromUri(uuid().substring(0, 8)); + membershipFee = await apiWrapper.getMembershipFee(paidTerms); + membershipTransactionFee = apiWrapper.estimateBuyMembershipFee( + sudo, + paidTerms, + 'member_name_which_is_longer_than_expected' ); - await apiWrapper.buyMembership(aKeyPair, paidTerms, 'late_member', true); - apiWrapper.getMembership(aKeyPair.address).then(membership => assert(membership.isEmpty, 'Account A is a member')); - }).timeout(defaultTimeout); + await apiWrapper.transferBalanceToAccounts(sudo, nKeyPairs, membershipTransactionFee.add(new BN(membershipFee))); + await apiWrapper.transferBalance(sudo, aKeyPair.address, membershipTransactionFee); + }); - it('Account A was able to buy the membership with insufficient funds', async () => { - await apiWrapper.transferBalance(sudo, aKeyPair.address, membershipFee.add(membershipTransactionFee)); - apiWrapper - .getBalance(aKeyPair.address) - .then(balance => - assert(balance.toBn() >= membershipFee, 'The account balance is insufficient to purchase membership') + it('Buy membeship is accepted with sufficient funds', async () => { + await Promise.all( + nKeyPairs.map(async (keyPair, index) => { + await apiWrapper.buyMembership(keyPair, paidTerms, `new_member_${index}${keyPair.address.substring(0, 8)}`); + }) ); - await apiWrapper.buyMembership(aKeyPair, paidTerms, 'late_member'); - apiWrapper - .getMembership(aKeyPair.address) - .then(membership => assert(!membership.isEmpty, 'Account A is a not member')); - }).timeout(defaultTimeout); + nKeyPairs.forEach((keyPair, index) => + apiWrapper + .getMembership(keyPair.address) + .then(membership => assert(!membership.isEmpty, `Account ${keyPair.address} is not a member`)) + ); + }).timeout(defaultTimeout); - after(() => { - apiWrapper.close(); + it('Account A can not buy the membership with insufficient funds', async () => { + apiWrapper + .getBalance(aKeyPair.address) + .then(balance => + assert( + balance.toBn() < membershipFee.add(membershipTransactionFee), + 'Account A already have sufficient balance to purchase membership' + ) + ); + await apiWrapper.buyMembership(aKeyPair, paidTerms, `late_member_${aKeyPair.address.substring(0, 8)}`, true); + apiWrapper + .getMembership(aKeyPair.address) + .then(membership => assert(membership.isEmpty, 'Account A is a member')); + }).timeout(defaultTimeout); + + it('Account A was able to buy the membership with sufficient funds', async () => { + await apiWrapper.transferBalance(sudo, aKeyPair.address, membershipFee.add(membershipTransactionFee)); + apiWrapper + .getBalance(aKeyPair.address) + .then(balance => + assert(balance.toBn() >= membershipFee, 'The account balance is insufficient to purchase membership') + ); + await apiWrapper.buyMembership(aKeyPair, paidTerms, `late_member_${aKeyPair.address.substring(0, 8)}`); + apiWrapper + .getMembership(aKeyPair.address) + .then(membership => assert(!membership.isEmpty, 'Account A is a not member')); + }).timeout(defaultTimeout); + + after(() => { + apiWrapper.close(); + }); }); -}); + + return nKeyPairs; +} diff --git a/tests/src/utils/apiWrapper.ts b/tests/src/utils/apiWrapper.ts index 452e0313cc..fe69d64150 100644 --- a/tests/src/utils/apiWrapper.ts +++ b/tests/src/utils/apiWrapper.ts @@ -78,9 +78,24 @@ export class ApiWrapper { } public estimateBuyMembershipFee(account: KeyringPair, paidTermsId: number, name: string): BN { - const nonce: BN = new BN(0); return this.estimateTxFee( this.api.tx.members.buyMembership(paidTermsId, new UserInfo({ handle: name, avatar_uri: '', about: '' })) ); } + + public estimateApplyForCouncilFee(amount: BN): BN { + return this.estimateTxFee(this.api.tx.councilElection.apply(amount)); + } + + private applyForCouncilElection(account: KeyringPair, amount: BN): Promise { + return this.sender.signAndSend(this.api.tx.councilElection.apply(amount), account, false); + } + + public batchApplyForCouncilElection(accounts: KeyringPair[], amount: BN): Promise { + return Promise.all( + accounts.map(async keyPair => { + await this.applyForCouncilElection(keyPair, amount); + }) + ); + } } From 4b709be667adcd96b443e690b5136843b8a878db Mon Sep 17 00:00:00 2001 From: Gleb Urvanov Date: Wed, 1 Apr 2020 18:25:57 +0200 Subject: [PATCH 161/286] api disconnected after the test --- tests/src/tests/electingCouncilTest.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/src/tests/electingCouncilTest.ts b/tests/src/tests/electingCouncilTest.ts index 4f2b201e2c..5a00b1d1c0 100644 --- a/tests/src/tests/electingCouncilTest.ts +++ b/tests/src/tests/electingCouncilTest.ts @@ -36,4 +36,8 @@ describe('Council integration tests', () => { apiWrapper.batchApplyForCouncilElection(m2KeyPairs.slice(0, K), greaterStake); apiWrapper.batchApplyForCouncilElection(m2KeyPairs.slice(K), lesserStake); }); + + after(() => { + apiWrapper.close(); + }); }); From 10e511a8a4adfc4e41e9fad9fd0888823f32dcf8 Mon Sep 17 00:00:00 2001 From: Gleb Urvanov Date: Thu, 2 Apr 2020 21:54:09 +0200 Subject: [PATCH 162/286] second scenario implementation, ongoing --- tests/.env | 4 +- tests/src/tests/electingCouncilTest.ts | 26 ++-- tests/src/tests/membershipCreationTest.ts | 151 +++++++++++----------- tests/src/utils/apiWrapper.ts | 8 ++ tests/src/utils/sender.ts | 10 +- 5 files changed, 107 insertions(+), 92 deletions(-) diff --git a/tests/.env b/tests/.env index 5dc96608e2..7005a4e515 100644 --- a/tests/.env +++ b/tests/.env @@ -7,8 +7,8 @@ MEMBERSHIP_CREATION_N = 1 # ID of the membership paid terms used in membership creation test. MEMBERSHIP_PAID_TERMS = 0 # Council stake amount for first K accounts in council election test. -COUNCIL_STAKE_GREATER_AMOUNT = 100 +COUNCIL_STAKE_GREATER_AMOUNT = 1500 # Council stake amount for first the rest participants in council election test. -COUNCIL_STAKE_LESSER_AMOUNT = 10 +COUNCIL_STAKE_LESSER_AMOUNT = 1000 # Number of members with greater stake in council election test. COUNCIL_ELECTION_K = 1 \ No newline at end of file diff --git a/tests/src/tests/electingCouncilTest.ts b/tests/src/tests/electingCouncilTest.ts index 5a00b1d1c0..9f6dfb5977 100644 --- a/tests/src/tests/electingCouncilTest.ts +++ b/tests/src/tests/electingCouncilTest.ts @@ -5,6 +5,7 @@ import { WsProvider, Keyring } from '@polkadot/api'; import { initConfig } from '../utils/config'; import BN = require('bn.js'); import { registerJoystreamTypes } from '@joystream/types'; +import { assert } from 'chai'; describe('Council integration tests', () => { initConfig(); @@ -23,19 +24,28 @@ describe('Council integration tests', () => { before(async function () { this.timeout(defaultTimeout); registerJoystreamTypes(); - m1KeyPairs = membershipTest(); - m2KeyPairs = membershipTest(); const provider = new WsProvider(nodeUrl); apiWrapper = await ApiWrapper.create(provider); - sudo = keyring.addFromUri(sudoUri); - const applyForCouncilFee: BN = apiWrapper.estimateApplyForCouncilFee(greaterStake); - await apiWrapper.transferBalanceToAccounts(sudo, m2KeyPairs, applyForCouncilFee); }); + membershipTest(m1KeyPairs); + membershipTest(m2KeyPairs); + it('Electing a council test', async () => { - apiWrapper.batchApplyForCouncilElection(m2KeyPairs.slice(0, K), greaterStake); - apiWrapper.batchApplyForCouncilElection(m2KeyPairs.slice(K), lesserStake); - }); + sudo = keyring.addFromUri(sudoUri); + const applyForCouncilFee: BN = apiWrapper.estimateApplyForCouncilFee(greaterStake); + await apiWrapper.transferBalanceToAccounts(sudo, m2KeyPairs, applyForCouncilFee.add(greaterStake)); + await apiWrapper.batchApplyForCouncilElection(m2KeyPairs.slice(0, K), greaterStake); + m2KeyPairs.forEach(keyPair => + apiWrapper.getCouncilElectionStake(keyPair.address).then(stake => { + assert( + stake.eq(greaterStake), + `${keyPair.address} not applied correctrly for council election with stake ${stake} versus expected ${greaterStake}` + ); + }) + ); + await apiWrapper.batchApplyForCouncilElection(m2KeyPairs.slice(K), lesserStake); + }).timeout(defaultTimeout); after(() => { apiWrapper.close(); diff --git a/tests/src/tests/membershipCreationTest.ts b/tests/src/tests/membershipCreationTest.ts index ddab5473a3..44bc18f6ac 100644 --- a/tests/src/tests/membershipCreationTest.ts +++ b/tests/src/tests/membershipCreationTest.ts @@ -8,88 +8,85 @@ import { ApiWrapper } from '../utils/apiWrapper'; import { initConfig } from '../utils/config'; import { v4 as uuid } from 'uuid'; -export function membershipTest(): KeyringPair[] { - const nKeyPairs: KeyringPair[] = new Array(); +export function membershipTest(nKeyPairs: KeyringPair[]) { + initConfig(); + const keyring = new Keyring({ type: 'sr25519' }); + const N: number = +process.env.MEMBERSHIP_CREATION_N!; + const paidTerms: number = +process.env.MEMBERSHIP_PAID_TERMS!; + const nodeUrl: string = process.env.NODE_URL!; + const sudoUri: string = process.env.SUDO_ACCOUNT_URI!; + const defaultTimeout: number = 30000; + let apiWrapper: ApiWrapper; + let sudo: KeyringPair; + let aKeyPair: KeyringPair; + let membershipFee: BN; + let membershipTransactionFee: BN; - describe('Membership integration tests', () => { - initConfig(); - const keyring = new Keyring({ type: 'sr25519' }); - const N: number = +process.env.MEMBERSHIP_CREATION_N!; - const paidTerms: number = +process.env.MEMBERSHIP_PAID_TERMS!; - const nodeUrl: string = process.env.NODE_URL!; - const sudoUri: string = process.env.SUDO_ACCOUNT_URI!; - const defaultTimeout: number = 30000; - let apiWrapper: ApiWrapper; - let sudo: KeyringPair; - let aKeyPair: KeyringPair; - let membershipFee: BN; - let membershipTransactionFee: BN; + before(async function () { + this.timeout(defaultTimeout); + registerJoystreamTypes(); + const provider = new WsProvider(nodeUrl); + apiWrapper = await ApiWrapper.create(provider); + sudo = keyring.addFromUri(sudoUri); + for (let i = 0; i < N; i++) { + nKeyPairs.push(keyring.addFromUri(i + uuid().substring(0, 8))); + } + aKeyPair = keyring.addFromUri(uuid().substring(0, 8)); + membershipFee = await apiWrapper.getMembershipFee(paidTerms); + membershipTransactionFee = apiWrapper.estimateBuyMembershipFee( + sudo, + paidTerms, + 'member_name_which_is_longer_than_expected' + ); + await apiWrapper.transferBalanceToAccounts(sudo, nKeyPairs, membershipTransactionFee.add(new BN(membershipFee))); + await apiWrapper.transferBalance(sudo, aKeyPair.address, membershipTransactionFee); + }); - before(async function () { - this.timeout(defaultTimeout); - registerJoystreamTypes(); - const provider = new WsProvider(nodeUrl); - apiWrapper = await ApiWrapper.create(provider); - sudo = keyring.addFromUri(sudoUri); - for (let i = 0; i < N; i++) { - nKeyPairs.push(keyring.addFromUri(i + uuid().substring(0, 8))); - } - aKeyPair = keyring.addFromUri(uuid().substring(0, 8)); - membershipFee = await apiWrapper.getMembershipFee(paidTerms); - membershipTransactionFee = apiWrapper.estimateBuyMembershipFee( - sudo, - paidTerms, - 'member_name_which_is_longer_than_expected' - ); - await apiWrapper.transferBalanceToAccounts(sudo, nKeyPairs, membershipTransactionFee.add(new BN(membershipFee))); - await apiWrapper.transferBalance(sudo, aKeyPair.address, membershipTransactionFee); - }); + it('Buy membeship is accepted with sufficient funds', async () => { + await Promise.all( + nKeyPairs.map(async (keyPair, index) => { + await apiWrapper.buyMembership(keyPair, paidTerms, `new_member_${index}${keyPair.address.substring(0, 8)}`); + }) + ); + nKeyPairs.forEach((keyPair, index) => + apiWrapper + .getMembership(keyPair.address) + .then(membership => assert(!membership.isEmpty, `Account ${keyPair.address} is not a member`)) + ); + }).timeout(defaultTimeout); - it('Buy membeship is accepted with sufficient funds', async () => { - await Promise.all( - nKeyPairs.map(async (keyPair, index) => { - await apiWrapper.buyMembership(keyPair, paidTerms, `new_member_${index}${keyPair.address.substring(0, 8)}`); - }) + it('Account A can not buy the membership with insufficient funds', async () => { + apiWrapper + .getBalance(aKeyPair.address) + .then(balance => + assert( + balance.toBn() < membershipFee.add(membershipTransactionFee), + 'Account A already have sufficient balance to purchase membership' + ) ); - nKeyPairs.forEach((keyPair, index) => - apiWrapper - .getMembership(keyPair.address) - .then(membership => assert(!membership.isEmpty, `Account ${keyPair.address} is not a member`)) - ); - }).timeout(defaultTimeout); - - it('Account A can not buy the membership with insufficient funds', async () => { - apiWrapper - .getBalance(aKeyPair.address) - .then(balance => - assert( - balance.toBn() < membershipFee.add(membershipTransactionFee), - 'Account A already have sufficient balance to purchase membership' - ) - ); - await apiWrapper.buyMembership(aKeyPair, paidTerms, `late_member_${aKeyPair.address.substring(0, 8)}`, true); - apiWrapper - .getMembership(aKeyPair.address) - .then(membership => assert(membership.isEmpty, 'Account A is a member')); - }).timeout(defaultTimeout); + await apiWrapper.buyMembership(aKeyPair, paidTerms, `late_member_${aKeyPair.address.substring(0, 8)}`, true); + apiWrapper.getMembership(aKeyPair.address).then(membership => assert(membership.isEmpty, 'Account A is a member')); + }).timeout(defaultTimeout); - it('Account A was able to buy the membership with sufficient funds', async () => { - await apiWrapper.transferBalance(sudo, aKeyPair.address, membershipFee.add(membershipTransactionFee)); - apiWrapper - .getBalance(aKeyPair.address) - .then(balance => - assert(balance.toBn() >= membershipFee, 'The account balance is insufficient to purchase membership') - ); - await apiWrapper.buyMembership(aKeyPair, paidTerms, `late_member_${aKeyPair.address.substring(0, 8)}`); - apiWrapper - .getMembership(aKeyPair.address) - .then(membership => assert(!membership.isEmpty, 'Account A is a not member')); - }).timeout(defaultTimeout); + it('Account A was able to buy the membership with sufficient funds', async () => { + await apiWrapper.transferBalance(sudo, aKeyPair.address, membershipFee.add(membershipTransactionFee)); + apiWrapper + .getBalance(aKeyPair.address) + .then(balance => + assert(balance.toBn() >= membershipFee, 'The account balance is insufficient to purchase membership') + ); + await apiWrapper.buyMembership(aKeyPair, paidTerms, `late_member_${aKeyPair.address.substring(0, 8)}`); + apiWrapper + .getMembership(aKeyPair.address) + .then(membership => assert(!membership.isEmpty, 'Account A is a not member')); + }).timeout(defaultTimeout); - after(() => { - apiWrapper.close(); - }); + after(() => { + apiWrapper.close(); }); - - return nKeyPairs; } + +describe.skip('Membership integration tests', () => { + const nKeyPairs: KeyringPair[] = new Array(); + membershipTest(nKeyPairs); +}); diff --git a/tests/src/utils/apiWrapper.ts b/tests/src/utils/apiWrapper.ts index fe69d64150..c6b2d0ee7c 100644 --- a/tests/src/utils/apiWrapper.ts +++ b/tests/src/utils/apiWrapper.ts @@ -98,4 +98,12 @@ export class ApiWrapper { }) ); } + + public async getCouncilElectionStake(address: string): Promise { + //TODO alter then `applicantStake` type will be introduced + return this.api.query.councilElection.applicantStakes(address).then(stake => { + const parsed = JSON.parse(stake.toString()); + return new BN(parsed.new); + }); + } } diff --git a/tests/src/utils/sender.ts b/tests/src/utils/sender.ts index 5afbb0eae7..1d47d9ff3c 100644 --- a/tests/src/utils/sender.ts +++ b/tests/src/utils/sender.ts @@ -6,7 +6,7 @@ import { KeyringPair } from '@polkadot/keyring/types'; export class Sender { private readonly api: ApiPromise; - private nonceMap: Map = new Map(); + private static nonceMap: Map = new Map(); constructor(api: ApiPromise) { this.api = api; @@ -14,20 +14,20 @@ export class Sender { private async getNonce(address: string): Promise { let oncahinNonce: BN = new BN(0); - if (!this.nonceMap.get(address)) { + if (!Sender.nonceMap.get(address)) { oncahinNonce = await this.api.query.system.accountNonce(address); } - let nonce: BN | undefined = this.nonceMap.get(address); + let nonce: BN | undefined = Sender.nonceMap.get(address); if (!nonce) { nonce = oncahinNonce; } const nextNonce: BN = nonce.addn(1); - this.nonceMap.set(address, nextNonce); + Sender.nonceMap.set(address, nextNonce); return nonce; } private clearNonce(address: string): void { - this.nonceMap.delete(address); + Sender.nonceMap.delete(address); } public async signAndSend( From a7c19f4aed8832966af9045236b8745dd5f02453 Mon Sep 17 00:00:00 2001 From: Gleb Urvanov Date: Fri, 3 Apr 2020 18:20:28 +0200 Subject: [PATCH 163/286] testing scenario implementation --- tests/src/tests/electingCouncilTest.ts | 17 +++++- tests/src/utils/apiWrapper.ts | 74 ++++++++++++++++++++++++++ tests/src/utils/utils.ts | 17 +++++- 3 files changed, 106 insertions(+), 2 deletions(-) diff --git a/tests/src/tests/electingCouncilTest.ts b/tests/src/tests/electingCouncilTest.ts index 9f6dfb5977..9b4c1b417a 100644 --- a/tests/src/tests/electingCouncilTest.ts +++ b/tests/src/tests/electingCouncilTest.ts @@ -15,7 +15,7 @@ describe('Council integration tests', () => { const K: number = +process.env.COUNCIL_ELECTION_K!; const greaterStake: BN = new BN(+process.env.COUNCIL_STAKE_GREATER_AMOUNT!); const lesserStake: BN = new BN(+process.env.COUNCIL_STAKE_LESSER_AMOUNT!); - const defaultTimeout: number = 30000; + const defaultTimeout: number = 120000; let sudo: KeyringPair; let apiWrapper: ApiWrapper; let m1KeyPairs: KeyringPair[] = new Array(); @@ -33,8 +33,13 @@ describe('Council integration tests', () => { it('Electing a council test', async () => { sudo = keyring.addFromUri(sudoUri); + let now = await apiWrapper.getBestBlock(); + await apiWrapper.sudoStartAnnouncingPerion(sudo, now.addn(100)); const applyForCouncilFee: BN = apiWrapper.estimateApplyForCouncilFee(greaterStake); + const voteForCouncilFee: BN = apiWrapper.estimateVoteForCouncilFee(sudo.address, sudo.address, greaterStake); + const revealVoteFee: BN = apiWrapper.estimateRevealVoteFee(sudo.address, sudo.address); await apiWrapper.transferBalanceToAccounts(sudo, m2KeyPairs, applyForCouncilFee.add(greaterStake)); + await apiWrapper.transferBalanceToAccounts(sudo, m1KeyPairs, voteForCouncilFee.add(new BN(300)).add(greaterStake)); await apiWrapper.batchApplyForCouncilElection(m2KeyPairs.slice(0, K), greaterStake); m2KeyPairs.forEach(keyPair => apiWrapper.getCouncilElectionStake(keyPair.address).then(stake => { @@ -45,6 +50,16 @@ describe('Council integration tests', () => { }) ); await apiWrapper.batchApplyForCouncilElection(m2KeyPairs.slice(K), lesserStake); + await apiWrapper.sudoStartVotingPerion(sudo, new BN(1000)); + await apiWrapper.batchVoteForCouncilMember(m1KeyPairs.slice(0, K), m2KeyPairs.slice(0, K), lesserStake); + await apiWrapper.batchVoteForCouncilMember(m1KeyPairs.slice(K), m2KeyPairs.slice(K), greaterStake); + await apiWrapper.sudoStartRevealingPerion(sudo, now.addn(100)); + console.log('going to reveal votes'); + //await apiWrapper.batchRevealVote(m1KeyPairs.slice(0, K), m2KeyPairs.slice(0, K)); + //await apiWrapper.batchRevealVote(m1KeyPairs.slice(K), m2KeyPairs.slice(K)); + now = await apiWrapper.getBestBlock(); + console.log('now ' + now); + await apiWrapper.sudoStartRevealingPerion(sudo, now.addn(2)); }).timeout(defaultTimeout); after(() => { diff --git a/tests/src/utils/apiWrapper.ts b/tests/src/utils/apiWrapper.ts index c6b2d0ee7c..d5be4d4e1b 100644 --- a/tests/src/utils/apiWrapper.ts +++ b/tests/src/utils/apiWrapper.ts @@ -1,4 +1,5 @@ import { ApiPromise, WsProvider } from '@polkadot/api'; +import { stringToU8a } from '@polkadot/util'; import { Option } from '@polkadot/types'; import { KeyringPair } from '@polkadot/keyring/types'; import { UserInfo, PaidMembershipTerms } from '@joystream/types/lib/members'; @@ -87,6 +88,17 @@ export class ApiWrapper { return this.estimateTxFee(this.api.tx.councilElection.apply(amount)); } + public estimateVoteForCouncilFee(nominee: string, salt: string, stake: BN): BN { + const hashedVote: string = Utils.hashVote(nominee, salt); + console.log('estimation nominee ' + nominee + ' salt ' + salt + ' hashed ' + hashedVote); + return this.estimateTxFee(this.api.tx.councilElection.vote(hashedVote, stake)); + } + + public estimateRevealVoteFee(nominee: string, salt: string): BN { + const hashedVote: string = Utils.hashVote(nominee, salt); + return this.estimateTxFee(this.api.tx.councilElection.reveal(hashedVote, nominee, stringToU8a(salt))); + } + private applyForCouncilElection(account: KeyringPair, amount: BN): Promise { return this.sender.signAndSend(this.api.tx.councilElection.apply(amount), account, false); } @@ -106,4 +118,66 @@ export class ApiWrapper { return new BN(parsed.new); }); } + + private voteForCouncilMember(account: KeyringPair, nominee: string, salt: string, stake: BN): Promise { + const hashedVote: string = Utils.hashVote(nominee, salt); + console.log('nominee ' + nominee + ' salt ' + salt + ' hashed ' + hashedVote); + return this.sender.signAndSend(this.api.tx.councilElection.vote(hashedVote, stake), account, false); + } + + //TODO alter method signature for better testing + public batchVoteForCouncilMember(accounts: KeyringPair[], nominees: KeyringPair[], stake: BN): Promise { + return Promise.all( + accounts.map(async (keyPair, index) => { + await this.voteForCouncilMember(keyPair, nominees[index].address, nominees[index].address, stake); + }) + ); + } + + private revealVote(account: KeyringPair, commitment: string, nominee: string, salt: string): Promise { + console.log('commitment to reveal ' + commitment); + return this.sender.signAndSend( + this.api.tx.councilElection.reveal(commitment, nominee, stringToU8a(salt)), + account, + false + ); + } + + public batchRevealVote(accounts: KeyringPair[], nominees: KeyringPair[]): Promise { + return Promise.all( + accounts.map(async (keyPair, index) => { + const commitment = Utils.hashVote(nominees[index].address, nominees[index].address); + await this.revealVote(keyPair, commitment, nominees[index].address, nominees[index].address); + }) + ); + } + + //TODO consider using configurable genesis instead + public sudoStartAnnouncingPerion(sudo: KeyringPair, endsAtBlock: BN): Promise { + return this.sender.signAndSend( + this.api.tx.sudo.sudo(this.api.tx.councilElection.setStageAnnouncing(endsAtBlock)), + sudo, + false + ); + } + + public sudoStartVotingPerion(sudo: KeyringPair, endsAtBlock: BN): Promise { + return this.sender.signAndSend( + this.api.tx.sudo.sudo(this.api.tx.councilElection.setStageVoting(endsAtBlock)), + sudo, + false + ); + } + + public sudoStartRevealingPerion(sudo: KeyringPair, endsAtBlock: BN): Promise { + return this.sender.signAndSend( + this.api.tx.sudo.sudo(this.api.tx.councilElection.setStageRevealing(endsAtBlock)), + sudo, + false + ); + } + + public getBestBlock(): Promise { + return this.api.derive.chain.bestNumber(); + } } diff --git a/tests/src/utils/utils.ts b/tests/src/utils/utils.ts index 5e07a795bc..e8433d70cf 100644 --- a/tests/src/utils/utils.ts +++ b/tests/src/utils/utils.ts @@ -1,6 +1,8 @@ import { IExtrinsic } from '@polkadot/types/types'; -import { compactToU8a } from '@polkadot/util'; +import { compactToU8a, stringToU8a } from '@polkadot/util'; +import { blake2AsHex } from '@polkadot/util-crypto'; import BN = require('bn.js'); +import { decodeAddress } from '@polkadot/keyring'; export class Utils { private static LENGTH_ADDRESS = 32 + 1; // publicKey + prefix @@ -18,4 +20,17 @@ export class Utils { (extrinsic ? extrinsic.encodedLength : 0) ); }; + + /** hash(accountId + salt) */ + public static hashVote = (accountId: string, salt: string): string => { + const accountU8a = decodeAddress(accountId); + const saltU8a = stringToU8a(salt); + const voteU8a = new Uint8Array(accountU8a.length + saltU8a.length); + voteU8a.set(accountU8a); + voteU8a.set(saltU8a, accountU8a.length); + + const hash = blake2AsHex(voteU8a, 256); + // console.log('Vote hash:', hash, 'for', { accountId, salt }); + return hash; + }; } From a2b6f0cb3ed472f3da261d8d775b20e3119a1b24 Mon Sep 17 00:00:00 2001 From: Gleb Urvanov Date: Fri, 3 Apr 2020 23:07:49 +0200 Subject: [PATCH 164/286] assertions implementation --- tests/src/tests/electingCouncilTest.ts | 53 +++++++++++++++++++++----- tests/src/utils/apiWrapper.ts | 36 ++++++++--------- tests/src/utils/utils.ts | 13 ++++++- 3 files changed, 73 insertions(+), 29 deletions(-) diff --git a/tests/src/tests/electingCouncilTest.ts b/tests/src/tests/electingCouncilTest.ts index 9b4c1b417a..502e2ed58e 100644 --- a/tests/src/tests/electingCouncilTest.ts +++ b/tests/src/tests/electingCouncilTest.ts @@ -2,10 +2,13 @@ import { membershipTest } from './membershipCreationTest'; import { KeyringPair } from '@polkadot/keyring/types'; import { ApiWrapper } from '../utils/apiWrapper'; import { WsProvider, Keyring } from '@polkadot/api'; +import { stringToU8a } from '@polkadot/util'; import { initConfig } from '../utils/config'; import BN = require('bn.js'); -import { registerJoystreamTypes } from '@joystream/types'; +import { registerJoystreamTypes, Seat } from '@joystream/types'; import { assert } from 'chai'; +import { v4 as uuid } from 'uuid'; +import { Utils } from '../utils/utils'; describe('Council integration tests', () => { initConfig(); @@ -37,9 +40,17 @@ describe('Council integration tests', () => { await apiWrapper.sudoStartAnnouncingPerion(sudo, now.addn(100)); const applyForCouncilFee: BN = apiWrapper.estimateApplyForCouncilFee(greaterStake); const voteForCouncilFee: BN = apiWrapper.estimateVoteForCouncilFee(sudo.address, sudo.address, greaterStake); - const revealVoteFee: BN = apiWrapper.estimateRevealVoteFee(sudo.address, sudo.address); + let salt: string[] = new Array(); + m1KeyPairs.forEach(() => { + salt.push(''.concat(uuid().replace(/-/g, ''))); + }); + const revealVoteFee: BN = apiWrapper.estimateRevealVoteFee(sudo.address, salt[0]); await apiWrapper.transferBalanceToAccounts(sudo, m2KeyPairs, applyForCouncilFee.add(greaterStake)); - await apiWrapper.transferBalanceToAccounts(sudo, m1KeyPairs, voteForCouncilFee.add(new BN(300)).add(greaterStake)); + await apiWrapper.transferBalanceToAccounts( + sudo, + m1KeyPairs, + voteForCouncilFee.add(revealVoteFee).add(greaterStake) + ); await apiWrapper.batchApplyForCouncilElection(m2KeyPairs.slice(0, K), greaterStake); m2KeyPairs.forEach(keyPair => apiWrapper.getCouncilElectionStake(keyPair.address).then(stake => { @@ -50,16 +61,38 @@ describe('Council integration tests', () => { }) ); await apiWrapper.batchApplyForCouncilElection(m2KeyPairs.slice(K), lesserStake); - await apiWrapper.sudoStartVotingPerion(sudo, new BN(1000)); - await apiWrapper.batchVoteForCouncilMember(m1KeyPairs.slice(0, K), m2KeyPairs.slice(0, K), lesserStake); - await apiWrapper.batchVoteForCouncilMember(m1KeyPairs.slice(K), m2KeyPairs.slice(K), greaterStake); + await apiWrapper.sudoStartVotingPerion(sudo, now.addn(100)); + await apiWrapper.batchVoteForCouncilMember( + m1KeyPairs.slice(0, K), + m2KeyPairs.slice(0, K), + salt.slice(0, K), + lesserStake + ); + await apiWrapper.batchVoteForCouncilMember(m1KeyPairs.slice(K), m2KeyPairs.slice(K), salt.slice(K), greaterStake); await apiWrapper.sudoStartRevealingPerion(sudo, now.addn(100)); - console.log('going to reveal votes'); - //await apiWrapper.batchRevealVote(m1KeyPairs.slice(0, K), m2KeyPairs.slice(0, K)); - //await apiWrapper.batchRevealVote(m1KeyPairs.slice(K), m2KeyPairs.slice(K)); + await apiWrapper.batchRevealVote(m1KeyPairs.slice(0, K), m2KeyPairs.slice(0, K), salt.slice(0, K)); + await apiWrapper.batchRevealVote(m1KeyPairs.slice(K), m2KeyPairs.slice(K), salt.slice(K)); now = await apiWrapper.getBestBlock(); - console.log('now ' + now); await apiWrapper.sudoStartRevealingPerion(sudo, now.addn(2)); + //TODO get duration from chain + await Utils.wait(6000); + let seats: Seat[] = await apiWrapper.getCouncil(); + console.log(seats.toString()); + const m2addresses: string[] = m2KeyPairs.map(keyPair => keyPair.address); + const m1addresses: string[] = m1KeyPairs.map(keyPair => keyPair.address); + const members: string[] = seats.map(seat => seat.member.toString()); + const bakers: string[] = seats.reduce( + (array, seat) => array.concat(seat.backers.map(baker => baker.member.toString())), + new Array() + ); + m2addresses.forEach(address => assert(members.includes(address), `Account ${address} is not in the council`)); + m1addresses.forEach(address => assert(bakers.includes(address), `Account ${address} is not in the voters`)); + seats.forEach(seat => + assert( + Utils.getTotalStake(seat).eq(greaterStake.add(lesserStake)), + `Member ${seat.member} has unexpected stake ${Utils.getTotalStake(seat)}` + ) + ); }).timeout(defaultTimeout); after(() => { diff --git a/tests/src/utils/apiWrapper.ts b/tests/src/utils/apiWrapper.ts index d5be4d4e1b..a349462d79 100644 --- a/tests/src/utils/apiWrapper.ts +++ b/tests/src/utils/apiWrapper.ts @@ -1,8 +1,9 @@ import { ApiPromise, WsProvider } from '@polkadot/api'; -import { stringToU8a } from '@polkadot/util'; -import { Option } from '@polkadot/types'; +import { Option, Vec } from '@polkadot/types'; +import { Codec } from '@polkadot/types/types'; import { KeyringPair } from '@polkadot/keyring/types'; import { UserInfo, PaidMembershipTerms } from '@joystream/types/lib/members'; +import { Seat } from '@joystream/types'; import { Balance } from '@polkadot/types/interfaces'; import BN = require('bn.js'); import { SubmittableExtrinsic } from '@polkadot/api/types'; @@ -90,13 +91,12 @@ export class ApiWrapper { public estimateVoteForCouncilFee(nominee: string, salt: string, stake: BN): BN { const hashedVote: string = Utils.hashVote(nominee, salt); - console.log('estimation nominee ' + nominee + ' salt ' + salt + ' hashed ' + hashedVote); return this.estimateTxFee(this.api.tx.councilElection.vote(hashedVote, stake)); } public estimateRevealVoteFee(nominee: string, salt: string): BN { const hashedVote: string = Utils.hashVote(nominee, salt); - return this.estimateTxFee(this.api.tx.councilElection.reveal(hashedVote, nominee, stringToU8a(salt))); + return this.estimateTxFee(this.api.tx.councilElection.reveal(hashedVote, nominee, salt)); } private applyForCouncilElection(account: KeyringPair, amount: BN): Promise { @@ -121,33 +121,31 @@ export class ApiWrapper { private voteForCouncilMember(account: KeyringPair, nominee: string, salt: string, stake: BN): Promise { const hashedVote: string = Utils.hashVote(nominee, salt); - console.log('nominee ' + nominee + ' salt ' + salt + ' hashed ' + hashedVote); return this.sender.signAndSend(this.api.tx.councilElection.vote(hashedVote, stake), account, false); } - //TODO alter method signature for better testing - public batchVoteForCouncilMember(accounts: KeyringPair[], nominees: KeyringPair[], stake: BN): Promise { + public batchVoteForCouncilMember( + accounts: KeyringPair[], + nominees: KeyringPair[], + salt: string[], + stake: BN + ): Promise { return Promise.all( accounts.map(async (keyPair, index) => { - await this.voteForCouncilMember(keyPair, nominees[index].address, nominees[index].address, stake); + await this.voteForCouncilMember(keyPair, nominees[index].address, salt[index], stake); }) ); } private revealVote(account: KeyringPair, commitment: string, nominee: string, salt: string): Promise { - console.log('commitment to reveal ' + commitment); - return this.sender.signAndSend( - this.api.tx.councilElection.reveal(commitment, nominee, stringToU8a(salt)), - account, - false - ); + return this.sender.signAndSend(this.api.tx.councilElection.reveal(commitment, nominee, salt), account, false); } - public batchRevealVote(accounts: KeyringPair[], nominees: KeyringPair[]): Promise { + public batchRevealVote(accounts: KeyringPair[], nominees: KeyringPair[], salt: string[]): Promise { return Promise.all( accounts.map(async (keyPair, index) => { - const commitment = Utils.hashVote(nominees[index].address, nominees[index].address); - await this.revealVote(keyPair, commitment, nominees[index].address, nominees[index].address); + const commitment = Utils.hashVote(nominees[index].address, salt[index]); + await this.revealVote(keyPair, commitment, nominees[index].address, salt[index]); }) ); } @@ -180,4 +178,8 @@ export class ApiWrapper { public getBestBlock(): Promise { return this.api.derive.chain.bestNumber(); } + + public getCouncil(): Promise { + return this.api.query.council.activeCouncil>().then(seats => JSON.parse(seats.toString())); + } } diff --git a/tests/src/utils/utils.ts b/tests/src/utils/utils.ts index e8433d70cf..b8562c947e 100644 --- a/tests/src/utils/utils.ts +++ b/tests/src/utils/utils.ts @@ -3,6 +3,7 @@ import { compactToU8a, stringToU8a } from '@polkadot/util'; import { blake2AsHex } from '@polkadot/util-crypto'; import BN = require('bn.js'); import { decodeAddress } from '@polkadot/keyring'; +import { Seat } from '@joystream/types'; export class Utils { private static LENGTH_ADDRESS = 32 + 1; // publicKey + prefix @@ -22,7 +23,7 @@ export class Utils { }; /** hash(accountId + salt) */ - public static hashVote = (accountId: string, salt: string): string => { + public static hashVote(accountId: string, salt: string): string { const accountU8a = decodeAddress(accountId); const saltU8a = stringToU8a(salt); const voteU8a = new Uint8Array(accountU8a.length + saltU8a.length); @@ -32,5 +33,13 @@ export class Utils { const hash = blake2AsHex(voteU8a, 256); // console.log('Vote hash:', hash, 'for', { accountId, salt }); return hash; - }; + } + + public static wait(ms: number): Promise { + return new Promise(resolve => setTimeout(resolve, ms)); + } + + public static getTotalStake(seat: Seat): BN { + return seat.stake.toBn().add(seat.backers.reduce((a, baker) => a.add(baker.stake.toBn()), new BN(0))); + } } From 988ebfa90272fe8fee2de3163cf3f95be63fb698 Mon Sep 17 00:00:00 2001 From: Gleb Urvanov Date: Fri, 3 Apr 2020 23:27:51 +0200 Subject: [PATCH 165/286] assertions added --- tests/src/tests/electingCouncilTest.ts | 1 - tests/src/utils/apiWrapper.ts | 5 ++++- tests/src/utils/utils.ts | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/src/tests/electingCouncilTest.ts b/tests/src/tests/electingCouncilTest.ts index 502e2ed58e..77bb0012d3 100644 --- a/tests/src/tests/electingCouncilTest.ts +++ b/tests/src/tests/electingCouncilTest.ts @@ -77,7 +77,6 @@ describe('Council integration tests', () => { //TODO get duration from chain await Utils.wait(6000); let seats: Seat[] = await apiWrapper.getCouncil(); - console.log(seats.toString()); const m2addresses: string[] = m2KeyPairs.map(keyPair => keyPair.address); const m1addresses: string[] = m1KeyPairs.map(keyPair => keyPair.address); const members: string[] = seats.map(seat => seat.member.toString()); diff --git a/tests/src/utils/apiWrapper.ts b/tests/src/utils/apiWrapper.ts index a349462d79..c891e50dbb 100644 --- a/tests/src/utils/apiWrapper.ts +++ b/tests/src/utils/apiWrapper.ts @@ -180,6 +180,9 @@ export class ApiWrapper { } public getCouncil(): Promise { - return this.api.query.council.activeCouncil>().then(seats => JSON.parse(seats.toString())); + return this.api.query.council.activeCouncil>().then(seats => { + console.log('elected council ' + seats.toString()); + return JSON.parse(seats.toString()); + }); } } diff --git a/tests/src/utils/utils.ts b/tests/src/utils/utils.ts index b8562c947e..9f162cd445 100644 --- a/tests/src/utils/utils.ts +++ b/tests/src/utils/utils.ts @@ -40,6 +40,7 @@ export class Utils { } public static getTotalStake(seat: Seat): BN { - return seat.stake.toBn().add(seat.backers.reduce((a, baker) => a.add(baker.stake.toBn()), new BN(0))); + //TODO consider refactoring with a typecast + return new BN(+seat.stake.toString() + seat.backers.reduce((a, baker) => a + +baker.stake.toString(), 0)); } } From b64a93ac8572065d85799edc5aae7afced910d33 Mon Sep 17 00:00:00 2001 From: Gleb Urvanov Date: Mon, 6 Apr 2020 09:18:32 +0200 Subject: [PATCH 166/286] linter warnings resolved --- tests/src/tests/electingCouncilTest.ts | 10 +++++----- tests/src/utils/apiWrapper.ts | 4 ++-- tests/src/utils/utils.ts | 1 - 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/tests/src/tests/electingCouncilTest.ts b/tests/src/tests/electingCouncilTest.ts index 77bb0012d3..e4f8cf4e03 100644 --- a/tests/src/tests/electingCouncilTest.ts +++ b/tests/src/tests/electingCouncilTest.ts @@ -21,8 +21,8 @@ describe('Council integration tests', () => { const defaultTimeout: number = 120000; let sudo: KeyringPair; let apiWrapper: ApiWrapper; - let m1KeyPairs: KeyringPair[] = new Array(); - let m2KeyPairs: KeyringPair[] = new Array(); + const m1KeyPairs: KeyringPair[] = new Array(); + const m2KeyPairs: KeyringPair[] = new Array(); before(async function () { this.timeout(defaultTimeout); @@ -40,7 +40,7 @@ describe('Council integration tests', () => { await apiWrapper.sudoStartAnnouncingPerion(sudo, now.addn(100)); const applyForCouncilFee: BN = apiWrapper.estimateApplyForCouncilFee(greaterStake); const voteForCouncilFee: BN = apiWrapper.estimateVoteForCouncilFee(sudo.address, sudo.address, greaterStake); - let salt: string[] = new Array(); + const salt: string[] = new Array(); m1KeyPairs.forEach(() => { salt.push(''.concat(uuid().replace(/-/g, ''))); }); @@ -74,9 +74,9 @@ describe('Council integration tests', () => { await apiWrapper.batchRevealVote(m1KeyPairs.slice(K), m2KeyPairs.slice(K), salt.slice(K)); now = await apiWrapper.getBestBlock(); await apiWrapper.sudoStartRevealingPerion(sudo, now.addn(2)); - //TODO get duration from chain + // TODO get duration from chain await Utils.wait(6000); - let seats: Seat[] = await apiWrapper.getCouncil(); + const seats: Seat[] = await apiWrapper.getCouncil(); const m2addresses: string[] = m2KeyPairs.map(keyPair => keyPair.address); const m1addresses: string[] = m1KeyPairs.map(keyPair => keyPair.address); const members: string[] = seats.map(seat => seat.member.toString()); diff --git a/tests/src/utils/apiWrapper.ts b/tests/src/utils/apiWrapper.ts index c891e50dbb..fdd2e61fec 100644 --- a/tests/src/utils/apiWrapper.ts +++ b/tests/src/utils/apiWrapper.ts @@ -112,7 +112,7 @@ export class ApiWrapper { } public async getCouncilElectionStake(address: string): Promise { - //TODO alter then `applicantStake` type will be introduced + // TODO alter then `applicantStake` type will be introduced return this.api.query.councilElection.applicantStakes(address).then(stake => { const parsed = JSON.parse(stake.toString()); return new BN(parsed.new); @@ -150,7 +150,7 @@ export class ApiWrapper { ); } - //TODO consider using configurable genesis instead + // TODO consider using configurable genesis instead public sudoStartAnnouncingPerion(sudo: KeyringPair, endsAtBlock: BN): Promise { return this.sender.signAndSend( this.api.tx.sudo.sudo(this.api.tx.councilElection.setStageAnnouncing(endsAtBlock)), diff --git a/tests/src/utils/utils.ts b/tests/src/utils/utils.ts index 9f162cd445..8f65093c3d 100644 --- a/tests/src/utils/utils.ts +++ b/tests/src/utils/utils.ts @@ -40,7 +40,6 @@ export class Utils { } public static getTotalStake(seat: Seat): BN { - //TODO consider refactoring with a typecast return new BN(+seat.stake.toString() + seat.backers.reduce((a, baker) => a + +baker.stake.toString(), 0)); } } From 93e4adfa1b44c768d925f220cb8c7e0ae6d1b90d Mon Sep 17 00:00:00 2001 From: Gleb Urvanov Date: Mon, 6 Apr 2020 10:44:20 +0200 Subject: [PATCH 167/286] made council test callable --- tests/src/tests/electingCouncilTest.ts | 15 +++++++++------ tests/src/tests/updateRuntimeTest.ts | 0 2 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 tests/src/tests/updateRuntimeTest.ts diff --git a/tests/src/tests/electingCouncilTest.ts b/tests/src/tests/electingCouncilTest.ts index e4f8cf4e03..c71433b6f5 100644 --- a/tests/src/tests/electingCouncilTest.ts +++ b/tests/src/tests/electingCouncilTest.ts @@ -10,7 +10,7 @@ import { assert } from 'chai'; import { v4 as uuid } from 'uuid'; import { Utils } from '../utils/utils'; -describe('Council integration tests', () => { +export function councilTest(m1KeyPairs: KeyringPair[], m2KeyPairs: KeyringPair[]) { initConfig(); const keyring = new Keyring({ type: 'sr25519' }); const nodeUrl: string = process.env.NODE_URL!; @@ -21,8 +21,6 @@ describe('Council integration tests', () => { const defaultTimeout: number = 120000; let sudo: KeyringPair; let apiWrapper: ApiWrapper; - const m1KeyPairs: KeyringPair[] = new Array(); - const m2KeyPairs: KeyringPair[] = new Array(); before(async function () { this.timeout(defaultTimeout); @@ -31,9 +29,6 @@ describe('Council integration tests', () => { apiWrapper = await ApiWrapper.create(provider); }); - membershipTest(m1KeyPairs); - membershipTest(m2KeyPairs); - it('Electing a council test', async () => { sudo = keyring.addFromUri(sudoUri); let now = await apiWrapper.getBestBlock(); @@ -97,4 +92,12 @@ describe('Council integration tests', () => { after(() => { apiWrapper.close(); }); +} + +describe('Council integration tests', () => { + const m1KeyPairs: KeyringPair[] = new Array(); + const m2KeyPairs: KeyringPair[] = new Array(); + membershipTest(m1KeyPairs); + membershipTest(m2KeyPairs); + councilTest(m1KeyPairs, m2KeyPairs); }); diff --git a/tests/src/tests/updateRuntimeTest.ts b/tests/src/tests/updateRuntimeTest.ts new file mode 100644 index 0000000000..e69de29bb2 From f74e31d76ff6d6a1ee5d4520a46cab63c6a06f4c Mon Sep 17 00:00:00 2001 From: Gleb Urvanov Date: Mon, 6 Apr 2020 17:34:01 +0200 Subject: [PATCH 168/286] runtime update test implementation --- tests/.env | 4 +- tests/src/tests/electingCouncilTest.ts | 3 +- tests/src/tests/updateRuntimeTest.ts | 61 ++++++++++++++++++++++++++ tests/src/utils/apiWrapper.ts | 34 +++++++++++++- 4 files changed, 97 insertions(+), 5 deletions(-) diff --git a/tests/.env b/tests/.env index 7005a4e515..d8af00e6d7 100644 --- a/tests/.env +++ b/tests/.env @@ -11,4 +11,6 @@ COUNCIL_STAKE_GREATER_AMOUNT = 1500 # Council stake amount for first the rest participants in council election test. COUNCIL_STAKE_LESSER_AMOUNT = 1000 # Number of members with greater stake in council election test. -COUNCIL_ELECTION_K = 1 \ No newline at end of file +COUNCIL_ELECTION_K = 1 +# Stake for runtime upgrade proposal test +RUNTIME_UPGRADE_PROPOSAL_STAKE = 200 \ No newline at end of file diff --git a/tests/src/tests/electingCouncilTest.ts b/tests/src/tests/electingCouncilTest.ts index c71433b6f5..c8d56b3adf 100644 --- a/tests/src/tests/electingCouncilTest.ts +++ b/tests/src/tests/electingCouncilTest.ts @@ -2,7 +2,6 @@ import { membershipTest } from './membershipCreationTest'; import { KeyringPair } from '@polkadot/keyring/types'; import { ApiWrapper } from '../utils/apiWrapper'; import { WsProvider, Keyring } from '@polkadot/api'; -import { stringToU8a } from '@polkadot/util'; import { initConfig } from '../utils/config'; import BN = require('bn.js'); import { registerJoystreamTypes, Seat } from '@joystream/types'; @@ -94,7 +93,7 @@ export function councilTest(m1KeyPairs: KeyringPair[], m2KeyPairs: KeyringPair[] }); } -describe('Council integration tests', () => { +describe.skip('Council integration tests', () => { const m1KeyPairs: KeyringPair[] = new Array(); const m2KeyPairs: KeyringPair[] = new Array(); membershipTest(m1KeyPairs); diff --git a/tests/src/tests/updateRuntimeTest.ts b/tests/src/tests/updateRuntimeTest.ts index e69de29bb2..24ee7bd7cd 100644 --- a/tests/src/tests/updateRuntimeTest.ts +++ b/tests/src/tests/updateRuntimeTest.ts @@ -0,0 +1,61 @@ +import { initConfig } from '../utils/config'; +import { Keyring, WsProvider } from '@polkadot/api'; +import { Bytes } from '@polkadot/types'; +import { KeyringPair } from '@polkadot/keyring/types'; +import { membershipTest } from './membershipCreationTest'; +import { councilTest } from './electingCouncilTest'; +import { registerJoystreamTypes } from '@joystream/types'; +import { ApiWrapper } from '../utils/apiWrapper'; +import BN = require('bn.js'); + +describe('Council integration tests', () => { + initConfig(); + const keyring = new Keyring({ type: 'sr25519' }); + const nodeUrl: string = process.env.NODE_URL!; + const sudoUri: string = process.env.SUDO_ACCOUNT_URI!; + const proposalStake: BN = new BN(+process.env.RUNTIME_UPGRADE_PROPOSAL_STAKE!); + const defaultTimeout: number = 120000; + + const m1KeyPairs: KeyringPair[] = new Array(); + const m2KeyPairs: KeyringPair[] = new Array(); + + let apiWrapper: ApiWrapper; + let sudo: KeyringPair; + + before(async function () { + this.timeout(defaultTimeout); + registerJoystreamTypes(); + const provider = new WsProvider(nodeUrl); + apiWrapper = await ApiWrapper.create(provider); + }); + + membershipTest(m1KeyPairs); + membershipTest(m2KeyPairs); + councilTest(m1KeyPairs, m2KeyPairs); + + it('Upgradeing the runtime test', async () => { + sudo = keyring.addFromUri(sudoUri); + const runtime: Bytes = await apiWrapper.getRuntime(); + const description: string = 'runtime upgrade proposal which is used for API integration testing'; + const runtimeProposalFee: BN = apiWrapper.estimateProposeRuntimeUpgradeFee( + proposalStake, + description, + description, + runtime + ); + const runtimeVoteFee: BN = apiWrapper.estimateVoteForProposalFee(); + apiWrapper.transferBalance(sudo, m1KeyPairs[0].address, runtimeProposalFee); + apiWrapper.transferBalanceToAccounts(sudo, m2KeyPairs, runtimeVoteFee); + await apiWrapper.proposeRuntime( + m1KeyPairs[0], + proposalStake, + 'testing runtime', + 'runtime to test proposal functionality', + runtime + ); + }).timeout(defaultTimeout); + + after(() => { + apiWrapper.close(); + }); +}); diff --git a/tests/src/utils/apiWrapper.ts b/tests/src/utils/apiWrapper.ts index fdd2e61fec..f6d949a668 100644 --- a/tests/src/utils/apiWrapper.ts +++ b/tests/src/utils/apiWrapper.ts @@ -1,9 +1,9 @@ import { ApiPromise, WsProvider } from '@polkadot/api'; -import { Option, Vec } from '@polkadot/types'; +import { Option, Vec, Bytes } from '@polkadot/types'; import { Codec } from '@polkadot/types/types'; import { KeyringPair } from '@polkadot/keyring/types'; import { UserInfo, PaidMembershipTerms } from '@joystream/types/lib/members'; -import { Seat } from '@joystream/types'; +import { Seat, VoteKind } from '@joystream/types'; import { Balance } from '@polkadot/types/interfaces'; import BN = require('bn.js'); import { SubmittableExtrinsic } from '@polkadot/api/types'; @@ -99,6 +99,14 @@ export class ApiWrapper { return this.estimateTxFee(this.api.tx.councilElection.reveal(hashedVote, nominee, salt)); } + public estimateProposeRuntimeUpgradeFee(stake: BN, name: string, description: string, runtime: Bytes): BN { + return this.estimateTxFee(this.api.tx.proposals.createProposal(stake, name, description, runtime)); + } + + public estimateVoteForProposalFee(): BN { + return this.estimateTxFee(this.api.tx.proposals.voteOnProposal(0, 'Approve')); + } + private applyForCouncilElection(account: KeyringPair, amount: BN): Promise { return this.sender.signAndSend(this.api.tx.councilElection.apply(amount), account, false); } @@ -185,4 +193,26 @@ export class ApiWrapper { return JSON.parse(seats.toString()); }); } + + public getRuntime(): Promise { + return this.api.query.substrate.code(); + } + + public proposeRuntime( + account: KeyringPair, + stake: BN, + name: string, + description: string, + runtime: Bytes + ): Promise { + return this.sender.signAndSend( + this.api.tx.proposals.createProposal(stake, name, description, runtime), + account, + false + ); + } + + public approveProposal(account: KeyringPair, proposal: BN): Promise { + return this.sender.signAndSend(this.api.tx.proposals.voteOnProposal(proposal, 'Approve'), account, false); + } } From 2e81b591412703403b507db86bf99cf837390fef Mon Sep 17 00:00:00 2001 From: Gleb Urvanov Date: Tue, 7 Apr 2020 10:43:39 +0200 Subject: [PATCH 169/286] console output for debugging --- tests/src/tests/updateRuntimeTest.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/src/tests/updateRuntimeTest.ts b/tests/src/tests/updateRuntimeTest.ts index 24ee7bd7cd..62ee1c6376 100644 --- a/tests/src/tests/updateRuntimeTest.ts +++ b/tests/src/tests/updateRuntimeTest.ts @@ -43,9 +43,11 @@ describe('Council integration tests', () => { description, runtime ); + console.log('sending some funds for the test'); const runtimeVoteFee: BN = apiWrapper.estimateVoteForProposalFee(); - apiWrapper.transferBalance(sudo, m1KeyPairs[0].address, runtimeProposalFee); - apiWrapper.transferBalanceToAccounts(sudo, m2KeyPairs, runtimeVoteFee); + await apiWrapper.transferBalance(sudo, m1KeyPairs[0].address, runtimeProposalFee.add(proposalStake)); + await apiWrapper.transferBalanceToAccounts(sudo, m2KeyPairs, runtimeVoteFee); + console.log('going to propose runtime'); await apiWrapper.proposeRuntime( m1KeyPairs[0], proposalStake, @@ -53,6 +55,8 @@ describe('Council integration tests', () => { 'runtime to test proposal functionality', runtime ); + console.log('runtime proposed, approving...'); + await apiWrapper.approveProposal(m2KeyPairs[0], new BN(1)); }).timeout(defaultTimeout); after(() => { From 46d4e3dc2be8bb27299fcaf08a9e318d2c39cb0a Mon Sep 17 00:00:00 2001 From: Gleb Urvanov Date: Tue, 7 Apr 2020 15:53:23 +0200 Subject: [PATCH 170/286] Vote kind construction alteration --- tests/src/utils/apiWrapper.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/src/utils/apiWrapper.ts b/tests/src/utils/apiWrapper.ts index f6d949a668..1b27ef6a53 100644 --- a/tests/src/utils/apiWrapper.ts +++ b/tests/src/utils/apiWrapper.ts @@ -213,6 +213,10 @@ export class ApiWrapper { } public approveProposal(account: KeyringPair, proposal: BN): Promise { - return this.sender.signAndSend(this.api.tx.proposals.voteOnProposal(proposal, 'Approve'), account, false); + return this.sender.signAndSend( + this.api.tx.proposals.voteOnProposal(proposal, new VoteKind('Approve')), + account, + false + ); } } From 20980de49e47f0d22ff55836c8eebae36dec319f Mon Sep 17 00:00:00 2001 From: Gleb Urvanov Date: Tue, 7 Apr 2020 16:25:02 +0200 Subject: [PATCH 171/286] readability improved --- tests/src/tests/electingCouncilTest.ts | 36 +++++++++++++++++++++----- tests/src/utils/apiWrapper.ts | 6 ++++- 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/tests/src/tests/electingCouncilTest.ts b/tests/src/tests/electingCouncilTest.ts index e4f8cf4e03..161fc8dbb4 100644 --- a/tests/src/tests/electingCouncilTest.ts +++ b/tests/src/tests/electingCouncilTest.ts @@ -2,7 +2,6 @@ import { membershipTest } from './membershipCreationTest'; import { KeyringPair } from '@polkadot/keyring/types'; import { ApiWrapper } from '../utils/apiWrapper'; import { WsProvider, Keyring } from '@polkadot/api'; -import { stringToU8a } from '@polkadot/util'; import { initConfig } from '../utils/config'; import BN = require('bn.js'); import { registerJoystreamTypes, Seat } from '@joystream/types'; @@ -35,9 +34,9 @@ describe('Council integration tests', () => { membershipTest(m2KeyPairs); it('Electing a council test', async () => { + // Setup goes here because M keypairs are generated after before() function sudo = keyring.addFromUri(sudoUri); let now = await apiWrapper.getBestBlock(); - await apiWrapper.sudoStartAnnouncingPerion(sudo, now.addn(100)); const applyForCouncilFee: BN = apiWrapper.estimateApplyForCouncilFee(greaterStake); const voteForCouncilFee: BN = apiWrapper.estimateVoteForCouncilFee(sudo.address, sudo.address, greaterStake); const salt: string[] = new Array(); @@ -45,14 +44,19 @@ describe('Council integration tests', () => { salt.push(''.concat(uuid().replace(/-/g, ''))); }); const revealVoteFee: BN = apiWrapper.estimateRevealVoteFee(sudo.address, salt[0]); + + // Topping the balances await apiWrapper.transferBalanceToAccounts(sudo, m2KeyPairs, applyForCouncilFee.add(greaterStake)); await apiWrapper.transferBalanceToAccounts( sudo, m1KeyPairs, voteForCouncilFee.add(revealVoteFee).add(greaterStake) ); + + // First K members stake more + await apiWrapper.sudoStartAnnouncingPerion(sudo, now.addn(100)); await apiWrapper.batchApplyForCouncilElection(m2KeyPairs.slice(0, K), greaterStake); - m2KeyPairs.forEach(keyPair => + m2KeyPairs.slice(0, K).forEach(keyPair => apiWrapper.getCouncilElectionStake(keyPair.address).then(stake => { assert( stake.eq(greaterStake), @@ -60,7 +64,19 @@ describe('Council integration tests', () => { ); }) ); + + // Last members stake less await apiWrapper.batchApplyForCouncilElection(m2KeyPairs.slice(K), lesserStake); + m2KeyPairs.slice(K).forEach(keyPair => + apiWrapper.getCouncilElectionStake(keyPair.address).then(stake => { + assert( + stake.eq(lesserStake), + `${keyPair.address} not applied correctrly for council election with stake ${stake} versus expected ${lesserStake}` + ); + }) + ); + + // Voting await apiWrapper.sudoStartVotingPerion(sudo, now.addn(100)); await apiWrapper.batchVoteForCouncilMember( m1KeyPairs.slice(0, K), @@ -69,14 +85,20 @@ describe('Council integration tests', () => { lesserStake ); await apiWrapper.batchVoteForCouncilMember(m1KeyPairs.slice(K), m2KeyPairs.slice(K), salt.slice(K), greaterStake); + + // Revealing await apiWrapper.sudoStartRevealingPerion(sudo, now.addn(100)); await apiWrapper.batchRevealVote(m1KeyPairs.slice(0, K), m2KeyPairs.slice(0, K), salt.slice(0, K)); await apiWrapper.batchRevealVote(m1KeyPairs.slice(K), m2KeyPairs.slice(K), salt.slice(K)); now = await apiWrapper.getBestBlock(); - await apiWrapper.sudoStartRevealingPerion(sudo, now.addn(2)); - // TODO get duration from chain - await Utils.wait(6000); + + // Resolving election + // 3 is to ensure the revealing block is in future + await apiWrapper.sudoStartRevealingPerion(sudo, now.addn(3)); + await Utils.wait(apiWrapper.getBlockDuration().muln(2.5).toNumber()); const seats: Seat[] = await apiWrapper.getCouncil(); + + // Preparing collections to increase assertion readability const m2addresses: string[] = m2KeyPairs.map(keyPair => keyPair.address); const m1addresses: string[] = m1KeyPairs.map(keyPair => keyPair.address); const members: string[] = seats.map(seat => seat.member.toString()); @@ -84,6 +106,8 @@ describe('Council integration tests', () => { (array, seat) => array.concat(seat.backers.map(baker => baker.member.toString())), new Array() ); + + // Assertions m2addresses.forEach(address => assert(members.includes(address), `Account ${address} is not in the council`)); m1addresses.forEach(address => assert(bakers.includes(address), `Account ${address} is not in the voters`)); seats.forEach(seat => diff --git a/tests/src/utils/apiWrapper.ts b/tests/src/utils/apiWrapper.ts index fdd2e61fec..fa83a002f6 100644 --- a/tests/src/utils/apiWrapper.ts +++ b/tests/src/utils/apiWrapper.ts @@ -1,5 +1,5 @@ import { ApiPromise, WsProvider } from '@polkadot/api'; -import { Option, Vec } from '@polkadot/types'; +import { Option, Vec, UInt } from '@polkadot/types'; import { Codec } from '@polkadot/types/types'; import { KeyringPair } from '@polkadot/keyring/types'; import { UserInfo, PaidMembershipTerms } from '@joystream/types/lib/members'; @@ -185,4 +185,8 @@ export class ApiWrapper { return JSON.parse(seats.toString()); }); } + + public getBlockDuration(): BN { + return this.api.createType('Moment', this.api.consts.babe.expectedBlockTime).toBn(); + } } From b592b335b1c907d9512537b49d2bde31e257bf38 Mon Sep 17 00:00:00 2001 From: Leszek Wiesner Date: Wed, 8 Apr 2020 12:13:41 +0200 Subject: [PATCH 172/286] Initial progress: council:info, account:import, account:choose --- cli/.editorconfig | 11 + cli/.eslintignore | 1 + cli/.eslintrc | 6 + cli/.gitignore | 8 + cli/README.md | 88 + cli/bin/run | 5 + cli/bin/run.cmd | 3 + cli/package-lock.json | 4643 ++++++++++++++++++++++++ cli/package.json | 79 + cli/src/ExitCodes.ts | 9 + cli/src/base/AccountsCommandBase.ts | 159 + cli/src/commands/account/choose.ts | 36 + cli/src/commands/account/import.ts | 46 + cli/src/commands/council/info.ts | 146 + cli/src/index.ts | 1 + cli/test/commands/council/info.test.ts | 11 + cli/test/mocha.opts | 5 + cli/test/tsconfig.json | 9 + cli/tsconfig.json | 15 + 19 files changed, 5281 insertions(+) create mode 100644 cli/.editorconfig create mode 100644 cli/.eslintignore create mode 100644 cli/.eslintrc create mode 100644 cli/.gitignore create mode 100644 cli/README.md create mode 100755 cli/bin/run create mode 100644 cli/bin/run.cmd create mode 100644 cli/package-lock.json create mode 100644 cli/package.json create mode 100644 cli/src/ExitCodes.ts create mode 100644 cli/src/base/AccountsCommandBase.ts create mode 100644 cli/src/commands/account/choose.ts create mode 100644 cli/src/commands/account/import.ts create mode 100644 cli/src/commands/council/info.ts create mode 100644 cli/src/index.ts create mode 100644 cli/test/commands/council/info.test.ts create mode 100644 cli/test/mocha.opts create mode 100644 cli/test/tsconfig.json create mode 100644 cli/tsconfig.json diff --git a/cli/.editorconfig b/cli/.editorconfig new file mode 100644 index 0000000000..c3f635323a --- /dev/null +++ b/cli/.editorconfig @@ -0,0 +1,11 @@ +root = true + +[*] +indent_style = space +indent_size = 4 +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true + +[*.md] +trim_trailing_whitespace = false diff --git a/cli/.eslintignore b/cli/.eslintignore new file mode 100644 index 0000000000..502167fa0b --- /dev/null +++ b/cli/.eslintignore @@ -0,0 +1 @@ +/lib diff --git a/cli/.eslintrc b/cli/.eslintrc new file mode 100644 index 0000000000..7b846193cc --- /dev/null +++ b/cli/.eslintrc @@ -0,0 +1,6 @@ +{ + "extends": [ + "oclif", + "oclif-typescript" + ] +} diff --git a/cli/.gitignore b/cli/.gitignore new file mode 100644 index 0000000000..35b0ba96ed --- /dev/null +++ b/cli/.gitignore @@ -0,0 +1,8 @@ +*-debug.log +*-error.log +/.nyc_output +/dist +/lib +/tmp +/yarn.lock +node_modules diff --git a/cli/README.md b/cli/README.md new file mode 100644 index 0000000000..ad8eacac5c --- /dev/null +++ b/cli/README.md @@ -0,0 +1,88 @@ +joystream-cli +============= + +Command Line Interface for Joystream community and governance activities + +[![oclif](https://img.shields.io/badge/cli-oclif-brightgreen.svg)](https://oclif.io) +[![Version](https://img.shields.io/npm/v/joystream-cli.svg)](https://npmjs.org/package/joystream-cli) +[![Downloads/week](https://img.shields.io/npm/dw/joystream-cli.svg)](https://npmjs.org/package/joystream-cli) +[![License](https://img.shields.io/npm/l/joystream-cli.svg)](https://github.com/Joystream/cli/blob/master/package.json) + + +* [Usage](#usage) +* [Commands](#commands) + +# Usage + +```sh-session +$ npm install -g joystream-cli +$ joystream-cli COMMAND +running command... +$ joystream-cli (-v|--version|version) +joystream-cli/0.0.0 linux-x64 node-v13.12.0 +$ joystream-cli --help [COMMAND] +USAGE + $ joystream-cli COMMAND +... +``` + +# Commands + +* [`joystream-cli account:choose`](#joystream-cli-accountchoose) +* [`joystream-cli account:import BACKUPFILEPATH`](#joystream-cli-accountimport-backupfilepath) +* [`joystream-cli council:info`](#joystream-cli-councilinfo) +* [`joystream-cli help [COMMAND]`](#joystream-cli-help-command) + +## `joystream-cli account:choose` + +Choose current account to use in the CLI + +``` +USAGE + $ joystream-cli account:choose +``` + +_See code: [src/commands/account/choose.ts](https://github.com/Joystream/cli/blob/v0.0.0/src/commands/account/choose.ts)_ + +## `joystream-cli account:import BACKUPFILEPATH` + +Import account using JSON backup file + +``` +USAGE + $ joystream-cli account:import BACKUPFILEPATH + +ARGUMENTS + BACKUPFILEPATH Path to account backup JSON file +``` + +_See code: [src/commands/account/import.ts](https://github.com/Joystream/cli/blob/v0.0.0/src/commands/account/import.ts)_ + +## `joystream-cli council:info` + +Get current council and council elections information + +``` +USAGE + $ joystream-cli council:info +``` + +_See code: [src/commands/council/info.ts](https://github.com/Joystream/cli/blob/v0.0.0/src/commands/council/info.ts)_ + +## `joystream-cli help [COMMAND]` + +display help for joystream-cli + +``` +USAGE + $ joystream-cli help [COMMAND] + +ARGUMENTS + COMMAND command to show help for + +OPTIONS + --all see all commands in CLI +``` + +_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v2.2.3/src/commands/help.ts)_ + diff --git a/cli/bin/run b/cli/bin/run new file mode 100755 index 0000000000..30b14e1773 --- /dev/null +++ b/cli/bin/run @@ -0,0 +1,5 @@ +#!/usr/bin/env node + +require('@oclif/command').run() +.then(require('@oclif/command/flush')) +.catch(require('@oclif/errors/handle')) diff --git a/cli/bin/run.cmd b/cli/bin/run.cmd new file mode 100644 index 0000000000..968fc30758 --- /dev/null +++ b/cli/bin/run.cmd @@ -0,0 +1,3 @@ +@echo off + +node "%~dp0\run" %* diff --git a/cli/package-lock.json b/cli/package-lock.json new file mode 100644 index 0000000000..aca93e1265 --- /dev/null +++ b/cli/package-lock.json @@ -0,0 +1,4643 @@ +{ + "name": "joystream-cli", + "version": "0.0.0", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "@babel/code-frame": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", + "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", + "dev": true, + "requires": { + "@babel/highlight": "^7.8.3" + } + }, + "@babel/generator": { + "version": "7.9.4", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.4.tgz", + "integrity": "sha512-rjP8ahaDy/ouhrvCoU1E5mqaitWrxwuNGU+dy1EpaoK48jZay4MdkskKGIMHLZNewg8sAsqpGSREJwP0zH3YQA==", + "dev": true, + "requires": { + "@babel/types": "^7.9.0", + "jsesc": "^2.5.1", + "lodash": "^4.17.13", + "source-map": "^0.5.0" + } + }, + "@babel/helper-function-name": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz", + "integrity": "sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==", + "dev": true, + "requires": { + "@babel/helper-get-function-arity": "^7.8.3", + "@babel/template": "^7.8.3", + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-get-function-arity": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz", + "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==", + "dev": true, + "requires": { + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz", + "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==", + "dev": true, + "requires": { + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-validator-identifier": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz", + "integrity": "sha512-6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw==", + "dev": true + }, + "@babel/highlight": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", + "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.9.0", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + } + }, + "@babel/parser": { + "version": "7.9.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz", + "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==", + "dev": true + }, + "@babel/runtime": { + "version": "7.9.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", + "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + }, + "@babel/template": { + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz", + "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/parser": "^7.8.6", + "@babel/types": "^7.8.6" + } + }, + "@babel/traverse": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.0.tgz", + "integrity": "sha512-jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.0", + "@babel/helper-function-name": "^7.8.3", + "@babel/helper-split-export-declaration": "^7.8.3", + "@babel/parser": "^7.9.0", + "@babel/types": "^7.9.0", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.13" + } + }, + "@babel/types": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz", + "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.9.0", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + }, + "@joystream/types": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@joystream/types/-/types-0.6.0.tgz", + "integrity": "sha512-b+6U36GHJLlBPxVqMVQRTZzVxu7BGsjqlC/XJfl/vdx8TOy3P8TIB/3olLU64EPB3cVNadg2p9jqYSsvh9XVAQ==", + "requires": { + "@polkadot/types": "^0.96.1", + "@types/vfile": "^4.0.0", + "ajv": "^6.11.0" + } + }, + "@nodelib/fs.scandir": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz", + "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==", + "dev": true, + "requires": { + "@nodelib/fs.stat": "2.0.3", + "run-parallel": "^1.1.9" + } + }, + "@nodelib/fs.stat": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz", + "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==", + "dev": true + }, + "@nodelib/fs.walk": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz", + "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==", + "dev": true, + "requires": { + "@nodelib/fs.scandir": "2.1.3", + "fastq": "^1.6.0" + } + }, + "@oclif/command": { + "version": "1.5.19", + "resolved": "https://registry.npmjs.org/@oclif/command/-/command-1.5.19.tgz", + "integrity": "sha512-6+iaCMh/JXJaB2QWikqvGE9//wLEVYYwZd5sud8aLoLKog1Q75naZh2vlGVtg5Mq/NqpqGQvdIjJb3Bm+64AUQ==", + "requires": { + "@oclif/config": "^1", + "@oclif/errors": "^1.2.2", + "@oclif/parser": "^3.8.3", + "@oclif/plugin-help": "^2", + "debug": "^4.1.1", + "semver": "^5.6.0" + } + }, + "@oclif/config": { + "version": "1.14.0", + "resolved": "https://registry.npmjs.org/@oclif/config/-/config-1.14.0.tgz", + "integrity": "sha512-KsOP/mx9lzTah+EtGqLUXN3PDL0J3zb9/dTneFyiUK2K6T7vFEGhV6OasmqTh4uMZHGYTGrNPV8x/Yw6qZNL6A==", + "requires": { + "@oclif/errors": "^1.0.0", + "@oclif/parser": "^3.8.0", + "debug": "^4.1.1", + "tslib": "^1.9.3" + } + }, + "@oclif/dev-cli": { + "version": "1.22.2", + "resolved": "https://registry.npmjs.org/@oclif/dev-cli/-/dev-cli-1.22.2.tgz", + "integrity": "sha512-c7633R37RxrQIpwqPKxjNRm6/jb1yuG8fd16hmNz9Nw+/MUhEtQtKHSCe9ScH8n5M06l6LEo4ldk9LEGtpaWwA==", + "dev": true, + "requires": { + "@oclif/command": "^1.5.13", + "@oclif/config": "^1.12.12", + "@oclif/errors": "^1.2.2", + "@oclif/plugin-help": "^2.1.6", + "cli-ux": "^5.2.1", + "debug": "^4.1.1", + "fs-extra": "^7.0.1", + "github-slugger": "^1.2.1", + "lodash": "^4.17.11", + "normalize-package-data": "^2.5.0", + "qqjs": "^0.3.10", + "tslib": "^1.9.3" + } + }, + "@oclif/errors": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@oclif/errors/-/errors-1.2.2.tgz", + "integrity": "sha512-Eq8BFuJUQcbAPVofDxwdE0bL14inIiwt5EaKRVY9ZDIG11jwdXZqiQEECJx0VfnLyUZdYfRd/znDI/MytdJoKg==", + "requires": { + "clean-stack": "^1.3.0", + "fs-extra": "^7.0.0", + "indent-string": "^3.2.0", + "strip-ansi": "^5.0.0", + "wrap-ansi": "^4.0.0" + } + }, + "@oclif/linewrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@oclif/linewrap/-/linewrap-1.0.0.tgz", + "integrity": "sha512-Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw==" + }, + "@oclif/parser": { + "version": "3.8.4", + "resolved": "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.4.tgz", + "integrity": "sha512-cyP1at3l42kQHZtqDS3KfTeyMvxITGwXwH1qk9ktBYvqgMp5h4vHT+cOD74ld3RqJUOZY/+Zi9lb4Tbza3BtuA==", + "requires": { + "@oclif/linewrap": "^1.0.0", + "chalk": "^2.4.2", + "tslib": "^1.9.3" + } + }, + "@oclif/plugin-help": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-2.2.3.tgz", + "integrity": "sha512-bGHUdo5e7DjPJ0vTeRBMIrfqTRDBfyR5w0MP41u0n3r7YG5p14lvMmiCXxi6WDaP2Hw5nqx3PnkAIntCKZZN7g==", + "requires": { + "@oclif/command": "^1.5.13", + "chalk": "^2.4.1", + "indent-string": "^4.0.0", + "lodash.template": "^4.4.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0", + "widest-line": "^2.0.1", + "wrap-ansi": "^4.0.0" + }, + "dependencies": { + "indent-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==" + }, + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + } + } + }, + "@oclif/screen": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@oclif/screen/-/screen-1.0.4.tgz", + "integrity": "sha512-60CHpq+eqnTxLZQ4PGHYNwUX572hgpMHGPtTWMjdTMsAvlm69lZV/4ly6O3sAYkomo4NggGcomrDpBe34rxUqw==" + }, + "@oclif/test": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/@oclif/test/-/test-1.2.5.tgz", + "integrity": "sha512-8Y+Ix4A3Zhm87aL0ldVonDK7vFWyLfnFHzP3goYaLyIeh/60KL37lMxfmbp/kBN6/Y0Ru17iR1pdDi/hTDClLQ==", + "dev": true, + "requires": { + "fancy-test": "^1.4.3" + } + }, + "@polkadot/api": { + "version": "0.96.1", + "resolved": "https://registry.npmjs.org/@polkadot/api/-/api-0.96.1.tgz", + "integrity": "sha512-FeYyMfJL0NACJBIuG7C7mp7f9J/WOGUERF/hUP3RlIz4Ld2X0vRjEoOgiG0VIS89I4K31XaNmSjIchH244WtHg==", + "requires": { + "@babel/runtime": "^7.7.1", + "@polkadot/api-derive": "^0.96.1", + "@polkadot/api-metadata": "^0.96.1", + "@polkadot/keyring": "^1.7.0-beta.5", + "@polkadot/rpc-core": "^0.96.1", + "@polkadot/rpc-provider": "^0.96.1", + "@polkadot/types": "^0.96.1", + "@polkadot/util-crypto": "^1.7.0-beta.5" + } + }, + "@polkadot/api-derive": { + "version": "0.96.1", + "resolved": "https://registry.npmjs.org/@polkadot/api-derive/-/api-derive-0.96.1.tgz", + "integrity": "sha512-PGWdUvlD2acUKOgaJcYWuMTfSuQKUpwgwjer5SomHLFn4ZPOz8iDa7mYtrgmxQctRv1zsuck2X01uhxdEdtJZw==", + "requires": { + "@babel/runtime": "^7.7.1", + "@polkadot/api": "^0.96.1", + "@polkadot/types": "^0.96.1" + } + }, + "@polkadot/api-metadata": { + "version": "0.96.1", + "resolved": "https://registry.npmjs.org/@polkadot/api-metadata/-/api-metadata-0.96.1.tgz", + "integrity": "sha512-I9F3twpSCgx4ny25a3moGrhf2vHKFnjooO3W9NaAxIj/us4q4Gqo4+czQajqt8vaJqrNMq/PE7lzVz1NhYDrZQ==", + "requires": { + "@babel/runtime": "^7.7.1", + "@polkadot/types": "^0.96.1", + "@polkadot/util": "^1.7.0-beta.5", + "@polkadot/util-crypto": "^1.7.0-beta.5" + } + }, + "@polkadot/jsonrpc": { + "version": "0.96.1", + "resolved": "https://registry.npmjs.org/@polkadot/jsonrpc/-/jsonrpc-0.96.1.tgz", + "integrity": "sha512-UHpcUGIvkG4dJ5gUhDyfJ1xfr/VcBlJ5lIlGamGsnNacMuIVmmEsftgxtPlJLWHuoA1EBEHY4cbPSv9CUJ0IFw==", + "requires": { + "@babel/runtime": "^7.7.1" + } + }, + "@polkadot/keyring": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/@polkadot/keyring/-/keyring-1.8.1.tgz", + "integrity": "sha512-KeDbfP8biY3bXEhMv1ANp9d3kCuXj2oxseuDK0jvxRo7CehVME9UwAMGQK3Y9NCUuYWd+xTO2To0ZOqR7hdmuQ==", + "requires": { + "@babel/runtime": "^7.7.7", + "@polkadot/util": "^1.8.1", + "@polkadot/util-crypto": "^1.8.1" + } + }, + "@polkadot/rpc-core": { + "version": "0.96.1", + "resolved": "https://registry.npmjs.org/@polkadot/rpc-core/-/rpc-core-0.96.1.tgz", + "integrity": "sha512-ygSaJpz/QPEq1p35wYRzONuP2PCtkAJ9eS8swQqUIezTo2ZPUOyBhmnJ3nxj11R8YnQClq4Id0QdsJmH1ClYgw==", + "requires": { + "@babel/runtime": "^7.7.1", + "@polkadot/jsonrpc": "^0.96.1", + "@polkadot/rpc-provider": "^0.96.1", + "@polkadot/types": "^0.96.1", + "@polkadot/util": "^1.7.0-beta.5", + "rxjs": "^6.5.3" + } + }, + "@polkadot/rpc-provider": { + "version": "0.96.1", + "resolved": "https://registry.npmjs.org/@polkadot/rpc-provider/-/rpc-provider-0.96.1.tgz", + "integrity": "sha512-cUhp8FMCYHrXrBTbxZrok/hPIgtOXEUhIXn5/zrffg1Qpbzju/y/bXx7c1Kxl1JF7Bg0vSBRZEGJTn/x0irWRQ==", + "requires": { + "@babel/runtime": "^7.7.1", + "@polkadot/api-metadata": "^0.96.1", + "@polkadot/util": "^1.7.0-beta.5", + "@polkadot/util-crypto": "^1.7.0-beta.5", + "eventemitter3": "^4.0.0", + "isomorphic-fetch": "^2.2.1", + "websocket": "^1.0.30" + } + }, + "@polkadot/ts": { + "version": "0.1.91", + "resolved": "https://registry.npmjs.org/@polkadot/ts/-/ts-0.1.91.tgz", + "integrity": "sha512-UB8zOFZXb/ih03izzAQ1r1DRpiUXBofxAlXjcx4530jopfiNsiU1LZ2J/uS3dVV1QXaGRhkgm8SIJDLsSMRYIQ==", + "dev": true, + "requires": { + "@types/chrome": "^0.0.92" + } + }, + "@polkadot/types": { + "version": "0.96.1", + "resolved": "https://registry.npmjs.org/@polkadot/types/-/types-0.96.1.tgz", + "integrity": "sha512-b8AZBNmMjB0+34Oxue3AYc0gIjDHYCdVGtDpel0omHkLMcEquSvrCniLm+p7g4cfArICiZPFmS9In/OWWdRUVA==", + "requires": { + "@babel/runtime": "^7.7.1", + "@polkadot/util": "^1.7.0-beta.5", + "@polkadot/util-crypto": "^1.7.0-beta.5", + "@types/memoizee": "^0.4.3", + "memoizee": "^0.4.14" + } + }, + "@polkadot/util": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/@polkadot/util/-/util-1.8.1.tgz", + "integrity": "sha512-sFpr+JLCG9d+epjboXsmJ1qcKa96r8ZYzXmVo8+aPzI/9jKKyez6Unox/dnfnpKppZB2nJuLcsxQm6nocp2Caw==", + "requires": { + "@babel/runtime": "^7.7.7", + "@types/bn.js": "^4.11.6", + "bn.js": "^4.11.8", + "camelcase": "^5.3.1", + "chalk": "^3.0.0", + "ip-regex": "^4.1.0", + "moment": "^2.24.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "@polkadot/util-crypto": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/@polkadot/util-crypto/-/util-crypto-1.8.1.tgz", + "integrity": "sha512-ypUs10hV1HPvYc0ZsEu+LTGSEh0rkr0as/FUh7+Z9v3Bxibn3aO+EOxJPQuDbZZ59FSMRmc9SeOSa0wn9ddrnw==", + "requires": { + "@babel/runtime": "^7.7.7", + "@polkadot/util": "^1.8.1", + "@polkadot/wasm-crypto": "^0.14.1", + "@types/bip39": "^2.4.2", + "@types/bs58": "^4.0.0", + "@types/pbkdf2": "^3.0.0", + "@types/secp256k1": "^3.5.0", + "@types/xxhashjs": "^0.2.1", + "base-x": "3.0.5", + "bip39": "^2.5.0", + "blakejs": "^1.1.0", + "bs58": "^4.0.1", + "js-sha3": "^0.8.0", + "secp256k1": "^3.8.0", + "tweetnacl": "^1.0.1", + "xxhashjs": "^0.2.2" + } + }, + "@polkadot/wasm-crypto": { + "version": "0.14.1", + "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto/-/wasm-crypto-0.14.1.tgz", + "integrity": "sha512-Xng7L2Z8TNZa/5g6pot4O06Jf0ohQRZdvfl8eQL+E/L2mcqJYC1IjkMxJBSBuQEV7hisWzh9mHOy5WCcgPk29Q==" + }, + "@types/bip39": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/@types/bip39/-/bip39-2.4.2.tgz", + "integrity": "sha512-Vo9lqOIRq8uoIzEVrV87ZvcIM0PN9t0K3oYZ/CS61fIYKCBdOIM7mlWzXuRvSXrDtVa1uUO2w1cdfufxTC0bzg==", + "requires": { + "@types/node": "*" + } + }, + "@types/bn.js": { + "version": "4.11.6", + "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-4.11.6.tgz", + "integrity": "sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg==", + "requires": { + "@types/node": "*" + } + }, + "@types/bs58": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@types/bs58/-/bs58-4.0.1.tgz", + "integrity": "sha512-yfAgiWgVLjFCmRv8zAcOIHywYATEwiTVccTLnRp6UxTNavT55M9d/uhK3T03St/+8/z/wW+CRjGKUNmEqoHHCA==", + "requires": { + "base-x": "^3.0.6" + }, + "dependencies": { + "base-x": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.8.tgz", + "integrity": "sha512-Rl/1AWP4J/zRrk54hhlxH4drNxPJXYUaKffODVI53/dAsV4t9fBxyxYKAVPU1XBHxYwOWP9h9H0hM2MVw4YfJA==", + "requires": { + "safe-buffer": "^5.0.1" + } + } + } + }, + "@types/chai": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.2.11.tgz", + "integrity": "sha512-t7uW6eFafjO+qJ3BIV2gGUyZs27egcNRkUdalkud+Qa3+kg//f129iuOFivHDXQ+vnU3fDXuwgv0cqMCbcE8sw==", + "dev": true + }, + "@types/chrome": { + "version": "0.0.92", + "resolved": "https://registry.npmjs.org/@types/chrome/-/chrome-0.0.92.tgz", + "integrity": "sha512-bTv1EljZ03bexRJwS5FwSZmrudtw+QNbzwUY2sxVtXWgtxk752G4I2owhZ+Mlzbf3VKvG+rBYSw/FnvzuZ4xOA==", + "dev": true, + "requires": { + "@types/filesystem": "*" + } + }, + "@types/color-name": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", + "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==" + }, + "@types/eslint-visitor-keys": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz", + "integrity": "sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==", + "dev": true + }, + "@types/events": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz", + "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==", + "dev": true + }, + "@types/filesystem": { + "version": "0.0.29", + "resolved": "https://registry.npmjs.org/@types/filesystem/-/filesystem-0.0.29.tgz", + "integrity": "sha512-85/1KfRedmfPGsbK8YzeaQUyV1FQAvMPMTuWFQ5EkLd2w7szhNO96bk3Rh/SKmOfd9co2rCLf0Voy4o7ECBOvw==", + "dev": true, + "requires": { + "@types/filewriter": "*" + } + }, + "@types/filewriter": { + "version": "0.0.28", + "resolved": "https://registry.npmjs.org/@types/filewriter/-/filewriter-0.0.28.tgz", + "integrity": "sha1-wFTor02d11205jq8dviFFocU1LM=", + "dev": true + }, + "@types/glob": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz", + "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==", + "dev": true, + "requires": { + "@types/events": "*", + "@types/minimatch": "*", + "@types/node": "*" + } + }, + "@types/inquirer": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@types/inquirer/-/inquirer-6.5.0.tgz", + "integrity": "sha512-rjaYQ9b9y/VFGOpqBEXRavc3jh0a+e6evAbI31tMda8VlPaSy0AZJfXsvmIe3wklc7W6C3zCSfleuMXR7NOyXw==", + "requires": { + "@types/through": "*", + "rxjs": "^6.4.0" + } + }, + "@types/json-schema": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.4.tgz", + "integrity": "sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==", + "dev": true + }, + "@types/lodash": { + "version": "4.14.149", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.149.tgz", + "integrity": "sha512-ijGqzZt/b7BfzcK9vTrS6MFljQRPn5BFWOx8oE0GYxribu6uV+aA9zZuXI1zc/etK9E8nrgdoF2+LgUw7+9tJQ==", + "dev": true + }, + "@types/memoizee": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/@types/memoizee/-/memoizee-0.4.3.tgz", + "integrity": "sha512-N6QT0c9ZbEKl33n1wyoTxZs4cpN+YXjs0Aqy5Qim8ipd9PBNIPqOh/p5Pixc4601tqr5GErsdxUbfqviDfubNw==" + }, + "@types/minimatch": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", + "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==", + "dev": true + }, + "@types/mocha": { + "version": "5.2.7", + "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-5.2.7.tgz", + "integrity": "sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ==", + "dev": true + }, + "@types/node": { + "version": "10.17.18", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.18.tgz", + "integrity": "sha512-DQ2hl/Jl3g33KuAUOcMrcAOtsbzb+y/ufakzAdeK9z/H/xsvkpbETZZbPNMIiQuk24f5ZRMCcZIViAwyFIiKmg==" + }, + "@types/pbkdf2": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/pbkdf2/-/pbkdf2-3.0.0.tgz", + "integrity": "sha512-6J6MHaAlBJC/eVMy9jOwj9oHaprfutukfW/Dyt0NEnpQ/6HN6YQrpvLwzWdWDeWZIdenjGHlbYDzyEODO5Z+2Q==", + "requires": { + "@types/node": "*" + } + }, + "@types/secp256k1": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/@types/secp256k1/-/secp256k1-3.5.3.tgz", + "integrity": "sha512-NGcsPDR0P+Q71O63e2ayshmiZGAwCOa/cLJzOIuhOiDvmbvrCIiVtEpqdCJGogG92Bnr6tw/6lqVBsRMEl15OQ==", + "requires": { + "@types/node": "*" + } + }, + "@types/sinon": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-9.0.0.tgz", + "integrity": "sha512-v2TkYHkts4VXshMkcmot/H+ERZ2SevKa10saGaJPGCJ8vh3lKrC4u663zYEeRZxep+VbG6YRDtQ6gVqw9dYzPA==", + "dev": true, + "requires": { + "@types/sinonjs__fake-timers": "*" + } + }, + "@types/sinonjs__fake-timers": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.1.tgz", + "integrity": "sha512-yYezQwGWty8ziyYLdZjwxyMb0CZR49h8JALHGrxjQHWlqGgc8kLdHEgWrgL0uZ29DMvEVBDnHU2Wg36zKSIUtA==", + "dev": true + }, + "@types/slug": { + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/@types/slug/-/slug-0.9.1.tgz", + "integrity": "sha512-zR/u8WFQ4/6uCIikjI00a5uB084XjgEGNRAvM4a1BL39Bw9yEiDQFiPS2DgJ8lPDkR2Qd/vZ26dCR9XqlKbDqQ==" + }, + "@types/through": { + "version": "0.0.30", + "resolved": "https://registry.npmjs.org/@types/through/-/through-0.0.30.tgz", + "integrity": "sha512-FvnCJljyxhPM3gkRgWmxmDZyAQSiBQQWLI0A0VFL0K7W1oRUrPJSqNO0NvTnLkBcotdlp3lKvaT0JrnyRDkzOg==", + "requires": { + "@types/node": "*" + } + }, + "@types/unist": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.3.tgz", + "integrity": "sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==" + }, + "@types/vfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@types/vfile/-/vfile-4.0.0.tgz", + "integrity": "sha512-eleP0/Cz8uVWxARDLi3Axq2+fDdN4ibAXoC6Pv8p6s7znXaUL7XvhgeIhjCiNMnvlLNP+tmCLd+RuCryGgmtEg==", + "requires": { + "vfile": "*" + } + }, + "@types/xxhashjs": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@types/xxhashjs/-/xxhashjs-0.2.1.tgz", + "integrity": "sha512-Akm13wkwsQylVnBokl/aiKLtSxndSjfgTjdvmSxXNehYy4NymwdfdJHwGhpV54wcYfmOByOp3ak8AGdUlvp0sA==", + "requires": { + "@types/node": "*" + } + }, + "@typescript-eslint/eslint-plugin": { + "version": "2.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.26.0.tgz", + "integrity": "sha512-4yUnLv40bzfzsXcTAtZyTjbiGUXMrcIJcIMioI22tSOyAxpdXiZ4r7YQUU8Jj6XXrLz9d5aMHPQf5JFR7h27Nw==", + "dev": true, + "requires": { + "@typescript-eslint/experimental-utils": "2.26.0", + "functional-red-black-tree": "^1.0.1", + "regexpp": "^3.0.0", + "tsutils": "^3.17.1" + }, + "dependencies": { + "regexpp": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz", + "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==", + "dev": true + } + } + }, + "@typescript-eslint/experimental-utils": { + "version": "2.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.26.0.tgz", + "integrity": "sha512-RELVoH5EYd+JlGprEyojUv9HeKcZqF7nZUGSblyAw1FwOGNnmQIU8kxJ69fttQvEwCsX5D6ECJT8GTozxrDKVQ==", + "dev": true, + "requires": { + "@types/json-schema": "^7.0.3", + "@typescript-eslint/typescript-estree": "2.26.0", + "eslint-scope": "^5.0.0", + "eslint-utils": "^2.0.0" + }, + "dependencies": { + "eslint-scope": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz", + "integrity": "sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==", + "dev": true, + "requires": { + "esrecurse": "^4.1.0", + "estraverse": "^4.1.1" + } + }, + "eslint-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.0.0.tgz", + "integrity": "sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^1.1.0" + } + } + } + }, + "@typescript-eslint/parser": { + "version": "2.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.26.0.tgz", + "integrity": "sha512-+Xj5fucDtdKEVGSh9353wcnseMRkPpEAOY96EEenN7kJVrLqy/EVwtIh3mxcUz8lsFXW1mT5nN5vvEam/a5HiQ==", + "dev": true, + "requires": { + "@types/eslint-visitor-keys": "^1.0.0", + "@typescript-eslint/experimental-utils": "2.26.0", + "@typescript-eslint/typescript-estree": "2.26.0", + "eslint-visitor-keys": "^1.1.0" + } + }, + "@typescript-eslint/typescript-estree": { + "version": "2.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.26.0.tgz", + "integrity": "sha512-3x4SyZCLB4zsKsjuhxDLeVJN6W29VwBnYpCsZ7vIdPel9ZqLfIZJgJXO47MNUkurGpQuIBALdPQKtsSnWpE1Yg==", + "dev": true, + "requires": { + "debug": "^4.1.1", + "eslint-visitor-keys": "^1.1.0", + "glob": "^7.1.6", + "is-glob": "^4.0.1", + "lodash": "^4.17.15", + "semver": "^6.3.0", + "tsutils": "^3.17.1" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + } + } + }, + "acorn": { + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz", + "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==", + "dev": true + }, + "acorn-jsx": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz", + "integrity": "sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==", + "dev": true + }, + "ajv": { + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz", + "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==", + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "ansi-escapes": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", + "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==" + }, + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" + }, + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "requires": { + "color-convert": "^1.9.0" + } + }, + "ansicolors": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz", + "integrity": "sha1-ZlWX3oap/+Oqm/vmyuXG6kJrSXk=" + }, + "append-transform": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-1.0.0.tgz", + "integrity": "sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==", + "dev": true, + "requires": { + "default-require-extensions": "^2.0.0" + } + }, + "archy": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", + "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=", + "dev": true + }, + "arg": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", + "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", + "dev": true + }, + "argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "requires": { + "sprintf-js": "~1.0.2" + } + }, + "array-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "dev": true + }, + "assertion-error": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", + "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", + "dev": true + }, + "astral-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz", + "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==", + "dev": true + }, + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "dev": true + }, + "base-x": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.5.tgz", + "integrity": "sha512-C3picSgzPSLE+jW3tcBzJoGwitOtazb5B+5YmAxZm2ybmTi9LNgAtDO/jjVEBZwHoXmDBZ9m/IELj3elJVRBcA==", + "requires": { + "safe-buffer": "^5.0.1" + } + }, + "base64-js": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz", + "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==", + "dev": true + }, + "bindings": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "requires": { + "file-uri-to-path": "1.0.0" + } + }, + "bip39": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/bip39/-/bip39-2.6.0.tgz", + "integrity": "sha512-RrnQRG2EgEoqO24ea+Q/fftuPUZLmrEM3qNhhGsA3PbaXaCW791LTzPuVyx/VprXQcTbPJ3K3UeTna8ZnVl2sg==", + "requires": { + "create-hash": "^1.1.0", + "pbkdf2": "^3.0.9", + "randombytes": "^2.0.1", + "safe-buffer": "^5.0.1", + "unorm": "^1.3.3" + } + }, + "bip66": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/bip66/-/bip66-1.1.5.tgz", + "integrity": "sha1-AfqHSHhcpwlV1QESF9GzE5lpyiI=", + "requires": { + "safe-buffer": "^5.0.1" + } + }, + "bl": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.2.tgz", + "integrity": "sha512-j4OH8f6Qg2bGuWfRiltT2HYGx0e1QcBTrK9KAHNMwMZdQnDZFk0ZSYIpADjYCB3U12nicC5tVJwSIhwOWjb4RQ==", + "dev": true, + "requires": { + "buffer": "^5.5.0", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" + } + }, + "blakejs": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/blakejs/-/blakejs-1.1.0.tgz", + "integrity": "sha1-ad+S75U6qIylGjLfarHFShVfx6U=" + }, + "bn.js": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", + "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==" + }, + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, + "requires": { + "fill-range": "^7.0.1" + } + }, + "brorand": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", + "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=" + }, + "browser-stdout": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", + "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", + "dev": true + }, + "browserify-aes": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", + "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", + "requires": { + "buffer-xor": "^1.0.3", + "cipher-base": "^1.0.0", + "create-hash": "^1.1.0", + "evp_bytestokey": "^1.0.3", + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" + } + }, + "bs58": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz", + "integrity": "sha1-vhYedsNU9veIrkBx9j806MTwpCo=", + "requires": { + "base-x": "^3.0.2" + } + }, + "buffer": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.5.0.tgz", + "integrity": "sha512-9FTEDjLjwoAkEwyMGDjYJQN2gfRgOKBKRfiglhvibGbpeeU/pQn1bJxQqm32OD/AIeEuHxU9roxXxg34Byp/Ww==", + "dev": true, + "requires": { + "base64-js": "^1.0.2", + "ieee754": "^1.1.4" + } + }, + "buffer-from": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", + "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", + "dev": true + }, + "buffer-xor": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", + "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=" + }, + "caching-transform": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-3.0.2.tgz", + "integrity": "sha512-Mtgcv3lh3U0zRii/6qVgQODdPA4G3zhG+jtbCWj39RXuUFTMzH0vcdMtaJS1jPowd+It2Pqr6y3NJMQqOqCE2w==", + "dev": true, + "requires": { + "hasha": "^3.0.0", + "make-dir": "^2.0.0", + "package-hash": "^3.0.0", + "write-file-atomic": "^2.4.2" + }, + "dependencies": { + "make-dir": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", + "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", + "dev": true, + "requires": { + "pify": "^4.0.1", + "semver": "^5.6.0" + } + }, + "write-file-atomic": { + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz", + "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.11", + "imurmurhash": "^0.1.4", + "signal-exit": "^3.0.2" + } + } + } + }, + "callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true + }, + "camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" + }, + "cardinal": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/cardinal/-/cardinal-2.1.1.tgz", + "integrity": "sha1-fMEFXYItISlU0HsIXeolHMe8VQU=", + "requires": { + "ansicolors": "~0.3.2", + "redeyed": "~2.1.0" + } + }, + "chai": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz", + "integrity": "sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==", + "dev": true, + "requires": { + "assertion-error": "^1.1.0", + "check-error": "^1.0.2", + "deep-eql": "^3.0.1", + "get-func-name": "^2.0.0", + "pathval": "^1.1.0", + "type-detect": "^4.0.5" + } + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + }, + "chardet": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", + "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" + }, + "check-error": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", + "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=", + "dev": true + }, + "chownr": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", + "dev": true + }, + "cipher-base": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", + "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", + "requires": { + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" + } + }, + "clean-regexp": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/clean-regexp/-/clean-regexp-1.0.0.tgz", + "integrity": "sha1-jffHquUf02h06PjQW5GAvBGj/tc=", + "dev": true, + "requires": { + "escape-string-regexp": "^1.0.5" + } + }, + "clean-stack": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-1.3.0.tgz", + "integrity": "sha1-noIVAa6XmYbEax1m0tQy2y/UrjE=" + }, + "cli-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", + "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", + "requires": { + "restore-cursor": "^3.1.0" + } + }, + "cli-progress": { + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/cli-progress/-/cli-progress-3.6.1.tgz", + "integrity": "sha512-OVRgcyeI0viJW47MnyS10Jw/0RTpk7wwNbrCOPyXT0TVi2o3Q/u+Os8vQUFYhvkdXSbguSdFvMv1ia+UuwgIQQ==", + "requires": { + "colors": "^1.1.2", + "string-width": "^4.2.0" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" + }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" + }, + "string-width": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + } + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "requires": { + "ansi-regex": "^5.0.0" + } + } + } + }, + "cli-ux": { + "version": "5.4.5", + "resolved": "https://registry.npmjs.org/cli-ux/-/cli-ux-5.4.5.tgz", + "integrity": "sha512-5A6FuU0wPUlfCWUjtizUvNIbXElp6jN9QUJsDibs6F9cVX1kTgaMR3m6KT0R3iriEXpMrmPKV6yYS8XICNuQ6Q==", + "requires": { + "@oclif/command": "^1.5.1", + "@oclif/errors": "^1.2.1", + "@oclif/linewrap": "^1.0.0", + "@oclif/screen": "^1.0.3", + "ansi-escapes": "^3.1.0", + "ansi-styles": "^3.2.1", + "cardinal": "^2.1.1", + "chalk": "^2.4.1", + "clean-stack": "^2.0.0", + "cli-progress": "^3.4.0", + "extract-stack": "^1.0.0", + "fs-extra": "^7.0.1", + "hyperlinker": "^1.0.0", + "indent-string": "^4.0.0", + "is-wsl": "^1.1.0", + "js-yaml": "^3.13.1", + "lodash": "^4.17.11", + "natural-orderby": "^2.0.1", + "password-prompt": "^1.1.2", + "semver": "^5.6.0", + "string-width": "^3.1.0", + "strip-ansi": "^5.1.0", + "supports-color": "^5.5.0", + "supports-hyperlinks": "^1.0.1", + "treeify": "^1.1.0", + "tslib": "^1.9.3" + }, + "dependencies": { + "clean-stack": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", + "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==" + }, + "indent-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==" + }, + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + } + } + }, + "cli-width": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz", + "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=" + }, + "cliui": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", + "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "dev": true, + "requires": { + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" + }, + "dependencies": { + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + }, + "wrap-ansi": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", + "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" + } + } + } + }, + "color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" + }, + "colors": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", + "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==" + }, + "commander": { + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", + "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==", + "dev": true + }, + "commondir": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", + "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "dev": true + }, + "content-type": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", + "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", + "dev": true + }, + "convert-source-map": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", + "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.1" + }, + "dependencies": { + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true + } + } + }, + "cp-file": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/cp-file/-/cp-file-6.2.0.tgz", + "integrity": "sha512-fmvV4caBnofhPe8kOcitBwSn2f39QLjnAnGq3gO9dfd75mUytzKNZB1hde6QHunW2Rt+OwuBOMc3i1tNElbszA==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "make-dir": "^2.0.0", + "nested-error-stacks": "^2.0.0", + "pify": "^4.0.1", + "safe-buffer": "^5.0.1" + }, + "dependencies": { + "make-dir": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", + "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", + "dev": true, + "requires": { + "pify": "^4.0.1", + "semver": "^5.6.0" + } + } + } + }, + "create-hash": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", + "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", + "requires": { + "cipher-base": "^1.0.1", + "inherits": "^2.0.1", + "md5.js": "^1.3.4", + "ripemd160": "^2.0.1", + "sha.js": "^2.4.0" + } + }, + "create-hmac": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", + "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", + "requires": { + "cipher-base": "^1.0.3", + "create-hash": "^1.1.0", + "inherits": "^2.0.1", + "ripemd160": "^2.0.0", + "safe-buffer": "^5.0.1", + "sha.js": "^2.4.8" + } + }, + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + }, + "cuint": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/cuint/-/cuint-0.2.2.tgz", + "integrity": "sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=" + }, + "d": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz", + "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==", + "requires": { + "es5-ext": "^0.10.50", + "type": "^1.0.1" + } + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } + }, + "decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", + "dev": true + }, + "deep-eql": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", + "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==", + "dev": true, + "requires": { + "type-detect": "^4.0.0" + } + }, + "deep-is": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", + "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", + "dev": true + }, + "default-require-extensions": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-2.0.0.tgz", + "integrity": "sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc=", + "dev": true, + "requires": { + "strip-bom": "^3.0.0" + }, + "dependencies": { + "strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "dev": true + } + } + }, + "detect-indent": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.0.0.tgz", + "integrity": "sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA==", + "dev": true + }, + "diff": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", + "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", + "dev": true + }, + "dir-glob": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "dev": true, + "requires": { + "path-type": "^4.0.0" + } + }, + "doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, + "requires": { + "esutils": "^2.0.2" + } + }, + "drbg.js": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/drbg.js/-/drbg.js-1.0.1.tgz", + "integrity": "sha1-Pja2xCs3BDgjzbwzLVjzHiRFSAs=", + "requires": { + "browserify-aes": "^1.0.6", + "create-hash": "^1.1.2", + "create-hmac": "^1.1.4" + } + }, + "elliptic": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz", + "integrity": "sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==", + "requires": { + "bn.js": "^4.4.0", + "brorand": "^1.0.1", + "hash.js": "^1.0.0", + "hmac-drbg": "^1.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.0" + } + }, + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" + }, + "encoding": { + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz", + "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=", + "requires": { + "iconv-lite": "~0.4.13" + } + }, + "end-of-stream": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "dev": true, + "requires": { + "once": "^1.4.0" + } + }, + "error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "dev": true, + "requires": { + "is-arrayish": "^0.2.1" + } + }, + "es5-ext": { + "version": "0.10.53", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz", + "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==", + "requires": { + "es6-iterator": "~2.0.3", + "es6-symbol": "~3.1.3", + "next-tick": "~1.0.0" + }, + "dependencies": { + "next-tick": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", + "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=" + } + } + }, + "es6-error": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", + "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", + "dev": true + }, + "es6-iterator": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", + "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", + "requires": { + "d": "1", + "es5-ext": "^0.10.35", + "es6-symbol": "^3.1.1" + } + }, + "es6-symbol": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz", + "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==", + "requires": { + "d": "^1.0.1", + "ext": "^1.1.2" + } + }, + "es6-weak-map": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz", + "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==", + "requires": { + "d": "1", + "es5-ext": "^0.10.46", + "es6-iterator": "^2.0.3", + "es6-symbol": "^3.1.1" + } + }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" + }, + "eslint": { + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.16.0.tgz", + "integrity": "sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "ajv": "^6.9.1", + "chalk": "^2.1.0", + "cross-spawn": "^6.0.5", + "debug": "^4.0.1", + "doctrine": "^3.0.0", + "eslint-scope": "^4.0.3", + "eslint-utils": "^1.3.1", + "eslint-visitor-keys": "^1.0.0", + "espree": "^5.0.1", + "esquery": "^1.0.1", + "esutils": "^2.0.2", + "file-entry-cache": "^5.0.1", + "functional-red-black-tree": "^1.0.1", + "glob": "^7.1.2", + "globals": "^11.7.0", + "ignore": "^4.0.6", + "import-fresh": "^3.0.0", + "imurmurhash": "^0.1.4", + "inquirer": "^6.2.2", + "js-yaml": "^3.13.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.3.0", + "lodash": "^4.17.11", + "minimatch": "^3.0.4", + "mkdirp": "^0.5.1", + "natural-compare": "^1.4.0", + "optionator": "^0.8.2", + "path-is-inside": "^1.0.2", + "progress": "^2.0.0", + "regexpp": "^2.0.1", + "semver": "^5.5.1", + "strip-ansi": "^4.0.0", + "strip-json-comments": "^2.0.1", + "table": "^5.2.3", + "text-table": "^0.2.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "cli-cursor": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", + "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", + "dev": true, + "requires": { + "restore-cursor": "^2.0.0" + } + }, + "figures": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", + "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", + "dev": true, + "requires": { + "escape-string-regexp": "^1.0.5" + } + }, + "ignore": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "dev": true + }, + "inquirer": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz", + "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==", + "dev": true, + "requires": { + "ansi-escapes": "^3.2.0", + "chalk": "^2.4.2", + "cli-cursor": "^2.1.0", + "cli-width": "^2.0.0", + "external-editor": "^3.0.3", + "figures": "^2.0.0", + "lodash": "^4.17.12", + "mute-stream": "0.0.7", + "run-async": "^2.2.0", + "rxjs": "^6.4.0", + "string-width": "^2.1.0", + "strip-ansi": "^5.1.0", + "through": "^2.3.6" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + } + } + } + }, + "mimic-fn": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", + "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", + "dev": true + }, + "mute-stream": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", + "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", + "dev": true + }, + "onetime": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", + "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", + "dev": true, + "requires": { + "mimic-fn": "^1.0.0" + } + }, + "restore-cursor": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", + "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", + "dev": true, + "requires": { + "onetime": "^2.0.0", + "signal-exit": "^3.0.2" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "^3.0.0" + } + } + } + }, + "eslint-ast-utils": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/eslint-ast-utils/-/eslint-ast-utils-1.1.0.tgz", + "integrity": "sha512-otzzTim2/1+lVrlH19EfQQJEhVJSu0zOb9ygb3iapN6UlyaDtyRq4b5U1FuW0v1lRa9Fp/GJyHkSwm6NqABgCA==", + "dev": true, + "requires": { + "lodash.get": "^4.4.2", + "lodash.zip": "^4.2.0" + } + }, + "eslint-config-oclif": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/eslint-config-oclif/-/eslint-config-oclif-3.1.0.tgz", + "integrity": "sha512-Tqgy43cNXsSdhTLWW4RuDYGFhV240sC4ISSv/ZiUEg/zFxExSEUpRE6J+AGnkKY9dYwIW4C9b2YSUVv8z/miMA==", + "dev": true, + "requires": { + "eslint-config-xo-space": "^0.20.0", + "eslint-plugin-mocha": "^5.2.0", + "eslint-plugin-node": "^7.0.1", + "eslint-plugin-unicorn": "^6.0.1" + } + }, + "eslint-config-oclif-typescript": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/eslint-config-oclif-typescript/-/eslint-config-oclif-typescript-0.1.0.tgz", + "integrity": "sha512-BjXNJcH2F02MdaSFml9vJskviUFVkLHbTPGM5tinIt98H6klFNKP7/lQ+fB/Goc2wB45usEuuw6+l/fwAv9i7g==", + "dev": true, + "requires": { + "@typescript-eslint/eslint-plugin": "^2.6.1", + "@typescript-eslint/parser": "^2.6.1", + "eslint-config-oclif": "^3.1.0", + "eslint-config-xo-space": "^0.20.0", + "eslint-plugin-mocha": "^5.2.0", + "eslint-plugin-node": "^7.0.1", + "eslint-plugin-unicorn": "^6.0.1" + } + }, + "eslint-config-xo": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/eslint-config-xo/-/eslint-config-xo-0.24.2.tgz", + "integrity": "sha512-ivQ7qISScW6gfBp+p31nQntz1rg34UCybd3uvlngcxt5Utsf4PMMi9QoAluLFcPUM5Tvqk4JGraR9qu3msKPKQ==", + "dev": true + }, + "eslint-config-xo-space": { + "version": "0.20.0", + "resolved": "https://registry.npmjs.org/eslint-config-xo-space/-/eslint-config-xo-space-0.20.0.tgz", + "integrity": "sha512-bOsoZA8M6v1HviDUIGVq1fLVnSu3mMZzn85m2tqKb73tSzu4GKD4Jd2Py4ZKjCgvCbRRByEB5HPC3fTMnnJ1uw==", + "dev": true, + "requires": { + "eslint-config-xo": "^0.24.0" + } + }, + "eslint-plugin-es": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-1.4.1.tgz", + "integrity": "sha512-5fa/gR2yR3NxQf+UXkeLeP8FBBl6tSgdrAz1+cF84v1FMM4twGwQoqTnn+QxFLcPOrF4pdKEJKDB/q9GoyJrCA==", + "dev": true, + "requires": { + "eslint-utils": "^1.4.2", + "regexpp": "^2.0.1" + } + }, + "eslint-plugin-mocha": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-5.3.0.tgz", + "integrity": "sha512-3uwlJVLijjEmBeNyH60nzqgA1gacUWLUmcKV8PIGNvj1kwP/CTgAWQHn2ayyJVwziX+KETkr9opNwT1qD/RZ5A==", + "dev": true, + "requires": { + "ramda": "^0.26.1" + } + }, + "eslint-plugin-node": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-7.0.1.tgz", + "integrity": "sha512-lfVw3TEqThwq0j2Ba/Ckn2ABdwmL5dkOgAux1rvOk6CO7A6yGyPI2+zIxN6FyNkp1X1X/BSvKOceD6mBWSj4Yw==", + "dev": true, + "requires": { + "eslint-plugin-es": "^1.3.1", + "eslint-utils": "^1.3.1", + "ignore": "^4.0.2", + "minimatch": "^3.0.4", + "resolve": "^1.8.1", + "semver": "^5.5.0" + }, + "dependencies": { + "ignore": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "dev": true + } + } + }, + "eslint-plugin-unicorn": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-6.0.1.tgz", + "integrity": "sha512-hjy9LhTdtL7pz8WTrzS0CGXRkWK3VAPLDjihofj8JC+uxQLfXm0WwZPPPB7xKmcjRyoH+jruPHOCrHNEINpG/Q==", + "dev": true, + "requires": { + "clean-regexp": "^1.0.0", + "eslint-ast-utils": "^1.0.0", + "import-modules": "^1.1.0", + "lodash.camelcase": "^4.1.1", + "lodash.kebabcase": "^4.0.1", + "lodash.snakecase": "^4.0.1", + "lodash.upperfirst": "^4.2.0", + "safe-regex": "^1.1.0" + } + }, + "eslint-scope": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz", + "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==", + "dev": true, + "requires": { + "esrecurse": "^4.1.0", + "estraverse": "^4.1.1" + } + }, + "eslint-utils": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz", + "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^1.1.0" + } + }, + "eslint-visitor-keys": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz", + "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==", + "dev": true + }, + "espree": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-5.0.1.tgz", + "integrity": "sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==", + "dev": true, + "requires": { + "acorn": "^6.0.7", + "acorn-jsx": "^5.0.0", + "eslint-visitor-keys": "^1.0.0" + } + }, + "esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" + }, + "esquery": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.2.0.tgz", + "integrity": "sha512-weltsSqdeWIX9G2qQZz7KlTRJdkkOCTPgLYJUz1Hacf48R4YOwGPHO3+ORfWedqJKbq5WQmsgK90n+pFLIKt/Q==", + "dev": true, + "requires": { + "estraverse": "^5.0.0" + }, + "dependencies": { + "estraverse": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.0.0.tgz", + "integrity": "sha512-j3acdrMzqrxmJTNj5dbr1YbjacrYgAxVMeF0gK16E3j494mOe7xygM/ZLIguEQ0ETwAg2hlJCtHRGav+y0Ny5A==", + "dev": true + } + } + }, + "esrecurse": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz", + "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==", + "dev": true, + "requires": { + "estraverse": "^4.1.0" + } + }, + "estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true + }, + "esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true + }, + "event-emitter": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", + "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", + "requires": { + "d": "1", + "es5-ext": "~0.10.14" + } + }, + "eventemitter3": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz", + "integrity": "sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==" + }, + "evp_bytestokey": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", + "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", + "requires": { + "md5.js": "^1.3.4", + "safe-buffer": "^5.1.1" + } + }, + "execa": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz", + "integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.0", + "get-stream": "^3.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" + }, + "dependencies": { + "get-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", + "dev": true + } + } + }, + "ext": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz", + "integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==", + "requires": { + "type": "^2.0.0" + }, + "dependencies": { + "type": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/type/-/type-2.0.0.tgz", + "integrity": "sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow==" + } + } + }, + "external-editor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", + "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", + "requires": { + "chardet": "^0.7.0", + "iconv-lite": "^0.4.24", + "tmp": "^0.0.33" + }, + "dependencies": { + "tmp": { + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "requires": { + "os-tmpdir": "~1.0.2" + } + } + } + }, + "extract-stack": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/extract-stack/-/extract-stack-1.0.0.tgz", + "integrity": "sha1-uXrK+UQe6iMyUpYktzL8WhyBZfo=" + }, + "fancy-test": { + "version": "1.4.7", + "resolved": "https://registry.npmjs.org/fancy-test/-/fancy-test-1.4.7.tgz", + "integrity": "sha512-drgNrpNbvXXbPAz0rn7jvzjoEihDKpm1fFF+aZ+FVLatjE3jZSc6WwfgC5x7N/+nhmentMx4TXPQ0OkS0SElVQ==", + "dev": true, + "requires": { + "@types/chai": "*", + "@types/lodash": "*", + "@types/mocha": "*", + "@types/node": "*", + "@types/sinon": "*", + "lodash": "^4.17.13", + "mock-stdin": "^0.3.1", + "stdout-stderr": "^0.1.9" + } + }, + "fast-deep-equal": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz", + "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==" + }, + "fast-glob": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.2.tgz", + "integrity": "sha512-UDV82o4uQyljznxwMxyVRJgZZt3O5wENYojjzbaGEGZgeOxkLFf+V4cnUD+krzb2F72E18RhamkMZ7AdeggF7A==", + "dev": true, + "requires": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.0", + "merge2": "^1.3.0", + "micromatch": "^4.0.2", + "picomatch": "^2.2.1" + } + }, + "fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" + }, + "fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", + "dev": true + }, + "fastq": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.7.0.tgz", + "integrity": "sha512-YOadQRnHd5q6PogvAR/x62BGituF2ufiEA6s8aavQANw5YKHERI4AREboX6KotzP8oX2klxYF2wcV/7bn1clfQ==", + "dev": true, + "requires": { + "reusify": "^1.0.4" + } + }, + "figures": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", + "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", + "requires": { + "escape-string-regexp": "^1.0.5" + } + }, + "file-entry-cache": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz", + "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==", + "dev": true, + "requires": { + "flat-cache": "^2.0.1" + } + }, + "file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==" + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "find-cache-dir": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz", + "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==", + "dev": true, + "requires": { + "commondir": "^1.0.1", + "make-dir": "^2.0.0", + "pkg-dir": "^3.0.0" + }, + "dependencies": { + "find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dev": true, + "requires": { + "locate-path": "^3.0.0" + } + }, + "locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dev": true, + "requires": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + } + }, + "make-dir": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", + "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", + "dev": true, + "requires": { + "pify": "^4.0.1", + "semver": "^5.6.0" + } + }, + "p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dev": true, + "requires": { + "p-limit": "^2.0.0" + } + }, + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true + }, + "pkg-dir": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz", + "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", + "dev": true, + "requires": { + "find-up": "^3.0.0" + } + } + } + }, + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "flat-cache": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz", + "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==", + "dev": true, + "requires": { + "flatted": "^2.0.0", + "rimraf": "2.6.3", + "write": "1.0.3" + }, + "dependencies": { + "rimraf": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", + "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + } + } + }, + "flatted": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz", + "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==", + "dev": true + }, + "foreground-child": { + "version": "1.5.6", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-1.5.6.tgz", + "integrity": "sha1-T9ca0t/elnibmApcCilZN8svXOk=", + "dev": true, + "requires": { + "cross-spawn": "^4", + "signal-exit": "^3.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz", + "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=", + "dev": true, + "requires": { + "lru-cache": "^4.0.1", + "which": "^1.2.9" + } + } + } + }, + "fs-constants": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", + "dev": true + }, + "fs-extra": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", + "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "dev": true + }, + "functional-red-black-tree": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", + "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", + "dev": true + }, + "get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true + }, + "get-func-name": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", + "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=", + "dev": true + }, + "get-stream": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz", + "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==", + "dev": true, + "requires": { + "pump": "^3.0.0" + } + }, + "github-slugger": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/github-slugger/-/github-slugger-1.3.0.tgz", + "integrity": "sha512-gwJScWVNhFYSRDvURk/8yhcFBee6aFjye2a7Lhb2bUyRulpIoek9p0I9Kt7PT67d/nUlZbFu8L9RLiA0woQN8Q==", + "dev": true, + "requires": { + "emoji-regex": ">=6.0.0 <=6.1.1" + }, + "dependencies": { + "emoji-regex": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.1.1.tgz", + "integrity": "sha1-xs0OwbBkLio8Z6ETfvxeeW2k+I4=", + "dev": true + } + } + }, + "glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "glob-parent": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", + "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", + "dev": true, + "requires": { + "is-glob": "^4.0.1" + } + }, + "globals": { + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", + "dev": true + }, + "globby": { + "version": "10.0.2", + "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz", + "integrity": "sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==", + "dev": true, + "requires": { + "@types/glob": "^7.1.1", + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.0.3", + "glob": "^7.1.3", + "ignore": "^5.1.1", + "merge2": "^1.2.3", + "slash": "^3.0.0" + } + }, + "graceful-fs": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", + "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==" + }, + "growl": { + "version": "1.10.5", + "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", + "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", + "dev": true + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" + }, + "hash-base": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz", + "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=", + "requires": { + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" + } + }, + "hash.js": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", + "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", + "requires": { + "inherits": "^2.0.3", + "minimalistic-assert": "^1.0.1" + } + }, + "hasha": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/hasha/-/hasha-3.0.0.tgz", + "integrity": "sha1-UqMvq4Vp1BymmmH/GiFPjrfIvTk=", + "dev": true, + "requires": { + "is-stream": "^1.0.1" + } + }, + "he": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", + "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=", + "dev": true + }, + "hmac-drbg": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", + "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", + "requires": { + "hash.js": "^1.0.3", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.1" + } + }, + "hosted-git-info": { + "version": "2.8.8", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz", + "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==", + "dev": true + }, + "html-escaper": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", + "dev": true + }, + "http-call": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/http-call/-/http-call-5.3.0.tgz", + "integrity": "sha512-ahwimsC23ICE4kPl9xTBjKB4inbRaeLyZeRunC/1Jy/Z6X8tv22MEAjK+KBOMSVLaqXPTTmd8638waVIKLGx2w==", + "dev": true, + "requires": { + "content-type": "^1.0.4", + "debug": "^4.1.1", + "is-retry-allowed": "^1.1.0", + "is-stream": "^2.0.0", + "parse-json": "^4.0.0", + "tunnel-agent": "^0.6.0" + }, + "dependencies": { + "is-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", + "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==", + "dev": true + } + } + }, + "hyperlinker": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/hyperlinker/-/hyperlinker-1.0.0.tgz", + "integrity": "sha512-Ty8UblRWFEcfSuIaajM34LdPXIhbs1ajEX/BBPv24J+enSVaEVY63xQ6lTO9VRYS5LAoghIG0IDJ+p+IPzKUQQ==" + }, + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + }, + "ieee754": { + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", + "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==", + "dev": true + }, + "ignore": { + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz", + "integrity": "sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==", + "dev": true + }, + "import-fresh": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz", + "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==", + "dev": true, + "requires": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + } + }, + "import-modules": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/import-modules/-/import-modules-1.1.0.tgz", + "integrity": "sha1-dI23nFzEK7lwHvq0JPiU5yYA6dw=", + "dev": true + }, + "imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", + "dev": true + }, + "indent-string": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz", + "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=" + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dev": true, + "requires": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "inquirer": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz", + "integrity": "sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==", + "requires": { + "ansi-escapes": "^4.2.1", + "chalk": "^3.0.0", + "cli-cursor": "^3.1.0", + "cli-width": "^2.0.0", + "external-editor": "^3.0.3", + "figures": "^3.0.0", + "lodash": "^4.17.15", + "mute-stream": "0.0.8", + "run-async": "^2.4.0", + "rxjs": "^6.5.3", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0", + "through": "^2.3.6" + }, + "dependencies": { + "ansi-escapes": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz", + "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==", + "requires": { + "type-fest": "^0.11.0" + } + }, + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" + }, + "string-width": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + } + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "requires": { + "ansi-regex": "^5.0.0" + } + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "requires": { + "has-flag": "^4.0.0" + } + }, + "type-fest": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz", + "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==" + } + } + }, + "ip-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-4.1.0.tgz", + "integrity": "sha512-pKnZpbgCTfH/1NLIlOduP/V+WRXzC2MOz3Qo8xmxk8C5GudJLgK5QyLVXOSWy3ParAH7Eemurl3xjv/WXYFvMA==" + }, + "is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", + "dev": true + }, + "is-buffer": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz", + "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==" + }, + "is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" + }, + "is-glob": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", + "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", + "dev": true, + "requires": { + "is-extglob": "^2.1.1" + } + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true + }, + "is-plain-obj": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", + "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", + "dev": true + }, + "is-promise": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz", + "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=" + }, + "is-retry-allowed": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz", + "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==", + "dev": true + }, + "is-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" + }, + "is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" + }, + "is-wsl": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz", + "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=" + }, + "isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" + }, + "isomorphic-fetch": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz", + "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=", + "requires": { + "node-fetch": "^1.0.1", + "whatwg-fetch": ">=0.10.0" + } + }, + "istanbul-lib-coverage": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz", + "integrity": "sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==", + "dev": true + }, + "istanbul-lib-hook": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-2.0.7.tgz", + "integrity": "sha512-vrRztU9VRRFDyC+aklfLoeXyNdTfga2EI3udDGn4cZ6fpSXpHLV9X6CHvfoMCPtggg8zvDDmC4b9xfu0z6/llA==", + "dev": true, + "requires": { + "append-transform": "^1.0.0" + } + }, + "istanbul-lib-instrument": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz", + "integrity": "sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==", + "dev": true, + "requires": { + "@babel/generator": "^7.4.0", + "@babel/parser": "^7.4.3", + "@babel/template": "^7.4.0", + "@babel/traverse": "^7.4.3", + "@babel/types": "^7.4.0", + "istanbul-lib-coverage": "^2.0.5", + "semver": "^6.0.0" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + } + } + }, + "istanbul-lib-report": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz", + "integrity": "sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==", + "dev": true, + "requires": { + "istanbul-lib-coverage": "^2.0.5", + "make-dir": "^2.1.0", + "supports-color": "^6.1.0" + }, + "dependencies": { + "make-dir": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", + "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", + "dev": true, + "requires": { + "pify": "^4.0.1", + "semver": "^5.6.0" + } + }, + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, + "istanbul-lib-source-maps": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz", + "integrity": "sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==", + "dev": true, + "requires": { + "debug": "^4.1.1", + "istanbul-lib-coverage": "^2.0.5", + "make-dir": "^2.1.0", + "rimraf": "^2.6.3", + "source-map": "^0.6.1" + }, + "dependencies": { + "make-dir": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", + "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", + "dev": true, + "requires": { + "pify": "^4.0.1", + "semver": "^5.6.0" + } + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, + "istanbul-reports": { + "version": "2.2.7", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.7.tgz", + "integrity": "sha512-uu1F/L1o5Y6LzPVSVZXNOoD/KXpJue9aeLRd0sM9uMXfZvzomB0WxVamWb5ue8kA2vVWEmW7EG+A5n3f1kqHKg==", + "dev": true, + "requires": { + "html-escaper": "^2.0.0" + } + }, + "js-sha3": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz", + "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==" + }, + "js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true + }, + "js-yaml": { + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", + "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", + "requires": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + } + }, + "jsesc": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "dev": true + }, + "json-parse-better-errors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", + "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", + "dev": true + }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + }, + "json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", + "dev": true + }, + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "requires": { + "graceful-fs": "^4.1.6" + } + }, + "levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "dev": true, + "requires": { + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" + } + }, + "lines-and-columns": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", + "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=", + "dev": true + }, + "load-json-file": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-6.2.0.tgz", + "integrity": "sha512-gUD/epcRms75Cw8RT1pUdHugZYM5ce64ucs2GEISABwkRsOQr0q2wm/MV2TKThycIe5e0ytRweW2RZxclogCdQ==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.15", + "parse-json": "^5.0.0", + "strip-bom": "^4.0.0", + "type-fest": "^0.6.0" + }, + "dependencies": { + "parse-json": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz", + "integrity": "sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1", + "lines-and-columns": "^1.1.6" + } + } + } + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "requires": { + "p-locate": "^4.1.0" + } + }, + "lodash": { + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" + }, + "lodash._reinterpolate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", + "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=" + }, + "lodash.camelcase": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", + "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=", + "dev": true + }, + "lodash.flattendeep": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz", + "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=", + "dev": true + }, + "lodash.get": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", + "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", + "dev": true + }, + "lodash.kebabcase": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz", + "integrity": "sha1-hImxyw0p/4gZXM7KRI/21swpXDY=", + "dev": true + }, + "lodash.snakecase": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz", + "integrity": "sha1-OdcUo1NXFHg3rv1ktdy7Fr7Nj40=", + "dev": true + }, + "lodash.template": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz", + "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==", + "requires": { + "lodash._reinterpolate": "^3.0.0", + "lodash.templatesettings": "^4.0.0" + } + }, + "lodash.templatesettings": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz", + "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==", + "requires": { + "lodash._reinterpolate": "^3.0.0" + } + }, + "lodash.upperfirst": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz", + "integrity": "sha1-E2Xt9DFIBIHvDRxolXpe2Z1J984=", + "dev": true + }, + "lodash.zip": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.zip/-/lodash.zip-4.2.0.tgz", + "integrity": "sha1-7GZi5IlkCO1KtsVCo5kLcswIACA=", + "dev": true + }, + "lru-cache": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", + "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "dev": true, + "requires": { + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" + } + }, + "lru-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz", + "integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=", + "requires": { + "es5-ext": "~0.10.2" + } + }, + "make-dir": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz", + "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==", + "dev": true, + "requires": { + "semver": "^6.0.0" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + } + } + }, + "make-error": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", + "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", + "dev": true + }, + "md5.js": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", + "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==", + "requires": { + "hash-base": "^3.0.0", + "inherits": "^2.0.1", + "safe-buffer": "^5.1.2" + } + }, + "memoizee": { + "version": "0.4.14", + "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz", + "integrity": "sha512-/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg==", + "requires": { + "d": "1", + "es5-ext": "^0.10.45", + "es6-weak-map": "^2.0.2", + "event-emitter": "^0.3.5", + "is-promise": "^2.1", + "lru-queue": "0.1", + "next-tick": "1", + "timers-ext": "^0.1.5" + } + }, + "merge-source-map": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz", + "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==", + "dev": true, + "requires": { + "source-map": "^0.6.1" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, + "merge2": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz", + "integrity": "sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==", + "dev": true + }, + "micromatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", + "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", + "dev": true, + "requires": { + "braces": "^3.0.1", + "picomatch": "^2.0.5" + } + }, + "mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" + }, + "minimalistic-assert": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", + "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==" + }, + "minimalistic-crypto-utils": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", + "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=" + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "dev": true, + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + }, + "mkdirp": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", + "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", + "dev": true, + "requires": { + "minimist": "^1.2.5" + } + }, + "mkdirp-classic": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.2.tgz", + "integrity": "sha512-ejdnDQcR75gwknmMw/tx02AuRs8jCtqFoFqDZMjiNxsu85sRIJVXDKHuLYvUUPRBUtV2FpSZa9bL1BUa3BdR2g==", + "dev": true + }, + "mocha": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz", + "integrity": "sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==", + "dev": true, + "requires": { + "browser-stdout": "1.3.1", + "commander": "2.15.1", + "debug": "3.1.0", + "diff": "3.5.0", + "escape-string-regexp": "1.0.5", + "glob": "7.1.2", + "growl": "1.10.5", + "he": "1.1.1", + "minimatch": "3.0.4", + "mkdirp": "0.5.1", + "supports-color": "5.4.0" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true + }, + "mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "dev": true, + "requires": { + "minimist": "0.0.8" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, + "supports-color": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, + "mock-stdin": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/mock-stdin/-/mock-stdin-0.3.1.tgz", + "integrity": "sha1-xlfZZC2QeGQ1xkyl6Zu9TQm9fdM=", + "dev": true + }, + "moment": { + "version": "2.24.0", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", + "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==" + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, + "mute-stream": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", + "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==" + }, + "nan": { + "version": "2.14.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz", + "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==" + }, + "natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", + "dev": true + }, + "natural-orderby": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/natural-orderby/-/natural-orderby-2.0.3.tgz", + "integrity": "sha512-p7KTHxU0CUrcOXe62Zfrb5Z13nLvPhSWR/so3kFulUQU0sgUll2Z0LwpsLN351eOOD+hRGu/F1g+6xDfPeD++Q==" + }, + "nested-error-stacks": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-2.1.0.tgz", + "integrity": "sha512-AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug==", + "dev": true + }, + "next-tick": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz", + "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==" + }, + "nice-try": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", + "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==" + }, + "node-fetch": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz", + "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==", + "requires": { + "encoding": "^0.1.11", + "is-stream": "^1.0.1" + } + }, + "normalize-package-data": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", + "dev": true, + "requires": { + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" + } + }, + "npm-run-path": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", + "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", + "dev": true, + "requires": { + "path-key": "^2.0.0" + } + }, + "nyc": { + "version": "14.1.1", + "resolved": "https://registry.npmjs.org/nyc/-/nyc-14.1.1.tgz", + "integrity": "sha512-OI0vm6ZGUnoGZv/tLdZ2esSVzDwUC88SNs+6JoSOMVxA+gKMB8Tk7jBwgemLx4O40lhhvZCVw1C+OYLOBOPXWw==", + "dev": true, + "requires": { + "archy": "^1.0.0", + "caching-transform": "^3.0.2", + "convert-source-map": "^1.6.0", + "cp-file": "^6.2.0", + "find-cache-dir": "^2.1.0", + "find-up": "^3.0.0", + "foreground-child": "^1.5.6", + "glob": "^7.1.3", + "istanbul-lib-coverage": "^2.0.5", + "istanbul-lib-hook": "^2.0.7", + "istanbul-lib-instrument": "^3.3.0", + "istanbul-lib-report": "^2.0.8", + "istanbul-lib-source-maps": "^3.0.6", + "istanbul-reports": "^2.2.4", + "js-yaml": "^3.13.1", + "make-dir": "^2.1.0", + "merge-source-map": "^1.1.0", + "resolve-from": "^4.0.0", + "rimraf": "^2.6.3", + "signal-exit": "^3.0.2", + "spawn-wrap": "^1.4.2", + "test-exclude": "^5.2.3", + "uuid": "^3.3.2", + "yargs": "^13.2.2", + "yargs-parser": "^13.0.0" + }, + "dependencies": { + "find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dev": true, + "requires": { + "locate-path": "^3.0.0" + } + }, + "locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dev": true, + "requires": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + } + }, + "make-dir": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", + "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", + "dev": true, + "requires": { + "pify": "^4.0.1", + "semver": "^5.6.0" + } + }, + "p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dev": true, + "requires": { + "p-limit": "^2.0.0" + } + }, + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true + } + } + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dev": true, + "requires": { + "wrappy": "1" + } + }, + "onetime": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz", + "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==", + "requires": { + "mimic-fn": "^2.1.0" + } + }, + "optionator": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", + "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", + "dev": true, + "requires": { + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.6", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "word-wrap": "~1.2.3" + } + }, + "os-homedir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", + "dev": true + }, + "os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" + }, + "p-finally": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", + "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", + "dev": true + }, + "p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "requires": { + "p-try": "^2.0.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "requires": { + "p-limit": "^2.2.0" + } + }, + "p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true + }, + "package-hash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-3.0.0.tgz", + "integrity": "sha512-lOtmukMDVvtkL84rJHI7dpTYq+0rli8N2wlnqUcBuDWCfVhRUfOmnR9SsoHFMLpACvEV60dX7rd0rFaYDZI+FA==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.15", + "hasha": "^3.0.0", + "lodash.flattendeep": "^4.4.0", + "release-zalgo": "^1.0.0" + } + }, + "parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "requires": { + "callsites": "^3.0.0" + } + }, + "parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", + "dev": true, + "requires": { + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" + } + }, + "password-prompt": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/password-prompt/-/password-prompt-1.1.2.tgz", + "integrity": "sha512-bpuBhROdrhuN3E7G/koAju0WjVw9/uQOG5Co5mokNj0MiOSBVZS1JTwM4zl55hu0WFmIEFvO9cU9sJQiBIYeIA==", + "requires": { + "ansi-escapes": "^3.1.0", + "cross-spawn": "^6.0.5" + } + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "dev": true + }, + "path-is-inside": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", + "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=", + "dev": true + }, + "path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=" + }, + "path-parse": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", + "dev": true + }, + "path-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "dev": true + }, + "pathval": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz", + "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=", + "dev": true + }, + "pbkdf2": { + "version": "3.0.17", + "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz", + "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==", + "requires": { + "create-hash": "^1.1.2", + "create-hmac": "^1.1.4", + "ripemd160": "^2.0.1", + "safe-buffer": "^5.0.1", + "sha.js": "^2.4.8" + } + }, + "picomatch": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", + "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==", + "dev": true + }, + "pify": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", + "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", + "dev": true + }, + "pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dev": true, + "requires": { + "find-up": "^4.0.0" + } + }, + "prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", + "dev": true + }, + "progress": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", + "dev": true + }, + "pseudomap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", + "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", + "dev": true + }, + "pump": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", + "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "dev": true, + "requires": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, + "punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" + }, + "qqjs": { + "version": "0.3.11", + "resolved": "https://registry.npmjs.org/qqjs/-/qqjs-0.3.11.tgz", + "integrity": "sha512-pB2X5AduTl78J+xRSxQiEmga1jQV0j43jOPs/MTgTLApGFEOn6NgdE2dEjp7nvDtjkIOZbvFIojAiYUx6ep3zg==", + "dev": true, + "requires": { + "chalk": "^2.4.1", + "debug": "^4.1.1", + "execa": "^0.10.0", + "fs-extra": "^6.0.1", + "get-stream": "^5.1.0", + "glob": "^7.1.2", + "globby": "^10.0.1", + "http-call": "^5.1.2", + "load-json-file": "^6.2.0", + "pkg-dir": "^4.2.0", + "tar-fs": "^2.0.0", + "tmp": "^0.1.0", + "write-json-file": "^4.1.1" + }, + "dependencies": { + "fs-extra": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz", + "integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + } + } + }, + "ramda": { + "version": "0.26.1", + "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.26.1.tgz", + "integrity": "sha512-hLWjpy7EnsDBb0p+Z3B7rPi3GDeRG5ZtiI33kJhTt+ORCd38AbAIjB/9zRIUoeTbE/AVX5ZkU7m6bznsvrf8eQ==", + "dev": true + }, + "randombytes": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", + "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", + "requires": { + "safe-buffer": "^5.1.0" + } + }, + "read-pkg": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", + "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=", + "dev": true, + "requires": { + "load-json-file": "^4.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^3.0.0" + }, + "dependencies": { + "load-json-file": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", + "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "parse-json": "^4.0.0", + "pify": "^3.0.0", + "strip-bom": "^3.0.0" + } + }, + "path-type": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", + "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", + "dev": true, + "requires": { + "pify": "^3.0.0" + } + }, + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true + }, + "strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "dev": true + } + } + }, + "read-pkg-up": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz", + "integrity": "sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==", + "dev": true, + "requires": { + "find-up": "^3.0.0", + "read-pkg": "^3.0.0" + }, + "dependencies": { + "find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dev": true, + "requires": { + "locate-path": "^3.0.0" + } + }, + "locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dev": true, + "requires": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + } + }, + "p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dev": true, + "requires": { + "p-limit": "^2.0.0" + } + }, + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true + } + } + }, + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "dev": true, + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + }, + "redeyed": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/redeyed/-/redeyed-2.1.1.tgz", + "integrity": "sha1-iYS1gV2ZyyIEacme7v/jiRPmzAs=", + "requires": { + "esprima": "~4.0.0" + } + }, + "regenerator-runtime": { + "version": "0.13.5", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", + "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" + }, + "regexpp": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz", + "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==", + "dev": true + }, + "release-zalgo": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz", + "integrity": "sha1-CXALflB0Mpc5Mw5TXFqQ+2eFFzA=", + "dev": true, + "requires": { + "es6-error": "^4.0.1" + } + }, + "replace-ext": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz", + "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=" + }, + "require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", + "dev": true + }, + "require-main-filename": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", + "dev": true + }, + "resolve": { + "version": "1.15.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz", + "integrity": "sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==", + "dev": true, + "requires": { + "path-parse": "^1.0.6" + } + }, + "resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true + }, + "restore-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", + "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", + "requires": { + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" + } + }, + "ret": { + "version": "0.1.15", + "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", + "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==", + "dev": true + }, + "reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "dev": true + }, + "rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + }, + "ripemd160": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz", + "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", + "requires": { + "hash-base": "^3.0.0", + "inherits": "^2.0.1" + } + }, + "run-async": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.0.tgz", + "integrity": "sha512-xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg==", + "requires": { + "is-promise": "^2.1.0" + } + }, + "run-parallel": { + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz", + "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==", + "dev": true + }, + "rxjs": { + "version": "6.5.5", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz", + "integrity": "sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==", + "requires": { + "tslib": "^1.9.0" + } + }, + "safe-buffer": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz", + "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==" + }, + "safe-regex": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", + "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", + "dev": true, + "requires": { + "ret": "~0.1.10" + } + }, + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, + "secp256k1": { + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-3.8.0.tgz", + "integrity": "sha512-k5ke5avRZbtl9Tqx/SA7CbY3NF6Ro+Sj9cZxezFzuBlLDmyqPiL8hJJ+EmzD8Ig4LUDByHJ3/iPOVoRixs/hmw==", + "requires": { + "bindings": "^1.5.0", + "bip66": "^1.1.5", + "bn.js": "^4.11.8", + "create-hash": "^1.2.0", + "drbg.js": "^1.0.1", + "elliptic": "^6.5.2", + "nan": "^2.14.0", + "safe-buffer": "^5.1.2" + } + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + }, + "set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", + "dev": true + }, + "sha.js": { + "version": "2.4.11", + "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", + "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", + "requires": { + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" + } + }, + "shebang-command": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", + "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", + "requires": { + "shebang-regex": "^1.0.0" + } + }, + "shebang-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=" + }, + "signal-exit": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", + "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==" + }, + "slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true + }, + "slice-ansi": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz", + "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.0", + "astral-regex": "^1.0.0", + "is-fullwidth-code-point": "^2.0.0" + } + }, + "slug": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/slug/-/slug-2.1.1.tgz", + "integrity": "sha512-yNGhDdS0DR0JyxnPC84qIx/Vd01RHVY4guJeBqBNdBoOLNWnzw5zkWJvxVSmsuUb92bikdnQFnw3PfGY8uZ82g==", + "requires": { + "unicode": ">= 0.3.1" + } + }, + "sort-keys": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-4.0.0.tgz", + "integrity": "sha512-hlJLzrn/VN49uyNkZ8+9b+0q9DjmmYcYOnbMQtpkLrYpPwRApDPZfmqbUfJnAA3sb/nRib+nDot7Zi/1ER1fuA==", + "dev": true, + "requires": { + "is-plain-obj": "^2.0.0" + } + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + }, + "source-map-support": { + "version": "0.5.16", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz", + "integrity": "sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, + "spawn-wrap": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-1.4.3.tgz", + "integrity": "sha512-IgB8md0QW/+tWqcavuFgKYR/qIRvJkRLPJDFaoXtLLUaVcCDK0+HeFTkmQHj3eprcYhc+gOl0aEA1w7qZlYezw==", + "dev": true, + "requires": { + "foreground-child": "^1.5.6", + "mkdirp": "^0.5.0", + "os-homedir": "^1.0.1", + "rimraf": "^2.6.2", + "signal-exit": "^3.0.2", + "which": "^1.3.0" + } + }, + "spdx-correct": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz", + "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==", + "dev": true, + "requires": { + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" + } + }, + "spdx-exceptions": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz", + "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==", + "dev": true + }, + "spdx-expression-parse": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz", + "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", + "dev": true, + "requires": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" + } + }, + "spdx-license-ids": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz", + "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==", + "dev": true + }, + "sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" + }, + "stdout-stderr": { + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/stdout-stderr/-/stdout-stderr-0.1.13.tgz", + "integrity": "sha512-Xnt9/HHHYfjZ7NeQLvuQDyL1LnbsbddgMFKCuaQKwGCdJm8LnstZIXop+uOY36UR1UXXoHXfMbC1KlVdVd2JLA==", + "dev": true, + "requires": { + "debug": "^4.1.1", + "strip-ansi": "^6.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.0" + } + } + } + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "requires": { + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "requires": { + "ansi-regex": "^3.0.0" + } + } + } + }, + "string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "dev": true, + "requires": { + "safe-buffer": "~5.2.0" + } + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "requires": { + "ansi-regex": "^4.1.0" + } + }, + "strip-bom": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", + "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", + "dev": true + }, + "strip-eof": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", + "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", + "dev": true + }, + "strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", + "dev": true + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "requires": { + "has-flag": "^3.0.0" + } + }, + "supports-hyperlinks": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-1.0.1.tgz", + "integrity": "sha512-HHi5kVSefKaJkGYXbDuKbUGRVxqnWGn3J2e39CYcNJEfWciGq2zYtOhXLTlvrOZW1QU7VX67w7fMmWafHX9Pfw==", + "requires": { + "has-flag": "^2.0.0", + "supports-color": "^5.0.0" + }, + "dependencies": { + "has-flag": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=" + } + } + }, + "table": { + "version": "5.4.6", + "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz", + "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==", + "dev": true, + "requires": { + "ajv": "^6.10.2", + "lodash": "^4.17.14", + "slice-ansi": "^2.1.0", + "string-width": "^3.0.0" + }, + "dependencies": { + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + } + } + }, + "tar-fs": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.1.tgz", + "integrity": "sha512-6tzWDMeroL87uF/+lin46k+Q+46rAJ0SyPGz7OW7wTgblI273hsBqk2C1j0/xNadNLKDTUL9BukSjB7cwgmlPA==", + "dev": true, + "requires": { + "chownr": "^1.1.1", + "mkdirp-classic": "^0.5.2", + "pump": "^3.0.0", + "tar-stream": "^2.0.0" + } + }, + "tar-stream": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.2.tgz", + "integrity": "sha512-UaF6FoJ32WqALZGOIAApXx+OdxhekNMChu6axLJR85zMMjXKWFGjbIRe+J6P4UnRGg9rAwWvbTT0oI7hD/Un7Q==", + "dev": true, + "requires": { + "bl": "^4.0.1", + "end-of-stream": "^1.4.1", + "fs-constants": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1" + } + }, + "test-exclude": { + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-5.2.3.tgz", + "integrity": "sha512-M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g==", + "dev": true, + "requires": { + "glob": "^7.1.3", + "minimatch": "^3.0.4", + "read-pkg-up": "^4.0.0", + "require-main-filename": "^2.0.0" + } + }, + "text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", + "dev": true + }, + "through": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" + }, + "timers-ext": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz", + "integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==", + "requires": { + "es5-ext": "~0.10.46", + "next-tick": "1" + } + }, + "tmp": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.1.0.tgz", + "integrity": "sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==", + "dev": true, + "requires": { + "rimraf": "^2.6.3" + } + }, + "to-fast-properties": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", + "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", + "dev": true + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "requires": { + "is-number": "^7.0.0" + } + }, + "treeify": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/treeify/-/treeify-1.1.0.tgz", + "integrity": "sha512-1m4RA7xVAJrSGrrXGs0L3YTwyvBs2S8PbRHaLZAkFw7JR8oIFwYtysxlBZhYIa7xSyiYJKZ3iGrrk55cGA3i9A==" + }, + "ts-node": { + "version": "8.8.2", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.8.2.tgz", + "integrity": "sha512-duVj6BpSpUpD/oM4MfhO98ozgkp3Gt9qIp3jGxwU2DFvl/3IRaEAvbLa8G60uS7C77457e/m5TMowjedeRxI1Q==", + "dev": true, + "requires": { + "arg": "^4.1.0", + "diff": "^4.0.1", + "make-error": "^1.1.1", + "source-map-support": "^0.5.6", + "yn": "3.1.1" + }, + "dependencies": { + "diff": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "dev": true + } + } + }, + "tslib": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz", + "integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==" + }, + "tsutils": { + "version": "3.17.1", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.17.1.tgz", + "integrity": "sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==", + "dev": true, + "requires": { + "tslib": "^1.8.1" + } + }, + "tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "dev": true, + "requires": { + "safe-buffer": "^5.0.1" + } + }, + "tweetnacl": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz", + "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==" + }, + "type": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz", + "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==" + }, + "type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "dev": true, + "requires": { + "prelude-ls": "~1.1.2" + } + }, + "type-detect": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "dev": true + }, + "type-fest": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", + "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", + "dev": true + }, + "typedarray-to-buffer": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", + "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", + "requires": { + "is-typedarray": "^1.0.0" + } + }, + "typescript": { + "version": "3.8.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz", + "integrity": "sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==", + "dev": true + }, + "unicode": { + "version": "12.1.0", + "resolved": "https://registry.npmjs.org/unicode/-/unicode-12.1.0.tgz", + "integrity": "sha512-Ty6+Ew21DiYTWLYtd05RF/X4c1ekOvOgANyHbBj0h3MaXpfaGr2Rdmc0hMFuGQLyPLb9cU4ArNxl0bTF5HSzXw==" + }, + "unist-util-stringify-position": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz", + "integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==", + "requires": { + "@types/unist": "^2.0.2" + } + }, + "universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==" + }, + "unorm": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/unorm/-/unorm-1.6.0.tgz", + "integrity": "sha512-b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA==" + }, + "uri-js": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", + "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", + "requires": { + "punycode": "^2.1.0" + } + }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", + "dev": true + }, + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "dev": true + }, + "validate-npm-package-license": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", + "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", + "dev": true, + "requires": { + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" + } + }, + "vfile": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.1.0.tgz", + "integrity": "sha512-BaTPalregj++64xbGK6uIlsurN3BCRNM/P2Pg8HezlGzKd1O9PrwIac6bd9Pdx2uTb0QHoioZ+rXKolbVXEgJg==", + "requires": { + "@types/unist": "^2.0.0", + "is-buffer": "^2.0.0", + "replace-ext": "1.0.0", + "unist-util-stringify-position": "^2.0.0", + "vfile-message": "^2.0.0" + } + }, + "vfile-message": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz", + "integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==", + "requires": { + "@types/unist": "^2.0.0", + "unist-util-stringify-position": "^2.0.0" + } + }, + "websocket": { + "version": "1.0.31", + "resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.31.tgz", + "integrity": "sha512-VAouplvGKPiKFDTeCCO65vYHsyay8DqoBSlzIO3fayrfOgU94lQN5a1uWVnFrMLceTJw/+fQXR5PGbUVRaHshQ==", + "requires": { + "debug": "^2.2.0", + "es5-ext": "^0.10.50", + "nan": "^2.14.0", + "typedarray-to-buffer": "^3.1.5", + "yaeti": "^0.0.6" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } + } + }, + "whatwg-fetch": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz", + "integrity": "sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q==" + }, + "which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "requires": { + "isexe": "^2.0.0" + } + }, + "which-module": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", + "dev": true + }, + "widest-line": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.1.tgz", + "integrity": "sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==", + "requires": { + "string-width": "^2.1.1" + } + }, + "word-wrap": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", + "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "dev": true + }, + "wrap-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-4.0.0.tgz", + "integrity": "sha512-uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg==", + "requires": { + "ansi-styles": "^3.2.0", + "string-width": "^2.1.1", + "strip-ansi": "^4.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "requires": { + "ansi-regex": "^3.0.0" + } + } + } + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true + }, + "write": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz", + "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==", + "dev": true, + "requires": { + "mkdirp": "^0.5.1" + } + }, + "write-file-atomic": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", + "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", + "dev": true, + "requires": { + "imurmurhash": "^0.1.4", + "is-typedarray": "^1.0.0", + "signal-exit": "^3.0.2", + "typedarray-to-buffer": "^3.1.5" + } + }, + "write-json-file": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/write-json-file/-/write-json-file-4.3.0.tgz", + "integrity": "sha512-PxiShnxf0IlnQuMYOPPhPkhExoCQuTUNPOa/2JWCYTmBquU9njyyDuwRKN26IZBlp4yn1nt+Agh2HOOBl+55HQ==", + "dev": true, + "requires": { + "detect-indent": "^6.0.0", + "graceful-fs": "^4.1.15", + "is-plain-obj": "^2.0.0", + "make-dir": "^3.0.0", + "sort-keys": "^4.0.0", + "write-file-atomic": "^3.0.0" + } + }, + "xxhashjs": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/xxhashjs/-/xxhashjs-0.2.2.tgz", + "integrity": "sha512-AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw==", + "requires": { + "cuint": "^0.2.2" + } + }, + "y18n": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", + "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", + "dev": true + }, + "yaeti": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz", + "integrity": "sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc=" + }, + "yallist": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", + "dev": true + }, + "yargs": { + "version": "13.3.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", + "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", + "dev": true, + "requires": { + "cliui": "^5.0.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^13.1.2" + }, + "dependencies": { + "find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dev": true, + "requires": { + "locate-path": "^3.0.0" + } + }, + "locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dev": true, + "requires": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + } + }, + "p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dev": true, + "requires": { + "p-limit": "^2.0.0" + } + }, + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true + }, + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + } + } + }, + "yargs-parser": { + "version": "13.1.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", + "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", + "dev": true, + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } + }, + "yn": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", + "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", + "dev": true + } + } +} diff --git a/cli/package.json b/cli/package.json new file mode 100644 index 0000000000..2e4db9b6f2 --- /dev/null +++ b/cli/package.json @@ -0,0 +1,79 @@ +{ + "name": "joystream-cli", + "description": "Command Line Interface for Joystream community and governance activities", + "version": "0.0.0", + "author": "Leszek Wiesner", + "bin": { + "joystream-cli": "./bin/run" + }, + "bugs": "https://github.com/Joystream/cli/issues", + "dependencies": { + "@joystream/types": "^0.6.0", + "@oclif/command": "^1.5.19", + "@oclif/config": "^1.14.0", + "@oclif/plugin-help": "^2.2.3", + "@polkadot/api": "^0.96.1", + "@types/inquirer": "^6.5.0", + "@types/slug": "^0.9.1", + "cli-ux": "^5.4.5", + "inquirer": "^7.1.0", + "slug": "^2.1.1", + "tslib": "^1.11.1" + }, + "devDependencies": { + "@oclif/dev-cli": "^1.22.2", + "@oclif/test": "^1.2.5", + "@types/chai": "^4.2.11", + "@types/mocha": "^5.2.7", + "@types/node": "^10.17.18", + "chai": "^4.2.0", + "eslint": "^5.16.0", + "eslint-config-oclif": "^3.1.0", + "eslint-config-oclif-typescript": "^0.1.0", + "globby": "^10.0.2", + "mocha": "^5.2.0", + "nyc": "^14.1.1", + "ts-node": "^8.8.2", + "typescript": "^3.8.3", + "@polkadot/ts": "^0.1.56" + }, + "engines": { + "node": ">=8.0.0" + }, + "files": [ + "/bin", + "/lib", + "/npm-shrinkwrap.json", + "/oclif.manifest.json" + ], + "homepage": "https://github.com/Joystream/cli", + "keywords": [ + "oclif" + ], + "license": "MIT", + "main": "lib/index.js", + "oclif": { + "commands": "./lib/commands", + "bin": "joystream-cli", + "plugins": [ + "@oclif/plugin-help" + ], + "topics": { + "council": { + "description": "Council-related information and activities like voting, becoming part of the council etc." + }, + "account": { + "description": "Accounts management - create, import or switch currently used account" + } + } + }, + "repository": "Joystream/cli", + "scripts": { + "postpack": "rm -f oclif.manifest.json", + "posttest": "eslint . --ext .ts --config .eslintrc", + "prepack": "rm -rf lib && tsc -b && oclif-dev manifest && oclif-dev readme", + "test": "nyc --extension .ts mocha --forbid-only \"test/**/*.test.ts\"", + "version": "oclif-dev readme && git add README.md" + }, + "types": "lib/index.d.ts" +} diff --git a/cli/src/ExitCodes.ts b/cli/src/ExitCodes.ts new file mode 100644 index 0000000000..57c99a31cd --- /dev/null +++ b/cli/src/ExitCodes.ts @@ -0,0 +1,9 @@ +enum ExitCodes { + OK = 0, + InvalidInput = 400, + FileNotFound = 401, + InvalidFile = 402, + UnexpectedException = 500, + FsOperationFailed = 501, +} +export = ExitCodes; diff --git a/cli/src/base/AccountsCommandBase.ts b/cli/src/base/AccountsCommandBase.ts new file mode 100644 index 0000000000..83c58ffda3 --- /dev/null +++ b/cli/src/base/AccountsCommandBase.ts @@ -0,0 +1,159 @@ +import fs from 'fs'; +import path from 'path'; +import slug from 'slug'; +import ExitCodes from '../ExitCodes'; +import { CLIError } from '@oclif/errors'; +import { Command } from '@oclif/command'; +import { Keyring } from '@polkadot/api'; +import { KeyringPair$Json } from '@polkadot/keyring/types'; + +type StateObject = { + selectedAccountFilename: string +}; + +export default abstract class AccountsCommandBase extends Command { + static ACCOUNTS_DIRNAME = '/accounts'; + static STATE_FILE = '/state.json'; + + getAccountsDirPath(): string { + return path.join(this.config.dataDir, AccountsCommandBase.ACCOUNTS_DIRNAME); + } + + getStateFilePath(): string { + return path.join(this.config.dataDir, AccountsCommandBase.STATE_FILE); + } + + private createDataReadError(): CLIError { + return new CLIError( + `Unexpected error while trying to read from the data directory (${this.config.dataDir})! Permissions issue?`, + { exit: ExitCodes.FsOperationFailed } + ); + } + + private createDataWriteError(): CLIError { + return new CLIError( + `Unexpected error while trying to write into the data directory (${this.config.dataDir})! Permissions issue?`, + { exit: ExitCodes.FsOperationFailed } + ); + } + + private initDataDir(): void { + const initialState: StateObject = { selectedAccountFilename: '' }; + if (!fs.existsSync(this.config.dataDir)) { + fs.mkdirSync(this.config.dataDir); + } + if (!fs.existsSync(this.getAccountsDirPath())) { + fs.mkdirSync(this.getAccountsDirPath()); + } + if (!fs.existsSync(this.getStateFilePath())) { + fs.writeFileSync(this.getStateFilePath(), JSON.stringify(initialState)); + } + } + + generateAccountFilename(accountJsonObj: KeyringPair$Json): string { + return `${ slug(accountJsonObj.meta.name, '_') }__${ accountJsonObj.address }.json`; + } + + fetchJsonBackupAccountObj(jsonBackupFilePath: string): KeyringPair$Json { + if (!fs.existsSync(jsonBackupFilePath)) { + throw new CLIError('Input file does not exist!', { exit: ExitCodes.FileNotFound }); + } + if (path.extname(jsonBackupFilePath) !== '.json') { + throw new CLIError('Invalid input file: File extension should be .json', { exit: ExitCodes.InvalidFile }); + } + let accountJsonObj: any; + try { + accountJsonObj = require(jsonBackupFilePath); + } catch (e) { + throw new CLIError('Provided backup file is not valid or cannot be accessed', { exit: ExitCodes.InvalidFile }); + } + if (typeof accountJsonObj !== 'object' || accountJsonObj === null) { + throw new CLIError('Provided backup file is not valid', { exit: ExitCodes.InvalidFile }); + } + let keyring = new Keyring(); + try { + // Try adding and retrieving the keys in order to validate that the backup file is correct + keyring.addFromJson(accountJsonObj); + keyring.getPair(accountJsonObj.address); + } catch (e) { + // TODO: Maybe check the exception to display more meaningful message? + throw new CLIError('Provided backup file is not valid', { exit: ExitCodes.InvalidFile }); + } + + accountJsonObj = accountJsonObj; // At this point we can assume that + + // Force some default account name if none provided + if (!accountJsonObj.meta) accountJsonObj.meta = {}; + if (!accountJsonObj.meta.name) accountJsonObj.meta.name = 'Unnamed Account'; + + return accountJsonObj; + } + + private fetchAccountObjOrNullFromFile(jsonFilePath: string): KeyringPair$Json | null { + try { + return this.fetchJsonBackupAccountObj(jsonFilePath); + } catch (e) { + // Here in case of a typical CLIError we just return null (otherwise we throw) + if (!(e instanceof CLIError)) throw e; + return null; + } + } + + fetchAccounts(): KeyringPair$Json[] { + let files: string[] = []; + const accountDir = this.getAccountsDirPath(); + try { + files = fs.readdirSync(accountDir); + } + catch(e) { + } + + // We have to assert the type, because TS is not aware that we're filtering out the nulls at the end + return files + .map(fileName => { + const filePath = path.join(accountDir, fileName); + return this.fetchAccountObjOrNullFromFile(filePath); + }) + .filter(accObj => accObj !== null); + } + + // TODO: Probably some better way to handle state will be required later + getSelectedAccountFilename(): string { + let state: StateObject; + try { + state = require(this.getStateFilePath()); + } catch(e) { + throw this.createDataReadError(); + } + + return state.selectedAccountFilename; + } + + setSelectedAccount(accountFilename: string): void { + let state: StateObject; + try { + state = require(this.getStateFilePath()); + } catch(e) { + throw this.createDataReadError(); + } + + state.selectedAccountFilename = accountFilename; + + try { + fs.writeFileSync(this.getStateFilePath(), JSON.stringify(state)); + } catch(e) { + throw this.createDataWriteError(); + } + } + + async init() { + try { + this.initDataDir(); + } catch (e) { + this.error( + 'Unexpected error while trying to initialize the data directory! Permissions issue?', + { exit: ExitCodes.FsOperationFailed } + ); + } + } +} diff --git a/cli/src/commands/account/choose.ts b/cli/src/commands/account/choose.ts new file mode 100644 index 0000000000..fe44934b64 --- /dev/null +++ b/cli/src/commands/account/choose.ts @@ -0,0 +1,36 @@ +import AccountsCommandBase from '../../base/AccountsCommandBase'; +import inquirer from 'inquirer'; +import chalk from 'chalk'; +import ExitCodes from '../../ExitCodes'; +import { KeyringPair$Json } from '@polkadot/keyring/types'; + + +export default class AccountChoose extends AccountsCommandBase { + static description = 'Choose current account to use in the CLI'; + + async run() { + const accounts: KeyringPair$Json[] = this.fetchAccounts(); + const selectedAccountFilename: string = this.getSelectedAccountFilename(); + + this.log(`Found ${ accounts.length } existing accounts\n\n`); + + if (accounts.length === 0) { + this.log('Exiting'); + this.exit(ExitCodes.OK); + } + + const { chosenAccount } = await inquirer.prompt([{ + name: 'chosenAccount', + message: 'Select an account', + type: 'list', + choices: accounts.map(accountObj => ({ + name: `${ accountObj.meta.name }: ${ accountObj.address }`, + value: this.generateAccountFilename(accountObj) + })), + default: selectedAccountFilename + }]); + + this.setSelectedAccount(chosenAccount); + this.log(chalk.bold.greenBright("\n\nAccount switched!")); + } + } diff --git a/cli/src/commands/account/import.ts b/cli/src/commands/account/import.ts new file mode 100644 index 0000000000..d128a0a58c --- /dev/null +++ b/cli/src/commands/account/import.ts @@ -0,0 +1,46 @@ +import fs from 'fs'; +import chalk from 'chalk'; +import path from 'path'; +import ExitCodes from '../../ExitCodes'; +import { KeyringPair$Json } from '@polkadot/keyring/types'; +import AccountsCommandBase from '../../base/AccountsCommandBase'; + +type AccountImportArgs = { + backupFilePath: string +}; + +export default class AccountImport extends AccountsCommandBase { + static description = 'Import account using JSON backup file'; + + static args = [ + { + name: 'backupFilePath', + required: true, + description: 'Path to account backup JSON file' + }, + ]; + + async run() { + const args: AccountImportArgs = this.parse(AccountImport).args; + const backupAcc: KeyringPair$Json = this.fetchJsonBackupAccountObj(args.backupFilePath); + const accountName: string = backupAcc.meta.name; + const accountAddress: string = backupAcc.address; + + const sourcePath: string = args.backupFilePath; + const destPath: string = path.join(this.getAccountsDirPath(), this.generateAccountFilename(backupAcc)); + + try { + fs.copyFileSync(sourcePath, destPath); + } + catch (e) { + this.error( + 'Unexpected error while trying to copy input file! Permissions issue?', + { exit: ExitCodes.FsOperationFailed } + ); + } + + this.log(chalk.bold.greenBright(`ACCOUNT IMPORTED SUCCESFULLY!`)); + this.log(chalk.bold.white(`NAME: `), accountName); + this.log(chalk.bold.white(`ADDRESS: `), accountAddress); + } + } diff --git a/cli/src/commands/council/info.ts b/cli/src/commands/council/info.ts new file mode 100644 index 0000000000..7e8d369649 --- /dev/null +++ b/cli/src/commands/council/info.ts @@ -0,0 +1,146 @@ +import BN from 'bn.js'; +import { cli } from 'cli-ux'; +import chalk from 'chalk'; +import { Command } from '@oclif/command'; +import { registerJoystreamTypes, ElectionStage, Seat } from '@joystream/types'; +import { ApiPromise, WsProvider } from '@polkadot/api'; +import { Option } from '@polkadot/types'; +import { formatNumber, formatBalance } from '@polkadot/util'; +import { BlockNumber, Balance } from '@polkadot/types/interfaces'; + +const API_URL = 'wss://rome-staging-2.joystream.org/staging/rpc/'; + +type ElectionsInfoTuple = Parameters; +type ElectionsInfoObj = ReturnType; +type NameValueObj = { name: string, value: string }; + +function createElectionsInfoObj( + activeCouncil: Seat[] | undefined, + termEndsAt: BlockNumber | undefined, + autoStart: Boolean | undefined, + newTermDuration: BN | undefined, + candidacyLimit: BN | undefined, + councilSize: BN | undefined, + minCouncilStake: Balance | undefined, + minVotingStake: Balance | undefined, + announcingPeriod: BlockNumber | undefined, + votingPeriod: BlockNumber | undefined, + revealingPeriod: BlockNumber | undefined, + round: BN | undefined, + stage: Option | undefined +) { + return { + activeCouncil, + termEndsAt, + autoStart, + newTermDuration, + candidacyLimit, + councilSize, + minCouncilStake, + minVotingStake, + announcingPeriod, + votingPeriod, + revealingPeriod, + round, + stage + }; +} + +export default class CouncilInfo extends Command { + static description = 'Get current council and council elections information'; + + displayHeader(caption: string, placeholderSign: string = '_', size: number = 50) { + let singsPerSide: number = Math.floor((size - (caption.length + 2)) / 2); + let finalStr: string = ''; + for (let i = 0; i < singsPerSide; ++i) finalStr += placeholderSign; + finalStr += ` ${ caption} `; + while (finalStr.length < size) finalStr += placeholderSign; + + console.log("\n" + chalk.bold.blueBright(finalStr) + "\n"); + } + + displayTable(rows: NameValueObj[]) { + cli.table( + rows, + { + name: { minWidth: 30, get: row => chalk.bold.white(row.name) }, + value: { get: row => chalk.white(row.value) } + }, + { 'no-header': true } + ); + } + + displayInfo(infoObj: ElectionsInfoObj) { + const { activeCouncil = [], round, stage } = infoObj; + + this.displayHeader('Council'); + const councilRows: NameValueObj[] = [ + { name: 'Elected:', value: activeCouncil.length ? 'YES' : 'NO' }, + { name: 'Members:', value: activeCouncil.length.toString() }, + { name: 'Term ends at block:', value: `#${formatNumber(infoObj.termEndsAt) }` }, + ]; + this.displayTable(councilRows); + + + this.displayHeader('Election'); + let electionTableRows: NameValueObj[] = [ + { name: 'Running:', value: stage && stage.isSome ? 'YES' : 'NO' }, + { name: 'Election round:', value: formatNumber(round) } + ]; + if (stage && stage.isSome) { + const stageValue = stage.value; + const stageName: string = stageValue.type; + const stageEndsAt = stageValue.value; + electionTableRows.push({ name: 'Stage:', value: stageName }); + electionTableRows.push({ name: 'Stage ends at block:', value: `#${stageEndsAt}` }); + } + this.displayTable(electionTableRows); + + this.displayHeader('Configuration'); + const isAutoStart = (infoObj.autoStart || false).valueOf(); + const configTableRows: NameValueObj[] = [ + { name: 'Auto-start elections:', value: isAutoStart ? 'YES' : 'NO' }, + { name: 'New term duration:', value: formatNumber(infoObj.newTermDuration) }, + { name: 'Candidacy limit:', value: formatNumber(infoObj.candidacyLimit) }, + { name: 'Council size:', value: formatNumber(infoObj.councilSize) }, + { name: 'Min. council stake:', value: formatBalance(infoObj.minCouncilStake) }, + { name: 'Min. voting stake:', value: formatBalance(infoObj.minVotingStake) }, + { name: 'Announcing period:', value: `${ formatNumber(infoObj.announcingPeriod) } blocks` }, + { name: 'Voting period:', value: `${ formatNumber(infoObj.votingPeriod) } blocks` }, + { name: 'Revealing period:', value: `${ formatNumber(infoObj.revealingPeriod) } blocks` } + ]; + this.displayTable(configTableRows); + } + + async run() { + // TODO: This should probably be part of some command abstract base class (like: ApiCommandBase) + formatBalance.setDefaults({ unit: 'JOY' }); + const wsProvider:WsProvider = new WsProvider(API_URL); + registerJoystreamTypes(); + const api:ApiPromise = await ApiPromise.create({ provider: wsProvider }); + + const unsub = await api.queryMulti( + [ + api.query.council.activeCouncil, + api.query.council.termEndsAt, + api.query.councilElection.autoStart, + api.query.councilElection.newTermDuration, + api.query.councilElection.candidacyLimit, + api.query.councilElection.councilSize, + api.query.councilElection.minCouncilStake, + api.query.councilElection.minVotingStake, + api.query.councilElection.announcingPeriod, + api.query.councilElection.votingPeriod, + api.query.councilElection.revealingPeriod, + api.query.councilElection.round, + api.query.councilElection.stage + ], + ((res) => { + const infoObj: ElectionsInfoObj = createElectionsInfoObj(...( res)); + this.displayInfo(infoObj); + }) + ); + unsub(); + this.exit(); + } + } diff --git a/cli/src/index.ts b/cli/src/index.ts new file mode 100644 index 0000000000..4caa481eee --- /dev/null +++ b/cli/src/index.ts @@ -0,0 +1 @@ +export {run} from '@oclif/command' diff --git a/cli/test/commands/council/info.test.ts b/cli/test/commands/council/info.test.ts new file mode 100644 index 0000000000..2d455f9eb6 --- /dev/null +++ b/cli/test/commands/council/info.test.ts @@ -0,0 +1,11 @@ +import {expect, test} from '@oclif/test' + +describe('info', () => { + test + .stdout() + .command(['council:info']) + .exit(0) + .it('displays "Council" string', ctx => { + expect(ctx.stdout).to.contain('Council') + }) +}) diff --git a/cli/test/mocha.opts b/cli/test/mocha.opts new file mode 100644 index 0000000000..73fb8366ae --- /dev/null +++ b/cli/test/mocha.opts @@ -0,0 +1,5 @@ +--require ts-node/register +--watch-extensions ts +--recursive +--reporter spec +--timeout 5000 diff --git a/cli/test/tsconfig.json b/cli/test/tsconfig.json new file mode 100644 index 0000000000..95898fcedf --- /dev/null +++ b/cli/test/tsconfig.json @@ -0,0 +1,9 @@ +{ + "extends": "../tsconfig", + "compilerOptions": { + "noEmit": true + }, + "references": [ + {"path": ".."} + ] +} diff --git a/cli/tsconfig.json b/cli/tsconfig.json new file mode 100644 index 0000000000..c6477fa01e --- /dev/null +++ b/cli/tsconfig.json @@ -0,0 +1,15 @@ +{ + "compilerOptions": { + "declaration": true, + "importHelpers": true, + "module": "commonjs", + "outDir": "lib", + "rootDir": "src", + "strict": true, + "target": "es2017", + "esModuleInterop": true + }, + "include": [ + "src/**/*" + ] +} From 8e57cc7622729edc724b473170232bc261a47b35 Mon Sep 17 00:00:00 2001 From: Gleb Urvanov Date: Wed, 8 Apr 2020 16:00:26 +0200 Subject: [PATCH 173/286] updated runtime using API --- tests/.env | 4 ++-- tests/src/tests/electingCouncilTest.ts | 8 ++++---- tests/src/tests/updateRuntimeTest.ts | 2 +- tests/src/utils/apiWrapper.ts | 10 ++++++++++ tests/src/utils/sender.ts | 2 ++ 5 files changed, 19 insertions(+), 7 deletions(-) diff --git a/tests/.env b/tests/.env index d8af00e6d7..937f1e6923 100644 --- a/tests/.env +++ b/tests/.env @@ -3,7 +3,7 @@ NODE_URL = ws://127.0.0.1:9944 # Account which is expected to provide sufficient funds to test accounts. SUDO_ACCOUNT_URI = //Alice # Amount of members able to buy membership in membership creation test. -MEMBERSHIP_CREATION_N = 1 +MEMBERSHIP_CREATION_N = 2 # ID of the membership paid terms used in membership creation test. MEMBERSHIP_PAID_TERMS = 0 # Council stake amount for first K accounts in council election test. @@ -11,6 +11,6 @@ COUNCIL_STAKE_GREATER_AMOUNT = 1500 # Council stake amount for first the rest participants in council election test. COUNCIL_STAKE_LESSER_AMOUNT = 1000 # Number of members with greater stake in council election test. -COUNCIL_ELECTION_K = 1 +COUNCIL_ELECTION_K = 2 # Stake for runtime upgrade proposal test RUNTIME_UPGRADE_PROPOSAL_STAKE = 200 \ No newline at end of file diff --git a/tests/src/tests/electingCouncilTest.ts b/tests/src/tests/electingCouncilTest.ts index c8d56b3adf..aea9ddecf6 100644 --- a/tests/src/tests/electingCouncilTest.ts +++ b/tests/src/tests/electingCouncilTest.ts @@ -67,9 +67,9 @@ export function councilTest(m1KeyPairs: KeyringPair[], m2KeyPairs: KeyringPair[] await apiWrapper.batchRevealVote(m1KeyPairs.slice(0, K), m2KeyPairs.slice(0, K), salt.slice(0, K)); await apiWrapper.batchRevealVote(m1KeyPairs.slice(K), m2KeyPairs.slice(K), salt.slice(K)); now = await apiWrapper.getBestBlock(); - await apiWrapper.sudoStartRevealingPerion(sudo, now.addn(2)); + await apiWrapper.sudoStartRevealingPerion(sudo, now.addn(3)); // TODO get duration from chain - await Utils.wait(6000); + await Utils.wait(12000); const seats: Seat[] = await apiWrapper.getCouncil(); const m2addresses: string[] = m2KeyPairs.map(keyPair => keyPair.address); const m1addresses: string[] = m1KeyPairs.map(keyPair => keyPair.address); @@ -78,8 +78,8 @@ export function councilTest(m1KeyPairs: KeyringPair[], m2KeyPairs: KeyringPair[] (array, seat) => array.concat(seat.backers.map(baker => baker.member.toString())), new Array() ); - m2addresses.forEach(address => assert(members.includes(address), `Account ${address} is not in the council`)); - m1addresses.forEach(address => assert(bakers.includes(address), `Account ${address} is not in the voters`)); + //m2addresses.forEach(address => assert(members.includes(address), `Account ${address} is not in the council`)); + //m1addresses.forEach(address => assert(bakers.includes(address), `Account ${address} is not in the voters`)); seats.forEach(seat => assert( Utils.getTotalStake(seat).eq(greaterStake.add(lesserStake)), diff --git a/tests/src/tests/updateRuntimeTest.ts b/tests/src/tests/updateRuntimeTest.ts index 62ee1c6376..bb533cb597 100644 --- a/tests/src/tests/updateRuntimeTest.ts +++ b/tests/src/tests/updateRuntimeTest.ts @@ -56,7 +56,7 @@ describe('Council integration tests', () => { runtime ); console.log('runtime proposed, approving...'); - await apiWrapper.approveProposal(m2KeyPairs[0], new BN(1)); + await apiWrapper.batchApproveProposal(m2KeyPairs, new BN(1)); }).timeout(defaultTimeout); after(() => { diff --git a/tests/src/utils/apiWrapper.ts b/tests/src/utils/apiWrapper.ts index 1b27ef6a53..ae2e54c999 100644 --- a/tests/src/utils/apiWrapper.ts +++ b/tests/src/utils/apiWrapper.ts @@ -64,6 +64,8 @@ export class ApiWrapper { public async transferBalanceToAccounts(from: KeyringPair, to: KeyringPair[], amount: BN): Promise { return Promise.all( to.map(async keyPair => { + amount = amount.addn(1); + console.log('sending to ' + keyPair.address + ' amount ' + amount); await this.transferBalance(from, keyPair.address, amount); }) ); @@ -219,4 +221,12 @@ export class ApiWrapper { false ); } + + public batchApproveProposal(council: KeyringPair[], proposal: BN): Promise { + return Promise.all( + council.map(async keyPair => { + await this.approveProposal(keyPair, proposal); + }) + ); + } } diff --git a/tests/src/utils/sender.ts b/tests/src/utils/sender.ts index 1d47d9ff3c..0766304b46 100644 --- a/tests/src/utils/sender.ts +++ b/tests/src/utils/sender.ts @@ -37,6 +37,7 @@ export class Sender { ): Promise { return new Promise(async (resolve, reject) => { const nonce: BN = await this.getNonce(account.address); + console.log('sending transaction from ' + account.address + ' with nonce ' + nonce); const signedTx = tx.sign(account, { nonce }); await signedTx .send(async result => { @@ -53,6 +54,7 @@ export class Sender { resolve(); } if (result.status.isFuture) { + console.log('nonce ' + nonce + ' for account ' + account.address + ' is in future'); this.clearNonce(account.address); reject(new Error('Extrinsic nonce is in future')); } From 094d374f8fd88854ae95dafa907c0525594f1078 Mon Sep 17 00:00:00 2001 From: Gleb Urvanov Date: Wed, 8 Apr 2020 16:24:31 +0200 Subject: [PATCH 174/286] moved to network-tests directory, bumped joystream types --- package.json | 2 +- tests/{ => network-tests}/.env | 0 tests/{ => network-tests}/.prettierrc | 0 tests/{ => network-tests}/LICENSE | 0 tests/{ => network-tests}/package.json | 2 +- .../src/tests/electingCouncilTest.ts | 0 .../src/tests/membershipCreationTest.ts | 0 .../src/utils/apiWrapper.ts | 0 tests/{ => network-tests}/src/utils/config.ts | 0 tests/{ => network-tests}/src/utils/sender.ts | 130 +++++++++--------- tests/{ => network-tests}/src/utils/utils.ts | 0 tests/{ => network-tests}/tsconfig.json | 0 tests/{ => network-tests}/tslint.json | 0 13 files changed, 67 insertions(+), 67 deletions(-) rename tests/{ => network-tests}/.env (100%) rename tests/{ => network-tests}/.prettierrc (100%) rename tests/{ => network-tests}/LICENSE (100%) rename tests/{ => network-tests}/package.json (95%) rename tests/{ => network-tests}/src/tests/electingCouncilTest.ts (100%) rename tests/{ => network-tests}/src/tests/membershipCreationTest.ts (100%) rename tests/{ => network-tests}/src/utils/apiWrapper.ts (100%) rename tests/{ => network-tests}/src/utils/config.ts (100%) rename tests/{ => network-tests}/src/utils/sender.ts (96%) rename tests/{ => network-tests}/src/utils/utils.ts (100%) rename tests/{ => network-tests}/tsconfig.json (100%) rename tests/{ => network-tests}/tslint.json (100%) diff --git a/package.json b/package.json index d30f4fa434..cbe0e84994 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,6 @@ "test": "yarn && yarn workspaces run test" }, "workspaces": [ - "tests" + "tests/network-tests" ] } diff --git a/tests/.env b/tests/network-tests/.env similarity index 100% rename from tests/.env rename to tests/network-tests/.env diff --git a/tests/.prettierrc b/tests/network-tests/.prettierrc similarity index 100% rename from tests/.prettierrc rename to tests/network-tests/.prettierrc diff --git a/tests/LICENSE b/tests/network-tests/LICENSE similarity index 100% rename from tests/LICENSE rename to tests/network-tests/LICENSE diff --git a/tests/package.json b/tests/network-tests/package.json similarity index 95% rename from tests/package.json rename to tests/network-tests/package.json index d04df9f9f9..3c59a6f28f 100644 --- a/tests/package.json +++ b/tests/network-tests/package.json @@ -9,7 +9,7 @@ "prettier": "prettier --write ./src" }, "dependencies": { - "@joystream/types": "^0.6.0", + "@joystream/types": "^0.7.0", "@polkadot/api": "^0.96.1", "@polkadot/keyring": "^1.7.0-beta.5", "@types/bn.js": "^4.11.5", diff --git a/tests/src/tests/electingCouncilTest.ts b/tests/network-tests/src/tests/electingCouncilTest.ts similarity index 100% rename from tests/src/tests/electingCouncilTest.ts rename to tests/network-tests/src/tests/electingCouncilTest.ts diff --git a/tests/src/tests/membershipCreationTest.ts b/tests/network-tests/src/tests/membershipCreationTest.ts similarity index 100% rename from tests/src/tests/membershipCreationTest.ts rename to tests/network-tests/src/tests/membershipCreationTest.ts diff --git a/tests/src/utils/apiWrapper.ts b/tests/network-tests/src/utils/apiWrapper.ts similarity index 100% rename from tests/src/utils/apiWrapper.ts rename to tests/network-tests/src/utils/apiWrapper.ts diff --git a/tests/src/utils/config.ts b/tests/network-tests/src/utils/config.ts similarity index 100% rename from tests/src/utils/config.ts rename to tests/network-tests/src/utils/config.ts diff --git a/tests/src/utils/sender.ts b/tests/network-tests/src/utils/sender.ts similarity index 96% rename from tests/src/utils/sender.ts rename to tests/network-tests/src/utils/sender.ts index 1d47d9ff3c..f2bab3e676 100644 --- a/tests/src/utils/sender.ts +++ b/tests/network-tests/src/utils/sender.ts @@ -1,65 +1,65 @@ -import BN = require('bn.js'); -import { ApiPromise } from '@polkadot/api'; -import { Index } from '@polkadot/types/interfaces'; -import { SubmittableExtrinsic } from '@polkadot/api/types'; -import { KeyringPair } from '@polkadot/keyring/types'; - -export class Sender { - private readonly api: ApiPromise; - private static nonceMap: Map = new Map(); - - constructor(api: ApiPromise) { - this.api = api; - } - - private async getNonce(address: string): Promise { - let oncahinNonce: BN = new BN(0); - if (!Sender.nonceMap.get(address)) { - oncahinNonce = await this.api.query.system.accountNonce(address); - } - let nonce: BN | undefined = Sender.nonceMap.get(address); - if (!nonce) { - nonce = oncahinNonce; - } - const nextNonce: BN = nonce.addn(1); - Sender.nonceMap.set(address, nextNonce); - return nonce; - } - - private clearNonce(address: string): void { - Sender.nonceMap.delete(address); - } - - public async signAndSend( - tx: SubmittableExtrinsic<'promise'>, - account: KeyringPair, - expectFailure = false - ): Promise { - return new Promise(async (resolve, reject) => { - const nonce: BN = await this.getNonce(account.address); - const signedTx = tx.sign(account, { nonce }); - await signedTx - .send(async result => { - if (result.status.isFinalized === true && result.events !== undefined) { - result.events.forEach(event => { - if (event.event.method === 'ExtrinsicFailed') { - if (expectFailure) { - resolve(); - } else { - reject(new Error('Extrinsic failed unexpectedly')); - } - } - }); - resolve(); - } - if (result.status.isFuture) { - this.clearNonce(account.address); - reject(new Error('Extrinsic nonce is in future')); - } - }) - .catch(error => { - reject(error); - }); - }); - } -} +import BN = require('bn.js'); +import { ApiPromise } from '@polkadot/api'; +import { Index } from '@polkadot/types/interfaces'; +import { SubmittableExtrinsic } from '@polkadot/api/types'; +import { KeyringPair } from '@polkadot/keyring/types'; + +export class Sender { + private readonly api: ApiPromise; + private static nonceMap: Map = new Map(); + + constructor(api: ApiPromise) { + this.api = api; + } + + private async getNonce(address: string): Promise { + let oncahinNonce: BN = new BN(0); + if (!Sender.nonceMap.get(address)) { + oncahinNonce = await this.api.query.system.accountNonce(address); + } + let nonce: BN | undefined = Sender.nonceMap.get(address); + if (!nonce) { + nonce = oncahinNonce; + } + const nextNonce: BN = nonce.addn(1); + Sender.nonceMap.set(address, nextNonce); + return nonce; + } + + private clearNonce(address: string): void { + Sender.nonceMap.delete(address); + } + + public async signAndSend( + tx: SubmittableExtrinsic<'promise'>, + account: KeyringPair, + expectFailure = false + ): Promise { + return new Promise(async (resolve, reject) => { + const nonce: BN = await this.getNonce(account.address); + const signedTx = tx.sign(account, { nonce }); + await signedTx + .send(async result => { + if (result.status.isFinalized === true && result.events !== undefined) { + result.events.forEach(event => { + if (event.event.method === 'ExtrinsicFailed') { + if (expectFailure) { + resolve(); + } else { + reject(new Error('Extrinsic failed unexpectedly')); + } + } + }); + resolve(); + } + if (result.status.isFuture) { + this.clearNonce(account.address); + reject(new Error('Extrinsic nonce is in future')); + } + }) + .catch(error => { + reject(error); + }); + }); + } +} diff --git a/tests/src/utils/utils.ts b/tests/network-tests/src/utils/utils.ts similarity index 100% rename from tests/src/utils/utils.ts rename to tests/network-tests/src/utils/utils.ts diff --git a/tests/tsconfig.json b/tests/network-tests/tsconfig.json similarity index 100% rename from tests/tsconfig.json rename to tests/network-tests/tsconfig.json diff --git a/tests/tslint.json b/tests/network-tests/tslint.json similarity index 100% rename from tests/tslint.json rename to tests/network-tests/tslint.json From e85470c3d3d945c8f8763fd0cf1d5ce83ef3ea60 Mon Sep 17 00:00:00 2001 From: Gleb Urvanov Date: Wed, 8 Apr 2020 16:42:20 +0200 Subject: [PATCH 175/286] update runtime test returned --- tests/network-tests/src/tests/electingCouncilTest.ts | 4 ++-- tests/{ => network-tests}/src/tests/updateRuntimeTest.ts | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename tests/{ => network-tests}/src/tests/updateRuntimeTest.ts (100%) diff --git a/tests/network-tests/src/tests/electingCouncilTest.ts b/tests/network-tests/src/tests/electingCouncilTest.ts index 25338d8fad..4c275a4044 100644 --- a/tests/network-tests/src/tests/electingCouncilTest.ts +++ b/tests/network-tests/src/tests/electingCouncilTest.ts @@ -103,8 +103,8 @@ export function councilTest(m1KeyPairs: KeyringPair[], m2KeyPairs: KeyringPair[] ); // Assertions - m2addresses.forEach(address => assert(members.includes(address), `Account ${address} is not in the council`)); - m1addresses.forEach(address => assert(bakers.includes(address), `Account ${address} is not in the voters`)); + // m2addresses.forEach(address => assert(members.includes(address), `Account ${address} is not in the council`)); + // m1addresses.forEach(address => assert(bakers.includes(address), `Account ${address} is not in the voters`)); seats.forEach(seat => assert( Utils.getTotalStake(seat).eq(greaterStake.add(lesserStake)), diff --git a/tests/src/tests/updateRuntimeTest.ts b/tests/network-tests/src/tests/updateRuntimeTest.ts similarity index 100% rename from tests/src/tests/updateRuntimeTest.ts rename to tests/network-tests/src/tests/updateRuntimeTest.ts From dd45ab770abe22d8ca0cc35642a0d5fb79d84da4 Mon Sep 17 00:00:00 2001 From: Gleb Urvanov Date: Thu, 9 Apr 2020 13:39:18 +0200 Subject: [PATCH 176/286] Runtime upgrade proposal test finished, runtime upgrade asserted using events --- .../src/tests/electingCouncilTest.ts | 4 +-- .../src/tests/updateRuntimeTest.ts | 22 +++++++++---- tests/network-tests/src/utils/apiWrapper.ts | 31 ++++++++++++++++--- tests/network-tests/src/utils/sender.ts | 2 +- 4 files changed, 45 insertions(+), 14 deletions(-) diff --git a/tests/network-tests/src/tests/electingCouncilTest.ts b/tests/network-tests/src/tests/electingCouncilTest.ts index 4c275a4044..25338d8fad 100644 --- a/tests/network-tests/src/tests/electingCouncilTest.ts +++ b/tests/network-tests/src/tests/electingCouncilTest.ts @@ -103,8 +103,8 @@ export function councilTest(m1KeyPairs: KeyringPair[], m2KeyPairs: KeyringPair[] ); // Assertions - // m2addresses.forEach(address => assert(members.includes(address), `Account ${address} is not in the council`)); - // m1addresses.forEach(address => assert(bakers.includes(address), `Account ${address} is not in the voters`)); + m2addresses.forEach(address => assert(members.includes(address), `Account ${address} is not in the council`)); + m1addresses.forEach(address => assert(bakers.includes(address), `Account ${address} is not in the voters`)); seats.forEach(seat => assert( Utils.getTotalStake(seat).eq(greaterStake.add(lesserStake)), diff --git a/tests/network-tests/src/tests/updateRuntimeTest.ts b/tests/network-tests/src/tests/updateRuntimeTest.ts index bb533cb597..402b0410f6 100644 --- a/tests/network-tests/src/tests/updateRuntimeTest.ts +++ b/tests/network-tests/src/tests/updateRuntimeTest.ts @@ -8,7 +8,7 @@ import { registerJoystreamTypes } from '@joystream/types'; import { ApiWrapper } from '../utils/apiWrapper'; import BN = require('bn.js'); -describe('Council integration tests', () => { +describe('Runtime upgrade integration tests', () => { initConfig(); const keyring = new Keyring({ type: 'sr25519' }); const nodeUrl: string = process.env.NODE_URL!; @@ -33,7 +33,8 @@ describe('Council integration tests', () => { membershipTest(m2KeyPairs); councilTest(m1KeyPairs, m2KeyPairs); - it('Upgradeing the runtime test', async () => { + it('Upgrading the runtime test', async () => { + // Setup sudo = keyring.addFromUri(sudoUri); const runtime: Bytes = await apiWrapper.getRuntime(); const description: string = 'runtime upgrade proposal which is used for API integration testing'; @@ -43,11 +44,14 @@ describe('Council integration tests', () => { description, runtime ); - console.log('sending some funds for the test'); const runtimeVoteFee: BN = apiWrapper.estimateVoteForProposalFee(); + + // Topping the balances await apiWrapper.transferBalance(sudo, m1KeyPairs[0].address, runtimeProposalFee.add(proposalStake)); await apiWrapper.transferBalanceToAccounts(sudo, m2KeyPairs, runtimeVoteFee); - console.log('going to propose runtime'); + + // Proposal creation + const proposalPromise = apiWrapper.expectProposalCreated(); await apiWrapper.proposeRuntime( m1KeyPairs[0], proposalStake, @@ -55,10 +59,16 @@ describe('Council integration tests', () => { 'runtime to test proposal functionality', runtime ); - console.log('runtime proposed, approving...'); - await apiWrapper.batchApproveProposal(m2KeyPairs, new BN(1)); + const proposalNumber = await proposalPromise; + + // Approving runtime update proposal + const runtimePromise = apiWrapper.expectRuntimeUpgraded(); + await apiWrapper.batchApproveProposal(m2KeyPairs, proposalNumber); + await runtimePromise; }).timeout(defaultTimeout); + membershipTest(new Array()); + after(() => { apiWrapper.close(); }); diff --git a/tests/network-tests/src/utils/apiWrapper.ts b/tests/network-tests/src/utils/apiWrapper.ts index 3c5f8b15e7..386a4420b4 100644 --- a/tests/network-tests/src/utils/apiWrapper.ts +++ b/tests/network-tests/src/utils/apiWrapper.ts @@ -1,10 +1,10 @@ import { ApiPromise, WsProvider } from '@polkadot/api'; -import { Option, Vec, Bytes, UInt } from '@polkadot/types'; +import { Option, Vec, Bytes } from '@polkadot/types'; import { Codec } from '@polkadot/types/types'; import { KeyringPair } from '@polkadot/keyring/types'; import { UserInfo, PaidMembershipTerms } from '@joystream/types/lib/members'; import { Seat, VoteKind } from '@joystream/types'; -import { Balance } from '@polkadot/types/interfaces'; +import { Balance, EventRecord } from '@polkadot/types/interfaces'; import BN = require('bn.js'); import { SubmittableExtrinsic } from '@polkadot/api/types'; import { Sender } from './sender'; @@ -64,8 +64,6 @@ export class ApiWrapper { public async transferBalanceToAccounts(from: KeyringPair, to: KeyringPair[], amount: BN): Promise { return Promise.all( to.map(async keyPair => { - amount = amount.addn(1); - console.log('sending to ' + keyPair.address + ' amount ' + amount); await this.transferBalance(from, keyPair.address, amount); }) ); @@ -191,7 +189,6 @@ export class ApiWrapper { public getCouncil(): Promise { return this.api.query.council.activeCouncil>().then(seats => { - console.log('elected council ' + seats.toString()); return JSON.parse(seats.toString()); }); } @@ -233,4 +230,28 @@ export class ApiWrapper { public getBlockDuration(): BN { return this.api.createType('Moment', this.api.consts.babe.expectedBlockTime).toBn(); } + + public expectProposalCreated(): Promise { + return new Promise(async resolve => { + await this.api.query.system.events>(events => { + events.forEach(record => { + if (record.event.method.toString() === 'ProposalCreated') { + resolve(new BN(record.event.data[1].toString())); + } + }); + }); + }); + } + + public expectRuntimeUpgraded(): Promise { + return new Promise(async resolve => { + await this.api.query.system.events>(events => { + events.forEach(record => { + if (record.event.method.toString() === 'RuntimeUpdated') { + resolve(); + } + }); + }); + }); + } } diff --git a/tests/network-tests/src/utils/sender.ts b/tests/network-tests/src/utils/sender.ts index 88cef1dd4b..b09e780cdc 100644 --- a/tests/network-tests/src/utils/sender.ts +++ b/tests/network-tests/src/utils/sender.ts @@ -37,7 +37,7 @@ export class Sender { ): Promise { return new Promise(async (resolve, reject) => { const nonce: BN = await this.getNonce(account.address); - console.log('sending transaction from ' + account.address + ' with nonce ' + nonce); + // console.log('sending transaction from ' + account.address + ' with nonce ' + nonce); const signedTx = tx.sign(account, { nonce }); await signedTx .send(async result => { From e5f83df137e3ceb2f9c086fad6f6cf795f9ce756 Mon Sep 17 00:00:00 2001 From: Leszek Wiesner Date: Thu, 9 Apr 2020 18:05:43 +0200 Subject: [PATCH 177/286] Account management implementation cont. --- cli/package.json | 1 + cli/src/Api.ts | 135 +++++++++++++++++++ cli/src/ExitCodes.ts | 5 + cli/src/Types.ts | 58 ++++++++ cli/src/base/AccountsCommandBase.ts | 149 +++++++++++++++++---- cli/src/commands/account/choose.ts | 31 ++--- cli/src/commands/account/create.ts | 47 +++++++ cli/src/commands/account/current.ts | 36 +++++ cli/src/commands/account/export.ts | 73 ++++++++++ cli/src/commands/account/forget.ts | 29 ++++ cli/src/commands/account/import.ts | 4 +- cli/src/commands/account/transferTokens.ts | 69 ++++++++++ cli/src/commands/council/info.ts | 118 +++------------- cli/src/helpers/display.ts | 25 ++++ cli/src/helpers/validation.ts | 19 +++ 15 files changed, 651 insertions(+), 148 deletions(-) create mode 100644 cli/src/Api.ts create mode 100644 cli/src/Types.ts create mode 100644 cli/src/commands/account/create.ts create mode 100644 cli/src/commands/account/current.ts create mode 100644 cli/src/commands/account/export.ts create mode 100644 cli/src/commands/account/forget.ts create mode 100644 cli/src/commands/account/transferTokens.ts create mode 100644 cli/src/helpers/display.ts create mode 100644 cli/src/helpers/validation.ts diff --git a/cli/package.json b/cli/package.json index 2e4db9b6f2..e66ca92244 100644 --- a/cli/package.json +++ b/cli/package.json @@ -17,6 +17,7 @@ "@types/slug": "^0.9.1", "cli-ux": "^5.4.5", "inquirer": "^7.1.0", + "moment": "^2.24.0", "slug": "^2.1.1", "tslib": "^1.11.1" }, diff --git a/cli/src/Api.ts b/cli/src/Api.ts new file mode 100644 index 0000000000..d810736c9c --- /dev/null +++ b/cli/src/Api.ts @@ -0,0 +1,135 @@ +import BN from 'bn.js'; +import { registerJoystreamTypes } from '@joystream/types'; +import { ApiPromise, WsProvider } from '@polkadot/api'; +import { formatBalance } from '@polkadot/util'; +import { Balance, Hash } from '@polkadot/types/interfaces'; +import { KeyringPair } from '@polkadot/keyring/types'; +import { AccountBalances, CouncilInfoObj, CouncilInfoTuple, AccountSummary, createCouncilInfoObj } from './Types'; +import { DerivedFees, DerivedBalances } from '@polkadot/api-derive/types'; +import { CLIError } from '@oclif/errors'; +import ExitCodes from './ExitCodes'; + +const API_URL = process.env.WS_URL || ( + process.env.MAIN_TESTNET ? + 'wss://rome-rpc-endpoint.joystream.org:9944/' + : 'wss://rome-staging-2.joystream.org/staging/rpc/' +); +const TOKEN_SYMBOL = 'JOY'; + +// Api wrapper for handling most common api calls and allowing easy API implementation switch in the future + +export default class Api { + private _api: ApiPromise | null = null; + private initializing: boolean = false; + + private async initApi(): Promise { + formatBalance.setDefaults({ unit: TOKEN_SYMBOL }); + const wsProvider:WsProvider = new WsProvider(API_URL); + registerJoystreamTypes(); + + return await ApiPromise.create({ provider: wsProvider }); + } + + private async getApi(): Promise { + while (this.initializing) { + await new Promise((res,rej) => setTimeout(res, 10)); + } + if (!this._api) { + this.initializing = true; + this._api = await this.initApi(); + this.initializing = false; + } + + return this._api; + } + + async getAccountsBalancesInfo(accountAddresses:string[]): Promise { + const api: ApiPromise = await this.getApi(); + + let apiQueries:any = []; + for (let address of accountAddresses) { + apiQueries.push([api.query.balances.freeBalance, address]); + apiQueries.push([api.query.balances.reservedBalance, address]); + } + + let balances: AccountBalances[] = []; + const unsub = await api.queryMulti( + apiQueries, + (balancesRes) => { + for (let key in accountAddresses) { + let numKey: number = parseInt(key); + const free: Balance = balancesRes[numKey*2]; + const reserved: Balance = balancesRes[numKey*2 + 1]; + const total: Balance = api.createType('Balance', free.add(reserved)); + balances[key] = { free, reserved, total }; + } + } + ); + unsub(); + + return balances; + } + + // Get on-chain data related to given account. + // For now it's just account balances + async getAccountSummary(accountAddresses:string): Promise { + const api: ApiPromise = await this.getApi(); + const balances: DerivedBalances = await api.derive.balances.all(accountAddresses); + + return { balances }; + } + + async getCouncilInfo(): Promise { + const api: ApiPromise = await this.getApi(); + let infoObj: CouncilInfoObj | null = null; + const unsub = await api.queryMulti( + [ + api.query.council.activeCouncil, + api.query.council.termEndsAt, + api.query.councilElection.autoStart, + api.query.councilElection.newTermDuration, + api.query.councilElection.candidacyLimit, + api.query.councilElection.councilSize, + api.query.councilElection.minCouncilStake, + api.query.councilElection.minVotingStake, + api.query.councilElection.announcingPeriod, + api.query.councilElection.votingPeriod, + api.query.councilElection.revealingPeriod, + api.query.councilElection.round, + api.query.councilElection.stage + ], + ((res) => { + infoObj = createCouncilInfoObj(...( res)); + }) + ); + unsub(); + + if (infoObj) return infoObj; + // Probably never happens, but otherwise TS will see it as error + else throw new CLIError('Unexpected API error', { exit: ExitCodes.ApiError }); + } + + // TODO: This formula is probably not too good, so some better implementation will be required in the future + async estimateFee(account: KeyringPair, recipientAddr: string, amount: BN): Promise { + const api: ApiPromise = await this.getApi(); + + const transfer = api.tx.balances.transfer(recipientAddr, amount); + const signature = account.sign(transfer.toU8a()); + const transactionByteSize:BN = new BN(transfer.encodedLength + signature.length); + + const fees: DerivedFees = await api.derive.balances.fees(); + + const estimatedFee = fees.transactionBaseFee.add(fees.transactionByteFee.mul(transactionByteSize)); + + return estimatedFee; + } + + async transfer(account: KeyringPair, recipientAddr: string, amount: BN): Promise { + const api: ApiPromise = await this.getApi(); + + const txHash = await api.tx.balances + .transfer(recipientAddr, amount) + .signAndSend(account); + return txHash; + } +} diff --git a/cli/src/ExitCodes.ts b/cli/src/ExitCodes.ts index 57c99a31cd..124e76965a 100644 --- a/cli/src/ExitCodes.ts +++ b/cli/src/ExitCodes.ts @@ -1,9 +1,14 @@ enum ExitCodes { OK = 0, + InvalidInput = 400, FileNotFound = 401, InvalidFile = 402, + NoAccountFound = 403, + NoAccountSelected = 404, + UnexpectedException = 500, FsOperationFailed = 501, + ApiError = 502, } export = ExitCodes; diff --git a/cli/src/Types.ts b/cli/src/Types.ts new file mode 100644 index 0000000000..b01c92bb8c --- /dev/null +++ b/cli/src/Types.ts @@ -0,0 +1,58 @@ +import BN from 'bn.js'; +import { ElectionStage, Seat } from '@joystream/types'; +import { Option } from '@polkadot/types'; +import { BlockNumber, Balance } from '@polkadot/types/interfaces'; +import { DerivedBalances } from '@polkadot/api-derive/types'; +import { KeyringPair } from '@polkadot/keyring/types'; + +export type NamedKeyringPair = KeyringPair & { + meta: { + name: string + } +} + +export type AccountBalances = { + free: Balance, + reserved: Balance, + total: Balance +}; + +export type AccountSummary = { + balances: DerivedBalances +} + +export type CouncilInfoTuple = Parameters; +export type CouncilInfoObj = ReturnType; +export function createCouncilInfoObj( + activeCouncil: Seat[] | undefined, + termEndsAt: BlockNumber | undefined, + autoStart: Boolean | undefined, + newTermDuration: BN | undefined, + candidacyLimit: BN | undefined, + councilSize: BN | undefined, + minCouncilStake: Balance | undefined, + minVotingStake: Balance | undefined, + announcingPeriod: BlockNumber | undefined, + votingPeriod: BlockNumber | undefined, + revealingPeriod: BlockNumber | undefined, + round: BN | undefined, + stage: Option | undefined +) { + return { + activeCouncil, + termEndsAt, + autoStart, + newTermDuration, + candidacyLimit, + councilSize, + minCouncilStake, + minVotingStake, + announcingPeriod, + votingPeriod, + revealingPeriod, + round, + stage + }; +} + +export type NameValueObj = { name: string, value: string }; diff --git a/cli/src/base/AccountsCommandBase.ts b/cli/src/base/AccountsCommandBase.ts index 83c58ffda3..24ece1c16c 100644 --- a/cli/src/base/AccountsCommandBase.ts +++ b/cli/src/base/AccountsCommandBase.ts @@ -1,15 +1,17 @@ import fs from 'fs'; import path from 'path'; import slug from 'slug'; +import inquirer from 'inquirer'; import ExitCodes from '../ExitCodes'; import { CLIError } from '@oclif/errors'; import { Command } from '@oclif/command'; import { Keyring } from '@polkadot/api'; -import { KeyringPair$Json } from '@polkadot/keyring/types'; +import { KeyringPair$Json, KeyringPair } from '@polkadot/keyring/types'; +import Api from '../Api'; +import { formatBalance } from '@polkadot/util'; +import { AccountBalances, NamedKeyringPair } from '../Types'; -type StateObject = { - selectedAccountFilename: string -}; +type StateObject = { selectedAccountFilename: string }; export default abstract class AccountsCommandBase extends Command { static ACCOUNTS_DIRNAME = '/accounts'; @@ -19,6 +21,14 @@ export default abstract class AccountsCommandBase extends Command { return path.join(this.config.dataDir, AccountsCommandBase.ACCOUNTS_DIRNAME); } + getAccountFilePath(account: NamedKeyringPair): string { + return path.join(this.getAccountsDirPath(), this.generateAccountFilename(account)); + } + + generateAccountFilename(account: NamedKeyringPair): string { + return `${ slug(account.meta.name, '_') }__${ account.address }.json`; + } + getStateFilePath(): string { return path.join(this.config.dataDir, AccountsCommandBase.STATE_FILE); } @@ -50,11 +60,15 @@ export default abstract class AccountsCommandBase extends Command { } } - generateAccountFilename(accountJsonObj: KeyringPair$Json): string { - return `${ slug(accountJsonObj.meta.name, '_') }__${ accountJsonObj.address }.json`; + saveAccount(account: NamedKeyringPair, password: string): void { + try { + fs.writeFileSync(this.getAccountFilePath(account), JSON.stringify(account.toJson(password))); + } catch(e) { + throw this.createDataWriteError(); + } } - fetchJsonBackupAccountObj(jsonBackupFilePath: string): KeyringPair$Json { + fetchAccountFromJsonFile(jsonBackupFilePath: string): NamedKeyringPair { if (!fs.existsSync(jsonBackupFilePath)) { throw new CLIError('Input file does not exist!', { exit: ExitCodes.FileNotFound }); } @@ -70,28 +84,27 @@ export default abstract class AccountsCommandBase extends Command { if (typeof accountJsonObj !== 'object' || accountJsonObj === null) { throw new CLIError('Provided backup file is not valid', { exit: ExitCodes.InvalidFile }); } + + // Force some default account name if none is provided in the original backup + if (!accountJsonObj.meta) accountJsonObj.meta = {}; + if (!accountJsonObj.meta.name) accountJsonObj.meta.name = 'Unnamed Account'; + let keyring = new Keyring(); + let account:NamedKeyringPair; try { // Try adding and retrieving the keys in order to validate that the backup file is correct keyring.addFromJson(accountJsonObj); - keyring.getPair(accountJsonObj.address); + account = keyring.getPair(accountJsonObj.address); // We can be sure it's named, because we forced it before } catch (e) { - // TODO: Maybe check the exception to display more meaningful message? throw new CLIError('Provided backup file is not valid', { exit: ExitCodes.InvalidFile }); } - accountJsonObj = accountJsonObj; // At this point we can assume that - - // Force some default account name if none provided - if (!accountJsonObj.meta) accountJsonObj.meta = {}; - if (!accountJsonObj.meta.name) accountJsonObj.meta.name = 'Unnamed Account'; - - return accountJsonObj; + return account; } - private fetchAccountObjOrNullFromFile(jsonFilePath: string): KeyringPair$Json | null { + private fetchAccountOrNullFromFile(jsonFilePath: string): NamedKeyringPair | null { try { - return this.fetchJsonBackupAccountObj(jsonFilePath); + return this.fetchAccountFromJsonFile(jsonFilePath); } catch (e) { // Here in case of a typical CLIError we just return null (otherwise we throw) if (!(e instanceof CLIError)) throw e; @@ -99,7 +112,7 @@ export default abstract class AccountsCommandBase extends Command { } } - fetchAccounts(): KeyringPair$Json[] { + fetchAccounts(): NamedKeyringPair[] { let files: string[] = []; const accountDir = this.getAccountsDirPath(); try { @@ -109,10 +122,10 @@ export default abstract class AccountsCommandBase extends Command { } // We have to assert the type, because TS is not aware that we're filtering out the nulls at the end - return files + return files .map(fileName => { const filePath = path.join(accountDir, fileName); - return this.fetchAccountObjOrNullFromFile(filePath); + return this.fetchAccountOrNullFromFile(filePath); }) .filter(accObj => accObj !== null); } @@ -129,7 +142,38 @@ export default abstract class AccountsCommandBase extends Command { return state.selectedAccountFilename; } - setSelectedAccount(accountFilename: string): void { + getSelectedAccount(): NamedKeyringPair | null { + const selectedAccountFilename = this.getSelectedAccountFilename(); + + if (!selectedAccountFilename) { + return null; + } + + const account = this.fetchAccountOrNullFromFile( + path.join(this.getAccountsDirPath(), selectedAccountFilename) + ); + + return account; + } + + // Use when account usage is required in given command + async getRequiredSelectedAccount(promptIfMissing: boolean = true): Promise { + let selectedAccount: NamedKeyringPair | null = this.getSelectedAccount(); + if (!selectedAccount) { + this.warn('No default account selected! Use account:choose to set the default account!'); + if (!promptIfMissing) this.exit(ExitCodes.NoAccountSelected); + const accounts: NamedKeyringPair[] = this.fetchAccounts(); + if (!accounts.length) { + this.error('There are no accounts available!', { exit: ExitCodes.NoAccountFound }); + } + + selectedAccount = await this.promptForAccount(accounts); + } + + return selectedAccount; + } + + setSelectedAccount(account: NamedKeyringPair): void { let state: StateObject; try { state = require(this.getStateFilePath()); @@ -137,7 +181,7 @@ export default abstract class AccountsCommandBase extends Command { throw this.createDataReadError(); } - state.selectedAccountFilename = accountFilename; + state.selectedAccountFilename = this.generateAccountFilename(account); try { fs.writeFileSync(this.getStateFilePath(), JSON.stringify(state)); @@ -146,6 +190,58 @@ export default abstract class AccountsCommandBase extends Command { } } + async promptForPassword(message:string = 'Your account\'s password') { + const { password } = await inquirer.prompt([ + { name: 'password', type: 'password', message } + ]); + + return password; + } + + async requireConfirmation(message: string = 'Are you sure you want to execute this action?'): Promise { + const { confirmed } = await inquirer.prompt([ + { type: 'confirm', name: 'confirmed', message, default: false } + ]); + if (!confirmed) this.exit(ExitCodes.OK); + } + + async promptForAccount( + accounts: NamedKeyringPair[], + defaultAccount: NamedKeyringPair | null = null, + message: string = 'Select an account', + showBalances: boolean = true + ): Promise { + let balances: AccountBalances[]; + if (showBalances) { + const api: Api = new Api(); + balances = await api.getAccountsBalancesInfo(accounts.map(acc => acc.address)); + } + const { chosenAccountFilename } = await inquirer.prompt([{ + name: 'chosenAccountFilename', + message, + type: 'list', + choices: accounts.map((account: NamedKeyringPair, i) => ({ + name: + `${ account.meta.name }: `+ + ( showBalances ? `${ formatBalance(balances[i].free) } / ${ formatBalance(balances[i].total) } ` : ' ')+ + account.address, + value: this.generateAccountFilename(account) + })), + default: defaultAccount && this.generateAccountFilename(defaultAccount) + }]); + + return accounts.find(acc => this.generateAccountFilename(acc) === chosenAccountFilename); + } + + async requestAccountDecoding(account: NamedKeyringPair): Promise { + const password: string = await this.promptForPassword(); + try { + account.decodePkcs8(password); + } catch (e) { + this.error('Invalid password!', { exit: ExitCodes.InvalidInput }); + } + } + async init() { try { this.initDataDir(); @@ -156,4 +252,11 @@ export default abstract class AccountsCommandBase extends Command { ); } } + + async finally(err: any) { + // called after run and catch regardless of whether or not the command errored + // We'll force exit here, in case there is no error, to prevent console.log from hanging the process + if (!err) this.exit(ExitCodes.OK); + super.finally(err); + } } diff --git a/cli/src/commands/account/choose.ts b/cli/src/commands/account/choose.ts index fe44934b64..8c548a423e 100644 --- a/cli/src/commands/account/choose.ts +++ b/cli/src/commands/account/choose.ts @@ -1,36 +1,25 @@ import AccountsCommandBase from '../../base/AccountsCommandBase'; -import inquirer from 'inquirer'; import chalk from 'chalk'; import ExitCodes from '../../ExitCodes'; -import { KeyringPair$Json } from '@polkadot/keyring/types'; - +import { NamedKeyringPair } from '../../Types' export default class AccountChoose extends AccountsCommandBase { - static description = 'Choose current account to use in the CLI'; + static description = 'Choose default account to use in the CLI'; async run() { - const accounts: KeyringPair$Json[] = this.fetchAccounts(); - const selectedAccountFilename: string = this.getSelectedAccountFilename(); + const accounts: NamedKeyringPair[] = this.fetchAccounts(); + const selectedAccount: NamedKeyringPair | null = this.getSelectedAccount(); - this.log(`Found ${ accounts.length } existing accounts\n\n`); + this.log(chalk.white(`Found ${ accounts.length } existing accounts...\n`)); if (accounts.length === 0) { - this.log('Exiting'); - this.exit(ExitCodes.OK); + this.warn('No account to choose from. Add accont using account:import or account:create.'); + this.exit(ExitCodes.NoAccountFound); } - const { chosenAccount } = await inquirer.prompt([{ - name: 'chosenAccount', - message: 'Select an account', - type: 'list', - choices: accounts.map(accountObj => ({ - name: `${ accountObj.meta.name }: ${ accountObj.address }`, - value: this.generateAccountFilename(accountObj) - })), - default: selectedAccountFilename - }]); + const choosenAccount: NamedKeyringPair = await this.promptForAccount(accounts, selectedAccount); - this.setSelectedAccount(chosenAccount); - this.log(chalk.bold.greenBright("\n\nAccount switched!")); + this.setSelectedAccount(choosenAccount); + this.log(chalk.greenBright("\nAccount switched!")); } } diff --git a/cli/src/commands/account/create.ts b/cli/src/commands/account/create.ts new file mode 100644 index 0000000000..eaaf4bf8a0 --- /dev/null +++ b/cli/src/commands/account/create.ts @@ -0,0 +1,47 @@ +import chalk from 'chalk'; +import ExitCodes from '../../ExitCodes'; +import AccountsCommandBase from '../../base/AccountsCommandBase'; +import { Keyring } from '@polkadot/api'; +import { mnemonicGenerate } from '@polkadot/util-crypto' +import { NamedKeyringPair } from '../../Types'; + +type AccountCreateArgs = { + name: string +}; + +export default class AccountCreate extends AccountsCommandBase { + static description = 'Create new account'; + + static args = [ + { + name: 'name', + required: true, + description: 'Account name' + }, + ]; + + validatePass(password: string, password2: string): void { + if (password !== password2) this.error('Passwords are not the same!', { exit: ExitCodes.InvalidInput }); + if (!password) this.error('You didn\'t provide a password', { exit: ExitCodes.InvalidInput }); + } + + async run() { + const args: AccountCreateArgs = this.parse(AccountCreate).args; + const keyring: Keyring = new Keyring(); + const mnemonic: string = mnemonicGenerate(); + + keyring.addFromMnemonic(mnemonic, { name: args.name, whenCreated: Date.now() }); + const keys: NamedKeyringPair = keyring.pairs[0]; // We assigned the name above + + const password = await this.promptForPassword('Set your account\'s password'); + const password2 = await this.promptForPassword('Confirm your password'); + + this.validatePass(password, password2); + + this.saveAccount(keys, password); + + this.log(chalk.greenBright(`\nAccount succesfully created!`)); + this.log(chalk.white(`${chalk.bold('Name: ') }${ args.name }`)); + this.log(chalk.white(`${chalk.bold('Address: ') }${ keys.address }`)); + } + } diff --git a/cli/src/commands/account/current.ts b/cli/src/commands/account/current.ts new file mode 100644 index 0000000000..76e57577b8 --- /dev/null +++ b/cli/src/commands/account/current.ts @@ -0,0 +1,36 @@ +import AccountsCommandBase from '../../base/AccountsCommandBase'; +import Api from '../../Api'; +import { AccountSummary, NameValueObj, NamedKeyringPair } from '../../Types'; +import { displayHeader, displayNameValueTable } from '../../helpers/display'; +import { formatBalance } from '@polkadot/util'; +import moment from 'moment'; + +export default class AccountCurrent extends AccountsCommandBase { + static description = 'Display information about currently choosen default account'; + static aliases = ['account:info', 'account:default']; + + async run() { + const api: Api = new Api(); + const currentAccount: NamedKeyringPair = await this.getRequiredSelectedAccount(false); + const summary: AccountSummary = await api.getAccountSummary(currentAccount.address); + + displayHeader('Account information'); + const creationDate: string = currentAccount.meta.whenCreated ? + moment(currentAccount.meta.whenCreated).format('YYYY-MM-DD HH:mm:ss') + : '?'; + const accountRows: NameValueObj[] = [ + { name: 'Account name:', value: currentAccount.meta.name }, + { name: 'Address:', value: currentAccount.address }, + { name: 'Created:', value: creationDate } + ]; + displayNameValueTable(accountRows); + + displayHeader('Balances'); + const balancesRows: NameValueObj[] = [ + { name: 'Available balance:', value: formatBalance(summary.balances.availableBalance) }, + { name: 'Free balance:', value: formatBalance(summary.balances.freeBalance) }, + { name: 'Locked balance:', value: formatBalance(summary.balances.lockedBalance) } + ]; + displayNameValueTable(balancesRows); + } + } diff --git a/cli/src/commands/account/export.ts b/cli/src/commands/account/export.ts new file mode 100644 index 0000000000..1d71ef51e3 --- /dev/null +++ b/cli/src/commands/account/export.ts @@ -0,0 +1,73 @@ +import fs from 'fs'; +import chalk from 'chalk'; +import path from 'path'; +import ExitCodes from '../../ExitCodes'; +import AccountsCommandBase from '../../base/AccountsCommandBase'; +import { flags } from '@oclif/command'; +import { NamedKeyringPair } from '../../Types'; + +type AccountExportFlags = { all: boolean }; +type AccountExportArgs = { path: string }; + +export default class AccountExport extends AccountsCommandBase { + static description = 'Export account(s) to given location'; + static MULTI_EXPORT_FOLDER_NAME = 'exported_accounts'; + + static args = [ + { + name: 'path', + required: true, + description: 'Path where the exported files should be placed' + } + ]; + + static flags = { + all: flags.boolean({ + char: 'a', + description: `If provided, exports all existing accounts into "${ AccountExport.MULTI_EXPORT_FOLDER_NAME }" folder inside given path`, + }), + }; + + exportAccount(account: NamedKeyringPair, destPath: string): string { + const sourceFilePath: string = this.getAccountFilePath(account); + const destFilePath: string = path.join(destPath, this.generateAccountFilename(account)); + try { + fs.copyFileSync(sourceFilePath, destFilePath); + } + catch (e) { + this.error( + `Error while trying to copy into the export file: (${ destFilePath }). Permissions issue?`, + { exit: ExitCodes.FsOperationFailed } + ); + } + + return destFilePath; + } + + async run() { + const args: AccountExportArgs = this.parse(AccountExport).args; + const flags: AccountExportFlags = this.parse(AccountExport).flags; + const accounts: NamedKeyringPair[] = this.fetchAccounts(); + + if (!accounts.length) { + this.error('No accounts found!', { exit: ExitCodes.NoAccountFound }); + } + + if (flags.all) { + const destPath: string = path.join(args.path, AccountExport.MULTI_EXPORT_FOLDER_NAME); + try { + if (!fs.existsSync(destPath)) fs.mkdirSync(destPath); + } catch(e) { + this.error(`Failed to create the export folder (${ destPath })`, { exit: ExitCodes.FsOperationFailed }); + } + for (let account of accounts) this.exportAccount(account, destPath); + this.log(chalk.greenBright(`All accounts succesfully exported succesfully to: ${ chalk.white(destPath) }!`)); + } + else { + const destPath: string = args.path; + const choosenAccount: NamedKeyringPair = await this.promptForAccount(accounts, null, 'Select an account to export'); + const exportedFilePath: string = this.exportAccount(choosenAccount, destPath); + this.log(chalk.greenBright(`Account succesfully exported to: ${ chalk.white(exportedFilePath) }`)); + } + } + } diff --git a/cli/src/commands/account/forget.ts b/cli/src/commands/account/forget.ts new file mode 100644 index 0000000000..a10f8e98ab --- /dev/null +++ b/cli/src/commands/account/forget.ts @@ -0,0 +1,29 @@ +import fs from 'fs'; +import chalk from 'chalk'; +import ExitCodes from '../../ExitCodes'; +import AccountsCommandBase from '../../base/AccountsCommandBase'; +import { NamedKeyringPair } from '../../Types'; + +export default class AccountForget extends AccountsCommandBase { + static description = 'Forget (remove) account from the list of available accounts'; + + async run() { + const accounts: NamedKeyringPair[] = this.fetchAccounts(); + + if (!accounts.length) { + this.error('No accounts found!', { exit: ExitCodes.NoAccountFound }); + } + + const choosenAccount: NamedKeyringPair = await this.promptForAccount(accounts, null, 'Select an account to forget'); + await this.requireConfirmation('Are you sure you want this account to be forgotten?'); + + const accountFilePath: string = this.getAccountFilePath(choosenAccount); + try { + fs.unlinkSync(accountFilePath); + } catch (e) { + this.error(`Could not remove account file (${ accountFilePath }). Permissions issue?`, { exit: ExitCodes.FsOperationFailed }); + } + + this.log(chalk.greenBright(`\nAccount has been forgotten!`)) + } + } diff --git a/cli/src/commands/account/import.ts b/cli/src/commands/account/import.ts index d128a0a58c..623f0c5e00 100644 --- a/cli/src/commands/account/import.ts +++ b/cli/src/commands/account/import.ts @@ -2,8 +2,8 @@ import fs from 'fs'; import chalk from 'chalk'; import path from 'path'; import ExitCodes from '../../ExitCodes'; -import { KeyringPair$Json } from '@polkadot/keyring/types'; import AccountsCommandBase from '../../base/AccountsCommandBase'; +import { NamedKeyringPair } from '../../Types'; type AccountImportArgs = { backupFilePath: string @@ -22,7 +22,7 @@ export default class AccountImport extends AccountsCommandBase { async run() { const args: AccountImportArgs = this.parse(AccountImport).args; - const backupAcc: KeyringPair$Json = this.fetchJsonBackupAccountObj(args.backupFilePath); + const backupAcc: NamedKeyringPair = this.fetchAccountFromJsonFile(args.backupFilePath); const accountName: string = backupAcc.meta.name; const accountAddress: string = backupAcc.address; diff --git a/cli/src/commands/account/transferTokens.ts b/cli/src/commands/account/transferTokens.ts new file mode 100644 index 0000000000..1494a81540 --- /dev/null +++ b/cli/src/commands/account/transferTokens.ts @@ -0,0 +1,69 @@ +import BN from 'bn.js'; +import AccountsCommandBase from '../../base/AccountsCommandBase'; +import chalk from 'chalk'; +import ExitCodes from '../../ExitCodes'; +import { formatBalance } from '@polkadot/util'; +import { Hash } from '@polkadot/types/interfaces'; +import Api from '../../Api'; +import { AccountBalances, NamedKeyringPair } from '../../Types'; +import { checkBalance, validateAddress } from '../../helpers/validation'; + +type AccountTransferArgs = { + recipient: string, + amount: string +}; + +export default class AccountTransferTokens extends AccountsCommandBase { + static description = 'Transfer tokens from currently choosen account'; + + static args = [ + { + name: 'recipient', + required: true, + description: 'Address of the transfer recipient' + }, + { + name: 'amount', + required: true, + description: 'Amount of tokens to transfer' + }, + ]; + + async run() { + const args: AccountTransferArgs = this.parse(AccountTransferTokens).args; + const api: Api = new Api(); + const selectedAccount: NamedKeyringPair = await this.getRequiredSelectedAccount(); + const amountBN: BN = new BN(args.amount); + + // Initial validation + validateAddress(args.recipient, 'Invalid recipient address'); + const accBalances: AccountBalances = (await api.getAccountsBalancesInfo([ selectedAccount.address ]))[0]; + checkBalance(accBalances, amountBN); + + await this.requestAccountDecoding(selectedAccount); + + this.log(chalk.white('Estimating fee...')); + let estimatedFee: BN; + try { + estimatedFee = await api.estimateFee(selectedAccount, args.recipient, amountBN); + } + catch (e) { + this.error('Could not estimate the fee.', { exit: ExitCodes.UnexpectedException }); + } + const totalAmount: BN = amountBN.add(estimatedFee); + this.log(chalk.white('Estimated fee:', formatBalance(estimatedFee))); + this.log(chalk.white('Total transfer amount:', formatBalance(totalAmount))); + + checkBalance(accBalances, totalAmount); + + await this.requireConfirmation('Do you confirm the transfer?'); + + try { + const txHash: Hash = await api.transfer(selectedAccount, args.recipient, amountBN); + this.log(chalk.greenBright('Transaction succesfully sent!')); + this.log(chalk.white('Hash:', txHash.toString())); + } catch (e) { + this.error('Could not send the transaction.', { exit: ExitCodes.UnexpectedException }); + } + } + } diff --git a/cli/src/commands/council/info.ts b/cli/src/commands/council/info.ts index 7e8d369649..5005a8ce7f 100644 --- a/cli/src/commands/council/info.ts +++ b/cli/src/commands/council/info.ts @@ -1,88 +1,27 @@ -import BN from 'bn.js'; -import { cli } from 'cli-ux'; -import chalk from 'chalk'; -import { Command } from '@oclif/command'; -import { registerJoystreamTypes, ElectionStage, Seat } from '@joystream/types'; -import { ApiPromise, WsProvider } from '@polkadot/api'; -import { Option } from '@polkadot/types'; +import { ElectionStage } from '@joystream/types'; import { formatNumber, formatBalance } from '@polkadot/util'; -import { BlockNumber, Balance } from '@polkadot/types/interfaces'; - -const API_URL = 'wss://rome-staging-2.joystream.org/staging/rpc/'; - -type ElectionsInfoTuple = Parameters; -type ElectionsInfoObj = ReturnType; -type NameValueObj = { name: string, value: string }; - -function createElectionsInfoObj( - activeCouncil: Seat[] | undefined, - termEndsAt: BlockNumber | undefined, - autoStart: Boolean | undefined, - newTermDuration: BN | undefined, - candidacyLimit: BN | undefined, - councilSize: BN | undefined, - minCouncilStake: Balance | undefined, - minVotingStake: Balance | undefined, - announcingPeriod: BlockNumber | undefined, - votingPeriod: BlockNumber | undefined, - revealingPeriod: BlockNumber | undefined, - round: BN | undefined, - stage: Option | undefined -) { - return { - activeCouncil, - termEndsAt, - autoStart, - newTermDuration, - candidacyLimit, - councilSize, - minCouncilStake, - minVotingStake, - announcingPeriod, - votingPeriod, - revealingPeriod, - round, - stage - }; -} +import { BlockNumber } from '@polkadot/types/interfaces'; +import Command from '@oclif/command'; +import { CouncilInfoObj, NameValueObj } from '../../Types'; +import { displayHeader, displayNameValueTable } from '../../helpers/display'; +import Api from '../../Api'; export default class CouncilInfo extends Command { static description = 'Get current council and council elections information'; - displayHeader(caption: string, placeholderSign: string = '_', size: number = 50) { - let singsPerSide: number = Math.floor((size - (caption.length + 2)) / 2); - let finalStr: string = ''; - for (let i = 0; i < singsPerSide; ++i) finalStr += placeholderSign; - finalStr += ` ${ caption} `; - while (finalStr.length < size) finalStr += placeholderSign; - - console.log("\n" + chalk.bold.blueBright(finalStr) + "\n"); - } - - displayTable(rows: NameValueObj[]) { - cli.table( - rows, - { - name: { minWidth: 30, get: row => chalk.bold.white(row.name) }, - value: { get: row => chalk.white(row.value) } - }, - { 'no-header': true } - ); - } - - displayInfo(infoObj: ElectionsInfoObj) { + displayInfo(infoObj: CouncilInfoObj) { const { activeCouncil = [], round, stage } = infoObj; - this.displayHeader('Council'); + displayHeader('Council'); const councilRows: NameValueObj[] = [ { name: 'Elected:', value: activeCouncil.length ? 'YES' : 'NO' }, { name: 'Members:', value: activeCouncil.length.toString() }, { name: 'Term ends at block:', value: `#${formatNumber(infoObj.termEndsAt) }` }, ]; - this.displayTable(councilRows); + displayNameValueTable(councilRows); - this.displayHeader('Election'); + displayHeader('Election'); let electionTableRows: NameValueObj[] = [ { name: 'Running:', value: stage && stage.isSome ? 'YES' : 'NO' }, { name: 'Election round:', value: formatNumber(round) } @@ -94,9 +33,9 @@ export default class CouncilInfo extends Command { electionTableRows.push({ name: 'Stage:', value: stageName }); electionTableRows.push({ name: 'Stage ends at block:', value: `#${stageEndsAt}` }); } - this.displayTable(electionTableRows); + displayNameValueTable(electionTableRows); - this.displayHeader('Configuration'); + displayHeader('Configuration'); const isAutoStart = (infoObj.autoStart || false).valueOf(); const configTableRows: NameValueObj[] = [ { name: 'Auto-start elections:', value: isAutoStart ? 'YES' : 'NO' }, @@ -109,38 +48,13 @@ export default class CouncilInfo extends Command { { name: 'Voting period:', value: `${ formatNumber(infoObj.votingPeriod) } blocks` }, { name: 'Revealing period:', value: `${ formatNumber(infoObj.revealingPeriod) } blocks` } ]; - this.displayTable(configTableRows); + displayNameValueTable(configTableRows); } async run() { - // TODO: This should probably be part of some command abstract base class (like: ApiCommandBase) - formatBalance.setDefaults({ unit: 'JOY' }); - const wsProvider:WsProvider = new WsProvider(API_URL); - registerJoystreamTypes(); - const api:ApiPromise = await ApiPromise.create({ provider: wsProvider }); - - const unsub = await api.queryMulti( - [ - api.query.council.activeCouncil, - api.query.council.termEndsAt, - api.query.councilElection.autoStart, - api.query.councilElection.newTermDuration, - api.query.councilElection.candidacyLimit, - api.query.councilElection.councilSize, - api.query.councilElection.minCouncilStake, - api.query.councilElection.minVotingStake, - api.query.councilElection.announcingPeriod, - api.query.councilElection.votingPeriod, - api.query.councilElection.revealingPeriod, - api.query.councilElection.round, - api.query.councilElection.stage - ], - ((res) => { - const infoObj: ElectionsInfoObj = createElectionsInfoObj(...( res)); - this.displayInfo(infoObj); - }) - ); - unsub(); + const api = new Api(); + const infoObj = await api.getCouncilInfo(); + this.displayInfo(infoObj); this.exit(); } } diff --git a/cli/src/helpers/display.ts b/cli/src/helpers/display.ts new file mode 100644 index 0000000000..f8b3db0d52 --- /dev/null +++ b/cli/src/helpers/display.ts @@ -0,0 +1,25 @@ +import { cli } from 'cli-ux'; +import chalk from 'chalk'; +import { NameValueObj } from '../Types'; + +export function displayHeader(caption: string, placeholderSign: string = '_', size: number = 50) { + let singsPerSide: number = Math.floor((size - (caption.length + 2)) / 2); + let finalStr: string = ''; + for (let i = 0; i < singsPerSide; ++i) finalStr += placeholderSign; + finalStr += ` ${ caption} `; + while (finalStr.length < size) finalStr += placeholderSign; + + process.stdout.write("\n" + chalk.bold.blueBright(finalStr) + "\n\n"); +} + +export function displayNameValueTable(rows: NameValueObj[]) { + cli.table( + rows, + { + name: { minWidth: 30, get: row => chalk.bold.white(row.name) }, + value: { get: row => chalk.white(row.value) } + }, + { 'no-header': true } + ); +} + diff --git a/cli/src/helpers/validation.ts b/cli/src/helpers/validation.ts new file mode 100644 index 0000000000..f18c66d3ab --- /dev/null +++ b/cli/src/helpers/validation.ts @@ -0,0 +1,19 @@ +import BN from 'bn.js'; +import ExitCodes from '../ExitCodes'; +import { decodeAddress } from '@polkadot/util-crypto'; +import { AccountBalances } from '../Types'; +import { CLIError } from '@oclif/errors'; + +export function validateAddress(address: string, errorMessage: string = 'Invalid address'): void { + try { + decodeAddress(address); + } catch (e) { + throw new CLIError(errorMessage, { exit: ExitCodes.InvalidInput }); + } +} + +export function checkBalance(accBalances: AccountBalances, requiredBalance: BN): void { + if (requiredBalance.gt(accBalances.free)) { + throw new CLIError('Not enough balance available', { exit: ExitCodes.InvalidInput }); + } +} From 345cc1761a2f1e4b05f9053bc560aa2dce378ad0 Mon Sep 17 00:00:00 2001 From: Gleb Urvanov Date: Thu, 9 Apr 2020 19:28:07 +0200 Subject: [PATCH 178/286] missed await added --- tests/network-tests/src/tests/membershipCreationTest.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/network-tests/src/tests/membershipCreationTest.ts b/tests/network-tests/src/tests/membershipCreationTest.ts index 44bc18f6ac..38037386f0 100644 --- a/tests/network-tests/src/tests/membershipCreationTest.ts +++ b/tests/network-tests/src/tests/membershipCreationTest.ts @@ -56,7 +56,7 @@ export function membershipTest(nKeyPairs: KeyringPair[]) { }).timeout(defaultTimeout); it('Account A can not buy the membership with insufficient funds', async () => { - apiWrapper + await apiWrapper .getBalance(aKeyPair.address) .then(balance => assert( From c606db51196af2aff87e75e0e8157327bd455eae Mon Sep 17 00:00:00 2001 From: Leszek Wiesner Date: Fri, 10 Apr 2020 10:56:54 +0200 Subject: [PATCH 179/286] Update the README.md --- cli/README.md | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 78 insertions(+), 1 deletion(-) diff --git a/cli/README.md b/cli/README.md index ad8eacac5c..98f3af16bc 100644 --- a/cli/README.md +++ b/cli/README.md @@ -29,13 +29,18 @@ USAGE # Commands * [`joystream-cli account:choose`](#joystream-cli-accountchoose) +* [`joystream-cli account:create NAME`](#joystream-cli-accountcreate-name) +* [`joystream-cli account:current`](#joystream-cli-accountcurrent) +* [`joystream-cli account:export PATH`](#joystream-cli-accountexport-path) +* [`joystream-cli account:forget`](#joystream-cli-accountforget) * [`joystream-cli account:import BACKUPFILEPATH`](#joystream-cli-accountimport-backupfilepath) +* [`joystream-cli account:transferTokens RECIPIENT AMOUNT`](#joystream-cli-accounttransfertokens-recipient-amount) * [`joystream-cli council:info`](#joystream-cli-councilinfo) * [`joystream-cli help [COMMAND]`](#joystream-cli-help-command) ## `joystream-cli account:choose` -Choose current account to use in the CLI +Choose default account to use in the CLI ``` USAGE @@ -44,6 +49,63 @@ USAGE _See code: [src/commands/account/choose.ts](https://github.com/Joystream/cli/blob/v0.0.0/src/commands/account/choose.ts)_ +## `joystream-cli account:create NAME` + +Create new account + +``` +USAGE + $ joystream-cli account:create NAME + +ARGUMENTS + NAME Account name +``` + +_See code: [src/commands/account/create.ts](https://github.com/Joystream/cli/blob/v0.0.0/src/commands/account/create.ts)_ + +## `joystream-cli account:current` + +Display information about currently choosen default account + +``` +USAGE + $ joystream-cli account:current + +ALIASES + $ joystream-cli account:info + $ joystream-cli account:default +``` + +_See code: [src/commands/account/current.ts](https://github.com/Joystream/cli/blob/v0.0.0/src/commands/account/current.ts)_ + +## `joystream-cli account:export PATH` + +Export account(s) to given location + +``` +USAGE + $ joystream-cli account:export PATH + +ARGUMENTS + PATH Path where the exported files should be placed + +OPTIONS + -a, --all If provided, exports all existing accounts into "exported_accounts" folder inside given path +``` + +_See code: [src/commands/account/export.ts](https://github.com/Joystream/cli/blob/v0.0.0/src/commands/account/export.ts)_ + +## `joystream-cli account:forget` + +Forget (remove) account from the list of available accounts + +``` +USAGE + $ joystream-cli account:forget +``` + +_See code: [src/commands/account/forget.ts](https://github.com/Joystream/cli/blob/v0.0.0/src/commands/account/forget.ts)_ + ## `joystream-cli account:import BACKUPFILEPATH` Import account using JSON backup file @@ -58,6 +120,21 @@ ARGUMENTS _See code: [src/commands/account/import.ts](https://github.com/Joystream/cli/blob/v0.0.0/src/commands/account/import.ts)_ +## `joystream-cli account:transferTokens RECIPIENT AMOUNT` + +Transfer tokens from currently choosen account + +``` +USAGE + $ joystream-cli account:transferTokens RECIPIENT AMOUNT + +ARGUMENTS + RECIPIENT Address of the transfer recipient + AMOUNT Amount of tokens to transfer +``` + +_See code: [src/commands/account/transferTokens.ts](https://github.com/Joystream/cli/blob/v0.0.0/src/commands/account/transferTokens.ts)_ + ## `joystream-cli council:info` Get current council and council elections information From 5a5f725b9a9fc0d25dad275670fbbee88ca7b7ea Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Sat, 11 Apr 2020 15:36:14 +0400 Subject: [PATCH 180/286] council: recurring rewards --- Cargo.lock | 1 + runtime-modules/governance/Cargo.toml | 7 +- runtime-modules/governance/src/council.rs | 171 ++++++++++++++++++-- runtime-modules/governance/src/mock.rs | 5 + runtime-modules/governance/src/proposals.rs | 6 + 5 files changed, 177 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 232c102310..101d6cfb48 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4796,6 +4796,7 @@ dependencies = [ "substrate-common-module", "substrate-membership-module", "substrate-primitives", + "substrate-recurring-reward-module", "substrate-token-mint-module", ] diff --git a/runtime-modules/governance/Cargo.toml b/runtime-modules/governance/Cargo.toml index d3314bd0db..40653e9894 100644 --- a/runtime-modules/governance/Cargo.toml +++ b/runtime-modules/governance/Cargo.toml @@ -92,4 +92,9 @@ rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' [dependencies.minting] default_features = false package = 'substrate-token-mint-module' -path = '../token-minting' \ No newline at end of file +path = '../token-minting' + +[dependencies.recurringrewards] +default_features = false +package = 'substrate-recurring-reward-module' +path = '../recurring-reward' \ No newline at end of file diff --git a/runtime-modules/governance/src/council.rs b/runtime-modules/governance/src/council.rs index 21b84c60ed..1befc8bc4a 100644 --- a/runtime-modules/governance/src/council.rs +++ b/runtime-modules/governance/src/council.rs @@ -1,6 +1,6 @@ use rstd::prelude::*; -use sr_primitives::traits::Zero; -use srml_support::{decl_event, decl_module, decl_storage, ensure}; +use sr_primitives::traits::{One, Zero}; +use srml_support::{debug, decl_event, decl_module, decl_storage, ensure}; use system::{self, ensure_root}; pub use super::election::{self, CouncilElected, Seat, Seats}; @@ -21,7 +21,7 @@ impl CouncilTermEnded for (X,) { } } -pub trait Trait: system::Trait + minting::Trait + GovernanceCurrency { +pub trait Trait: system::Trait + recurringrewards::Trait + GovernanceCurrency { type Event: From> + Into<::Event>; type CouncilTermEnded: CouncilTermEnded; @@ -37,6 +37,20 @@ decl_storage! { /// because it was introduced in a runtime upgrade. It will be automatically created when /// a successful call to set_council_mint_capacity() is made. pub CouncilMint get(council_mint) : Option<::MintId>; + + /// The reward relationships currently in place. There may not necessarily be a 1-1 correspondance with + /// the active council, since there are multiple ways of setting/adding/removing council members, some of which + /// do not involve creating a relationship. + pub RewardRelationships get(reward_relationships) : map T::AccountId => T::RewardRelationshipId; + + /// Reward amount paid out at each PayoutInterval + pub AmountPerPayout get(amount_per_payout): minting::BalanceOf; + + /// Optional interval in blocks on which a reward payout will be made to each council member + pub PayoutInterval get(payout_interval): Option; + + /// How many blocks after start of council term the first payout will be made + pub FirstPayoutAfterTermStart get(first_payout_after_term_start): T::BlockNumber; } } @@ -50,11 +64,7 @@ decl_event!( impl CouncilElected>, T::BlockNumber> for Module { fn council_elected(seats: Seats>, term: T::BlockNumber) { - >::put(seats); - - let next_term_ends_at = >::block_number() + term; - >::put(next_term_ends_at); - Self::deposit_event(RawEvent::NewCouncilTermStarted(next_term_ends_at)); + Self::apply_council_seats(seats, term); } } @@ -75,6 +85,73 @@ impl Module { CouncilMint::::put(mint_id); Ok(mint_id) } + + fn add_reward_relationship( + destination: &T::AccountId, + ) -> Result { + if let Some(reward_source) = Self::council_mint() { + let recipient = >::add_recipient(); + + let next_payout_at = system::Module::::block_number() + + Self::first_payout_after_term_start() + + T::BlockNumber::one(); + + let relationship_id = >::add_reward_relationship( + reward_source, + recipient, + destination.clone(), + Self::amount_per_payout(), + next_payout_at, + Self::payout_interval(), + )?; + + RewardRelationships::::insert(destination, relationship_id); + + Ok(relationship_id) + } else { + Err(recurringrewards::RewardsError::RewardSourceNotFound) + } + } + + fn remove_reward_relationships() { + for seat in Self::active_council().into_iter() { + if RewardRelationships::::exists(&seat.member) { + let id = Self::reward_relationships(&seat.member); + >::remove_reward_relationship(id); + } + } + } + + fn apply_council_seats(seats: Seats>, term: T::BlockNumber) { + >::put(seats.clone()); + + let next_term_ends_at = >::block_number() + term; + + >::put(next_term_ends_at); + + for seat in seats.iter() { + let reward_added_result = Self::add_reward_relationship(&seat.member); + + if reward_added_result.is_err() { + debug::info!("Failed to create a reward relationship for council seat"); + } + } + + Self::deposit_event(RawEvent::NewCouncilTermStarted(next_term_ends_at)); + } + + fn on_term_ended(now: T::BlockNumber) { + // Stop paying out rewards when the term ends. + // Note: Is it not simpler to just do a single payout at end of term? + // During the term the recurring reward module could unfairly pay some but not all council members + // If there is insufficient mint capacity.. so doing it at this point offers more control + // and a potentially more fair outcome in such a case. + Self::remove_reward_relationships(); + + Self::deposit_event(RawEvent::CouncilTermEnded(now)); + + T::CouncilTermEnded::council_term_ended(); + } } decl_module! { @@ -83,16 +160,22 @@ decl_module! { fn on_finalize(now: T::BlockNumber) { if now == Self::term_ends_at() { - Self::deposit_event(RawEvent::CouncilTermEnded(now)); - T::CouncilTermEnded::council_term_ended(); + Self::on_term_ended(now); } } // Privileged methods - /// Force set a zero staked council. Stakes in existing council will vanish into thin air! + /// Force set a zero staked council. Stakes in existing council seats are not returned. + /// Existing council rewards are removed and new council members do NOT get any rewards. + /// Avoid using this call if possible, will be deprecated. The term of the new council is + /// not extended. fn set_council(origin, accounts: Vec) { ensure_root(origin)?; + + // Council is being replaced so remove existing reward relationships if they exist + Self::remove_reward_relationships(); + let new_council: Seats> = accounts.into_iter().map(|account| { Seat { member: account, @@ -100,10 +183,11 @@ decl_module! { backers: vec![] } }).collect(); + >::put(new_council); } - /// Adds a zero staked council member + /// Adds a zero staked council member. A member added in this way does not get a recurring reward. fn add_council_member(origin, account: T::AccountId) { ensure_root(origin)?; ensure!(!Self::is_councilor(&account), "cannot add same account multiple times"); @@ -117,13 +201,22 @@ decl_module! { >::mutate(|council| council.push(seat)); } + /// Remove a single council member and their reward. fn remove_council_member(origin, account_to_remove: T::AccountId) { ensure_root(origin)?; + ensure!(Self::is_councilor(&account_to_remove), "account is not a councilor"); + + if RewardRelationships::::exists(&account_to_remove) { + let relationship_id = Self::reward_relationships(&account_to_remove); + >::remove_reward_relationship(relationship_id); + } + let filtered_council: Seats> = Self::active_council() .into_iter() .filter(|c| c.member != account_to_remove) .collect(); + >::put(filtered_council); } @@ -156,11 +249,31 @@ decl_module! { return Err("CouncilHashNoMint") } } + + /// Sets the council rewards which is only applied on new council being elected. + fn set_council_rewards( + origin, + amount_per_payout: minting::BalanceOf, + payout_interval: Option, + first_payout_after_term_start: T::BlockNumber + ) { + ensure_root(origin)?; + + AmountPerPayout::::put(amount_per_payout); + FirstPayoutAfterTermStart::::put(first_payout_after_term_start); + + if let Some(payout_interval) = payout_interval { + PayoutInterval::::put(payout_interval); + } else { + PayoutInterval::::take(); + } + } } } #[cfg(test)] mod tests { + use super::*; use crate::mock::*; use srml_support::*; @@ -212,4 +325,38 @@ mod tests { assert!(Council::is_councilor(&6)); }); } + + #[test] + fn council_elected_test() { + initial_test_ext().execute_with(|| { + Council::council_elected( + vec![ + Seat { + member: 5, + stake: 0, + backers: vec![], + }, + Seat { + member: 6, + stake: 0, + backers: vec![], + }, + Seat { + member: 7, + stake: 0, + backers: vec![], + }, + ], + 50 as u64, // ::BlockNumber::from(50) + ); + + assert!(Council::is_councilor(&5)); + assert!(Council::is_councilor(&6)); + assert!(Council::is_councilor(&7)); + + assert!(RewardRelationships::::exists(&5)); + assert!(RewardRelationships::::exists(&6)); + assert!(RewardRelationships::::exists(&7)); + }); + } } diff --git a/runtime-modules/governance/src/mock.rs b/runtime-modules/governance/src/mock.rs index 8d13c511fe..5063935a74 100644 --- a/runtime-modules/governance/src/mock.rs +++ b/runtime-modules/governance/src/mock.rs @@ -74,6 +74,11 @@ impl minting::Trait for Test { type Currency = Balances; type MintId = u64; } +impl recurringrewards::Trait for Test { + type PayoutStatusHandler = (); + type RecipientId = u64; + type RewardRelationshipId = u64; +} parameter_types! { pub const ExistentialDeposit: u32 = 0; pub const TransferFee: u32 = 0; diff --git a/runtime-modules/governance/src/proposals.rs b/runtime-modules/governance/src/proposals.rs index 64a177a6fd..ba7166986d 100644 --- a/runtime-modules/governance/src/proposals.rs +++ b/runtime-modules/governance/src/proposals.rs @@ -655,6 +655,12 @@ mod tests { type MintId = u64; } + impl recurringrewards::Trait for Test { + type PayoutStatusHandler = (); + type RecipientId = u64; + type RewardRelationshipId = u64; + } + impl Trait for Test { type Event = (); } From ac376d231156d8202cca5694bec948cf1d7c7136 Mon Sep 17 00:00:00 2001 From: Leszek Wiesner Date: Mon, 13 Apr 2020 12:13:04 +0200 Subject: [PATCH 181/286] Fixing repository information in package.json --- cli/package.json | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/cli/package.json b/cli/package.json index e66ca92244..70571276b5 100644 --- a/cli/package.json +++ b/cli/package.json @@ -6,7 +6,7 @@ "bin": { "joystream-cli": "./bin/run" }, - "bugs": "https://github.com/Joystream/cli/issues", + "bugs": "https://github.com/Joystream/substrate-runtime-joystream/issues", "dependencies": { "@joystream/types": "^0.6.0", "@oclif/command": "^1.5.19", @@ -47,13 +47,14 @@ "/npm-shrinkwrap.json", "/oclif.manifest.json" ], - "homepage": "https://github.com/Joystream/cli", + "homepage": "https://github.com/Joystream/substrate-runtime-joystream/blob/master/cli", "keywords": [ "oclif" ], "license": "MIT", "main": "lib/index.js", "oclif": { + "repositoryPrefix": "<%- repo %>/blob/master/cli/<%- commandPath %>", "commands": "./lib/commands", "bin": "joystream-cli", "plugins": [ @@ -68,7 +69,11 @@ } } }, - "repository": "Joystream/cli", + "repository": { + "type" : "git", + "url" : "https://github.com/Joystream/substrate-runtime-joystream", + "directory": "cli" + }, "scripts": { "postpack": "rm -f oclif.manifest.json", "posttest": "eslint . --ext .ts --config .eslintrc", From 6e1309cb5ad75bd0c87c8ef512541d55f04380c0 Mon Sep 17 00:00:00 2001 From: Leszek Wiesner Date: Mon, 13 Apr 2020 12:13:49 +0200 Subject: [PATCH 182/286] Api.ts - final refactoring --- cli/src/Api.ts | 123 ++++++++++----------- cli/src/base/AccountsCommandBase.ts | 10 +- cli/src/commands/account/current.ts | 3 +- cli/src/commands/account/transferTokens.ts | 7 +- cli/src/commands/council/info.ts | 2 +- 5 files changed, 70 insertions(+), 75 deletions(-) diff --git a/cli/src/Api.ts b/cli/src/Api.ts index d810736c9c..cb07d6c9b7 100644 --- a/cli/src/Api.ts +++ b/cli/src/Api.ts @@ -4,6 +4,7 @@ import { ApiPromise, WsProvider } from '@polkadot/api'; import { formatBalance } from '@polkadot/util'; import { Balance, Hash } from '@polkadot/types/interfaces'; import { KeyringPair } from '@polkadot/keyring/types'; +import { Codec } from '@polkadot/types/types'; import { AccountBalances, CouncilInfoObj, CouncilInfoTuple, AccountSummary, createCouncilInfoObj } from './Types'; import { DerivedFees, DerivedBalances } from '@polkadot/api-derive/types'; import { CLIError } from '@oclif/errors'; @@ -19,10 +20,13 @@ const TOKEN_SYMBOL = 'JOY'; // Api wrapper for handling most common api calls and allowing easy API implementation switch in the future export default class Api { - private _api: ApiPromise | null = null; - private initializing: boolean = false; + private _api: ApiPromise; - private async initApi(): Promise { + private constructor(originalApi:ApiPromise) { + this._api = originalApi; + } + + private static async initApi(): Promise { formatBalance.setDefaults({ unit: TOKEN_SYMBOL }); const wsProvider:WsProvider = new WsProvider(API_URL); registerJoystreamTypes(); @@ -30,42 +34,42 @@ export default class Api { return await ApiPromise.create({ provider: wsProvider }); } - private async getApi(): Promise { - while (this.initializing) { - await new Promise((res,rej) => setTimeout(res, 10)); - } - if (!this._api) { - this.initializing = true; - this._api = await this.initApi(); - this.initializing = false; - } + static async create(): Promise { + const originalApi: ApiPromise = await Api.initApi(); + return new Api(originalApi); + } - return this._api; + private async queryMultiOnce(queries: Parameters[0]): Promise { + let results: Codec[] = []; + + const unsub = await this._api.queryMulti( + queries, + (res) => { results = res } + ); + unsub(); + + if (!results.length || results.length !== queries.length) { + throw new CLIError('API querying issue', { exit: ExitCodes.ApiError }); + } + return results; } async getAccountsBalancesInfo(accountAddresses:string[]): Promise { - const api: ApiPromise = await this.getApi(); - let apiQueries:any = []; for (let address of accountAddresses) { - apiQueries.push([api.query.balances.freeBalance, address]); - apiQueries.push([api.query.balances.reservedBalance, address]); + apiQueries.push([this._api.query.balances.freeBalance, address]); + apiQueries.push([this._api.query.balances.reservedBalance, address]); } let balances: AccountBalances[] = []; - const unsub = await api.queryMulti( - apiQueries, - (balancesRes) => { - for (let key in accountAddresses) { - let numKey: number = parseInt(key); - const free: Balance = balancesRes[numKey*2]; - const reserved: Balance = balancesRes[numKey*2 + 1]; - const total: Balance = api.createType('Balance', free.add(reserved)); - balances[key] = { free, reserved, total }; - } - } - ); - unsub(); + let balancesRes = await this.queryMultiOnce(apiQueries); + for (let key in accountAddresses) { + let numKey: number = parseInt(key); + const free: Balance = balancesRes[numKey*2]; + const reserved: Balance = balancesRes[numKey*2 + 1]; + const total: Balance = this._api.createType('Balance', free.add(reserved)); + balances[key] = { free, reserved, total }; + } return balances; } @@ -73,51 +77,40 @@ export default class Api { // Get on-chain data related to given account. // For now it's just account balances async getAccountSummary(accountAddresses:string): Promise { - const api: ApiPromise = await this.getApi(); - const balances: DerivedBalances = await api.derive.balances.all(accountAddresses); + const balances: DerivedBalances = await this._api.derive.balances.all(accountAddresses); return { balances }; } async getCouncilInfo(): Promise { - const api: ApiPromise = await this.getApi(); - let infoObj: CouncilInfoObj | null = null; - const unsub = await api.queryMulti( - [ - api.query.council.activeCouncil, - api.query.council.termEndsAt, - api.query.councilElection.autoStart, - api.query.councilElection.newTermDuration, - api.query.councilElection.candidacyLimit, - api.query.councilElection.councilSize, - api.query.councilElection.minCouncilStake, - api.query.councilElection.minVotingStake, - api.query.councilElection.announcingPeriod, - api.query.councilElection.votingPeriod, - api.query.councilElection.revealingPeriod, - api.query.councilElection.round, - api.query.councilElection.stage - ], - ((res) => { - infoObj = createCouncilInfoObj(...( res)); - }) - ); - unsub(); - - if (infoObj) return infoObj; - // Probably never happens, but otherwise TS will see it as error - else throw new CLIError('Unexpected API error', { exit: ExitCodes.ApiError }); + const results = await this.queryMultiOnce([ + this._api.query.council.activeCouncil, + this._api.query.council.termEndsAt, + this._api.query.councilElection.autoStart, + this._api.query.councilElection.newTermDuration, + this._api.query.councilElection.candidacyLimit, + this._api.query.councilElection.councilSize, + this._api.query.councilElection.minCouncilStake, + this._api.query.councilElection.minVotingStake, + this._api.query.councilElection.announcingPeriod, + this._api.query.councilElection.votingPeriod, + this._api.query.councilElection.revealingPeriod, + this._api.query.councilElection.round, + this._api.query.councilElection.stage + ]); + + let infoObj: CouncilInfoObj = createCouncilInfoObj(...( results)); + + return infoObj; } // TODO: This formula is probably not too good, so some better implementation will be required in the future async estimateFee(account: KeyringPair, recipientAddr: string, amount: BN): Promise { - const api: ApiPromise = await this.getApi(); - - const transfer = api.tx.balances.transfer(recipientAddr, amount); + const transfer = this._api.tx.balances.transfer(recipientAddr, amount); const signature = account.sign(transfer.toU8a()); const transactionByteSize:BN = new BN(transfer.encodedLength + signature.length); - const fees: DerivedFees = await api.derive.balances.fees(); + const fees: DerivedFees = await this._api.derive.balances.fees(); const estimatedFee = fees.transactionBaseFee.add(fees.transactionByteFee.mul(transactionByteSize)); @@ -125,9 +118,7 @@ export default class Api { } async transfer(account: KeyringPair, recipientAddr: string, amount: BN): Promise { - const api: ApiPromise = await this.getApi(); - - const txHash = await api.tx.balances + const txHash = await this._api.tx.balances .transfer(recipientAddr, amount) .signAndSend(account); return txHash; diff --git a/cli/src/base/AccountsCommandBase.ts b/cli/src/base/AccountsCommandBase.ts index 24ece1c16c..716a45fc97 100644 --- a/cli/src/base/AccountsCommandBase.ts +++ b/cli/src/base/AccountsCommandBase.ts @@ -16,6 +16,12 @@ type StateObject = { selectedAccountFilename: string }; export default abstract class AccountsCommandBase extends Command { static ACCOUNTS_DIRNAME = '/accounts'; static STATE_FILE = '/state.json'; + private api: Api | null = null; + + getApi(): Api { + if (!this.api) throw new CLIError('Tried to get API before initialization.', { exit: ExitCodes.ApiError }); + return this.api; + } getAccountsDirPath(): string { return path.join(this.config.dataDir, AccountsCommandBase.ACCOUNTS_DIRNAME); @@ -213,8 +219,7 @@ export default abstract class AccountsCommandBase extends Command { ): Promise { let balances: AccountBalances[]; if (showBalances) { - const api: Api = new Api(); - balances = await api.getAccountsBalancesInfo(accounts.map(acc => acc.address)); + balances = await this.getApi().getAccountsBalancesInfo(accounts.map(acc => acc.address)); } const { chosenAccountFilename } = await inquirer.prompt([{ name: 'chosenAccountFilename', @@ -243,6 +248,7 @@ export default abstract class AccountsCommandBase extends Command { } async init() { + this.api = await Api.create(); try { this.initDataDir(); } catch (e) { diff --git a/cli/src/commands/account/current.ts b/cli/src/commands/account/current.ts index 76e57577b8..c6fe63f0a4 100644 --- a/cli/src/commands/account/current.ts +++ b/cli/src/commands/account/current.ts @@ -10,9 +10,8 @@ export default class AccountCurrent extends AccountsCommandBase { static aliases = ['account:info', 'account:default']; async run() { - const api: Api = new Api(); const currentAccount: NamedKeyringPair = await this.getRequiredSelectedAccount(false); - const summary: AccountSummary = await api.getAccountSummary(currentAccount.address); + const summary: AccountSummary = await this.getApi().getAccountSummary(currentAccount.address); displayHeader('Account information'); const creationDate: string = currentAccount.meta.whenCreated ? diff --git a/cli/src/commands/account/transferTokens.ts b/cli/src/commands/account/transferTokens.ts index 1494a81540..5e39df6d0a 100644 --- a/cli/src/commands/account/transferTokens.ts +++ b/cli/src/commands/account/transferTokens.ts @@ -31,13 +31,12 @@ export default class AccountTransferTokens extends AccountsCommandBase { async run() { const args: AccountTransferArgs = this.parse(AccountTransferTokens).args; - const api: Api = new Api(); const selectedAccount: NamedKeyringPair = await this.getRequiredSelectedAccount(); const amountBN: BN = new BN(args.amount); // Initial validation validateAddress(args.recipient, 'Invalid recipient address'); - const accBalances: AccountBalances = (await api.getAccountsBalancesInfo([ selectedAccount.address ]))[0]; + const accBalances: AccountBalances = (await this.getApi().getAccountsBalancesInfo([ selectedAccount.address ]))[0]; checkBalance(accBalances, amountBN); await this.requestAccountDecoding(selectedAccount); @@ -45,7 +44,7 @@ export default class AccountTransferTokens extends AccountsCommandBase { this.log(chalk.white('Estimating fee...')); let estimatedFee: BN; try { - estimatedFee = await api.estimateFee(selectedAccount, args.recipient, amountBN); + estimatedFee = await this.getApi().estimateFee(selectedAccount, args.recipient, amountBN); } catch (e) { this.error('Could not estimate the fee.', { exit: ExitCodes.UnexpectedException }); @@ -59,7 +58,7 @@ export default class AccountTransferTokens extends AccountsCommandBase { await this.requireConfirmation('Do you confirm the transfer?'); try { - const txHash: Hash = await api.transfer(selectedAccount, args.recipient, amountBN); + const txHash: Hash = await this.getApi().transfer(selectedAccount, args.recipient, amountBN); this.log(chalk.greenBright('Transaction succesfully sent!')); this.log(chalk.white('Hash:', txHash.toString())); } catch (e) { diff --git a/cli/src/commands/council/info.ts b/cli/src/commands/council/info.ts index 5005a8ce7f..2226489f43 100644 --- a/cli/src/commands/council/info.ts +++ b/cli/src/commands/council/info.ts @@ -52,7 +52,7 @@ export default class CouncilInfo extends Command { } async run() { - const api = new Api(); + const api = await Api.create(); const infoObj = await api.getCouncilInfo(); this.displayInfo(infoObj); this.exit(); From 1a709852476ced584a460d87bc9a2282dda38c97 Mon Sep 17 00:00:00 2001 From: Leszek Wiesner Date: Mon, 13 Apr 2020 12:58:21 +0200 Subject: [PATCH 183/286] Current data model description comment --- cli/src/base/AccountsCommandBase.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/cli/src/base/AccountsCommandBase.ts b/cli/src/base/AccountsCommandBase.ts index 716a45fc97..b47d43992e 100644 --- a/cli/src/base/AccountsCommandBase.ts +++ b/cli/src/base/AccountsCommandBase.ts @@ -13,6 +13,17 @@ import { AccountBalances, NamedKeyringPair } from '../Types'; type StateObject = { selectedAccountFilename: string }; +/** + * Abstract base class for account-related commands. + * + * All the accounts available in the CLI are stored in the form of json backup files inside: + * { this.config.dataDir }/{ ACCOUNTS_DIRNAME } (ie. ~/.local/share/joystream-cli/accounts on Ubuntu) + * Where: this.config.dataDir is provided by oclif and ACCOUNTS_DIRNAME is a static of AccountsCommandBase. + * + * Additionally, there is a state.json file kept inside the data directory (this.config.dataDir). + * Currently it just stores information about the default account that can be choosen by the user + * by executing account:choose command (see "StateObject" type above). + */ export default abstract class AccountsCommandBase extends Command { static ACCOUNTS_DIRNAME = '/accounts'; static STATE_FILE = '/state.json'; From f0232ca1b1b5eab42591976cf0e9b989ffea28c3 Mon Sep 17 00:00:00 2001 From: Leszek Wiesner Date: Mon, 13 Apr 2020 17:28:21 +0200 Subject: [PATCH 184/286] Types - comments and minor adjustments --- cli/src/Api.ts | 40 ++++++++++++++++++++-------------------- cli/src/Types.ts | 39 ++++++++++++++++++++++++++------------- 2 files changed, 46 insertions(+), 33 deletions(-) diff --git a/cli/src/Api.ts b/cli/src/Api.ts index cb07d6c9b7..42e2fda8d2 100644 --- a/cli/src/Api.ts +++ b/cli/src/Api.ts @@ -1,11 +1,12 @@ import BN from 'bn.js'; import { registerJoystreamTypes } from '@joystream/types'; import { ApiPromise, WsProvider } from '@polkadot/api'; +import { QueryableStorageMultiArg } from '@polkadot/api/types'; import { formatBalance } from '@polkadot/util'; import { Balance, Hash } from '@polkadot/types/interfaces'; import { KeyringPair } from '@polkadot/keyring/types'; import { Codec } from '@polkadot/types/types'; -import { AccountBalances, CouncilInfoObj, CouncilInfoTuple, AccountSummary, createCouncilInfoObj } from './Types'; +import { AccountBalances, AccountSummary, CouncilInfoObj, CouncilInfoTuple, createCouncilInfoObj } from './Types'; import { DerivedFees, DerivedBalances } from '@polkadot/api-derive/types'; import { CLIError } from '@oclif/errors'; import ExitCodes from './ExitCodes'; @@ -83,25 +84,24 @@ export default class Api { } async getCouncilInfo(): Promise { - const results = await this.queryMultiOnce([ - this._api.query.council.activeCouncil, - this._api.query.council.termEndsAt, - this._api.query.councilElection.autoStart, - this._api.query.councilElection.newTermDuration, - this._api.query.councilElection.candidacyLimit, - this._api.query.councilElection.councilSize, - this._api.query.councilElection.minCouncilStake, - this._api.query.councilElection.minVotingStake, - this._api.query.councilElection.announcingPeriod, - this._api.query.councilElection.votingPeriod, - this._api.query.councilElection.revealingPeriod, - this._api.query.councilElection.round, - this._api.query.councilElection.stage - ]); - - let infoObj: CouncilInfoObj = createCouncilInfoObj(...( results)); - - return infoObj; + const queries: { [P in keyof CouncilInfoObj]: QueryableStorageMultiArg<"promise"> } = { + activeCouncil: this._api.query.council.activeCouncil, + termEndsAt: this._api.query.council.termEndsAt, + autoStart: this._api.query.councilElection.autoStart, + newTermDuration: this._api.query.councilElection.newTermDuration, + candidacyLimit: this._api.query.councilElection.candidacyLimit, + councilSize: this._api.query.councilElection.councilSize, + minCouncilStake: this._api.query.councilElection.minCouncilStake, + minVotingStake: this._api.query.councilElection.minVotingStake, + announcingPeriod: this._api.query.councilElection.announcingPeriod, + votingPeriod: this._api.query.councilElection.votingPeriod, + revealingPeriod: this._api.query.councilElection.revealingPeriod, + round: this._api.query.councilElection.round, + stage: this._api.query.councilElection.stage + } + const results: CouncilInfoTuple = await this.queryMultiOnce(Object.values(queries)); + + return createCouncilInfoObj(...results); } // TODO: This formula is probably not too good, so some better implementation will be required in the future diff --git a/cli/src/Types.ts b/cli/src/Types.ts index b01c92bb8c..d8d0bf8865 100644 --- a/cli/src/Types.ts +++ b/cli/src/Types.ts @@ -5,38 +5,48 @@ import { BlockNumber, Balance } from '@polkadot/types/interfaces'; import { DerivedBalances } from '@polkadot/api-derive/types'; import { KeyringPair } from '@polkadot/keyring/types'; +// KeyringPair type extended with mandatory "meta.name" +// It's used for accounts/keys management within CLI. +// If not provided in the account json file, the meta.name value is set to "Unnamed Account" export type NamedKeyringPair = KeyringPair & { meta: { name: string } } +// Simplified account balances (used when listing multiple accounts etc.) +// Combines results returned by api.query.balances.freeBalance and api.query.balances.reservedBalance export type AccountBalances = { free: Balance, reserved: Balance, total: Balance }; +// Summary of the account information fetched from the api for "account:current" purposes (currently just balances) export type AccountSummary = { balances: DerivedBalances } +// Object/Tuple containing council/councilElection information (council:info). +// The tuple is useful, because that's how api.queryMulti returns the results. export type CouncilInfoTuple = Parameters; export type CouncilInfoObj = ReturnType; +// This function allows us to easily transform the tuple into the object +// and simplifies the creation of consitent Object and Tuple types (seen above). export function createCouncilInfoObj( - activeCouncil: Seat[] | undefined, - termEndsAt: BlockNumber | undefined, - autoStart: Boolean | undefined, - newTermDuration: BN | undefined, - candidacyLimit: BN | undefined, - councilSize: BN | undefined, - minCouncilStake: Balance | undefined, - minVotingStake: Balance | undefined, - announcingPeriod: BlockNumber | undefined, - votingPeriod: BlockNumber | undefined, - revealingPeriod: BlockNumber | undefined, - round: BN | undefined, - stage: Option | undefined + activeCouncil: Seat[], + termEndsAt: BlockNumber, + autoStart: Boolean, + newTermDuration: BN, + candidacyLimit: BN, + councilSize: BN, + minCouncilStake: Balance, + minVotingStake: Balance, + announcingPeriod: BlockNumber, + votingPeriod: BlockNumber, + revealingPeriod: BlockNumber, + round: BN, + stage: Option ) { return { activeCouncil, @@ -55,4 +65,7 @@ export function createCouncilInfoObj( }; } +// Object with "name" and "value" properties, used for rendering simple CLI tables like: +// Total balance: 100 JOY +// Free calance: 50 JOY export type NameValueObj = { name: string, value: string }; From 30b3172c18b431fa890798384c7eb6bd851ef778 Mon Sep 17 00:00:00 2001 From: Leszek Wiesner Date: Mon, 13 Apr 2020 17:30:11 +0200 Subject: [PATCH 185/286] Updated README.md with fixed links --- cli/README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cli/README.md b/cli/README.md index 98f3af16bc..ce7cfdaf6b 100644 --- a/cli/README.md +++ b/cli/README.md @@ -47,7 +47,7 @@ USAGE $ joystream-cli account:choose ``` -_See code: [src/commands/account/choose.ts](https://github.com/Joystream/cli/blob/v0.0.0/src/commands/account/choose.ts)_ +_See code: [src/commands/account/choose.ts](https://github.com/Joystream/substrate-runtime-joystream/blob/master/cli/src/commands/account/choose.ts)_ ## `joystream-cli account:create NAME` @@ -61,7 +61,7 @@ ARGUMENTS NAME Account name ``` -_See code: [src/commands/account/create.ts](https://github.com/Joystream/cli/blob/v0.0.0/src/commands/account/create.ts)_ +_See code: [src/commands/account/create.ts](https://github.com/Joystream/substrate-runtime-joystream/blob/master/cli/src/commands/account/create.ts)_ ## `joystream-cli account:current` @@ -76,7 +76,7 @@ ALIASES $ joystream-cli account:default ``` -_See code: [src/commands/account/current.ts](https://github.com/Joystream/cli/blob/v0.0.0/src/commands/account/current.ts)_ +_See code: [src/commands/account/current.ts](https://github.com/Joystream/substrate-runtime-joystream/blob/master/cli/src/commands/account/current.ts)_ ## `joystream-cli account:export PATH` @@ -93,7 +93,7 @@ OPTIONS -a, --all If provided, exports all existing accounts into "exported_accounts" folder inside given path ``` -_See code: [src/commands/account/export.ts](https://github.com/Joystream/cli/blob/v0.0.0/src/commands/account/export.ts)_ +_See code: [src/commands/account/export.ts](https://github.com/Joystream/substrate-runtime-joystream/blob/master/cli/src/commands/account/export.ts)_ ## `joystream-cli account:forget` @@ -104,7 +104,7 @@ USAGE $ joystream-cli account:forget ``` -_See code: [src/commands/account/forget.ts](https://github.com/Joystream/cli/blob/v0.0.0/src/commands/account/forget.ts)_ +_See code: [src/commands/account/forget.ts](https://github.com/Joystream/substrate-runtime-joystream/blob/master/cli/src/commands/account/forget.ts)_ ## `joystream-cli account:import BACKUPFILEPATH` @@ -118,7 +118,7 @@ ARGUMENTS BACKUPFILEPATH Path to account backup JSON file ``` -_See code: [src/commands/account/import.ts](https://github.com/Joystream/cli/blob/v0.0.0/src/commands/account/import.ts)_ +_See code: [src/commands/account/import.ts](https://github.com/Joystream/substrate-runtime-joystream/blob/master/cli/src/commands/account/import.ts)_ ## `joystream-cli account:transferTokens RECIPIENT AMOUNT` @@ -133,7 +133,7 @@ ARGUMENTS AMOUNT Amount of tokens to transfer ``` -_See code: [src/commands/account/transferTokens.ts](https://github.com/Joystream/cli/blob/v0.0.0/src/commands/account/transferTokens.ts)_ +_See code: [src/commands/account/transferTokens.ts](https://github.com/Joystream/substrate-runtime-joystream/blob/master/cli/src/commands/account/transferTokens.ts)_ ## `joystream-cli council:info` @@ -144,7 +144,7 @@ USAGE $ joystream-cli council:info ``` -_See code: [src/commands/council/info.ts](https://github.com/Joystream/cli/blob/v0.0.0/src/commands/council/info.ts)_ +_See code: [src/commands/council/info.ts](https://github.com/Joystream/substrate-runtime-joystream/blob/master/cli/src/commands/council/info.ts)_ ## `joystream-cli help [COMMAND]` From a6148b9a91b7c179ec0eb729ff1584e36b59bddb Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Tue, 14 Apr 2020 11:17:25 +0400 Subject: [PATCH 186/286] migration: print warning on error creating council mint --- runtime/src/migration.rs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/runtime/src/migration.rs b/runtime/src/migration.rs index e0b144429a..ae56da195a 100644 --- a/runtime/src/migration.rs +++ b/runtime/src/migration.rs @@ -1,6 +1,6 @@ use crate::VERSION; use sr_primitives::{print, traits::Zero}; -use srml_support::{decl_event, decl_module, decl_storage}; +use srml_support::{debug, decl_event, decl_module, decl_storage}; use sudo; use system; @@ -15,10 +15,17 @@ impl Module { // ... // Create the Council mint. If it fails, we can't do anything about it here. - let _ = governance::council::Module::::create_new_council_mint( + let mint_creation_result = governance::council::Module::::create_new_council_mint( minting::BalanceOf::::zero(), ); + if mint_creation_result.is_err() { + debug::warn!( + "Failed to create a mint for council during migration: {:?}", + mint_creation_result + ); + } + Self::deposit_event(RawEvent::Migrated( >::block_number(), VERSION.spec_version, From 82c35920b37ee31dd0a626bdf7cd7df84b1bdc2d Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Tue, 14 Apr 2020 13:16:05 +0400 Subject: [PATCH 187/286] council rewards: always add reward to seat --- runtime-modules/governance/src/council.rs | 105 ++++++++++++---------- 1 file changed, 59 insertions(+), 46 deletions(-) diff --git a/runtime-modules/governance/src/council.rs b/runtime-modules/governance/src/council.rs index 1befc8bc4a..e031de6cb4 100644 --- a/runtime-modules/governance/src/council.rs +++ b/runtime-modules/governance/src/council.rs @@ -49,8 +49,8 @@ decl_storage! { /// Optional interval in blocks on which a reward payout will be made to each council member pub PayoutInterval get(payout_interval): Option; - /// How many blocks after start of council term the first payout will be made - pub FirstPayoutAfterTermStart get(first_payout_after_term_start): T::BlockNumber; + /// How many blocks after the reward is created, the first payout will be made + pub FirstPayoutAfterRewardCreated get(first_payout_after_reward_created): T::BlockNumber; } } @@ -64,7 +64,24 @@ decl_event!( impl CouncilElected>, T::BlockNumber> for Module { fn council_elected(seats: Seats>, term: T::BlockNumber) { - Self::apply_council_seats(seats, term); + >::put(seats.clone()); + + let next_term_ends_at = >::block_number() + term; + + >::put(next_term_ends_at); + + if let Some(reward_source) = Self::council_mint() { + for seat in seats.iter() { + Self::add_reward_relationship(&seat.member, reward_source); + } + } else { + // Skip trying to create rewards since no mint has been created yet + debug::warn!( + "Not creating reward relationship for council seats because no mint exists" + ); + } + + Self::deposit_event(RawEvent::NewCouncilTermStarted(next_term_ends_at)); } } @@ -86,30 +103,26 @@ impl Module { Ok(mint_id) } - fn add_reward_relationship( - destination: &T::AccountId, - ) -> Result { - if let Some(reward_source) = Self::council_mint() { - let recipient = >::add_recipient(); - - let next_payout_at = system::Module::::block_number() - + Self::first_payout_after_term_start() - + T::BlockNumber::one(); - - let relationship_id = >::add_reward_relationship( - reward_source, - recipient, - destination.clone(), - Self::amount_per_payout(), - next_payout_at, - Self::payout_interval(), - )?; - + fn add_reward_relationship(destination: &T::AccountId, reward_source: T::MintId) { + let recipient = >::add_recipient(); + + // When calculating when first payout occurs, add minimum of one block interval to ensure rewards module + // has a chance to execute its on_finalize routine. + let next_payout_at = system::Module::::block_number() + + Self::first_payout_after_reward_created() + + T::BlockNumber::one(); + + if let Ok(relationship_id) = >::add_reward_relationship( + reward_source, + recipient, + destination.clone(), + Self::amount_per_payout(), + next_payout_at, + Self::payout_interval(), + ) { RewardRelationships::::insert(destination, relationship_id); - - Ok(relationship_id) } else { - Err(recurringrewards::RewardsError::RewardSourceNotFound) + debug::warn!("Failed to create a reward relationship for council seat"); } } @@ -122,24 +135,6 @@ impl Module { } } - fn apply_council_seats(seats: Seats>, term: T::BlockNumber) { - >::put(seats.clone()); - - let next_term_ends_at = >::block_number() + term; - - >::put(next_term_ends_at); - - for seat in seats.iter() { - let reward_added_result = Self::add_reward_relationship(&seat.member); - - if reward_added_result.is_err() { - debug::info!("Failed to create a reward relationship for council seat"); - } - } - - Self::deposit_event(RawEvent::NewCouncilTermStarted(next_term_ends_at)); - } - fn on_term_ended(now: T::BlockNumber) { // Stop paying out rewards when the term ends. // Note: Is it not simpler to just do a single payout at end of term? @@ -176,6 +171,12 @@ decl_module! { // Council is being replaced so remove existing reward relationships if they exist Self::remove_reward_relationships(); + if let Some(reward_source) = Self::council_mint() { + for account in accounts.clone() { + Self::add_reward_relationship(&account, reward_source); + } + } + let new_council: Seats> = accounts.into_iter().map(|account| { Seat { member: account, @@ -190,7 +191,13 @@ decl_module! { /// Adds a zero staked council member. A member added in this way does not get a recurring reward. fn add_council_member(origin, account: T::AccountId) { ensure_root(origin)?; + ensure!(!Self::is_councilor(&account), "cannot add same account multiple times"); + + if let Some(reward_source) = Self::council_mint() { + Self::add_reward_relationship(&account, reward_source); + } + let seat = Seat { member: account, stake: BalanceOf::::zero(), @@ -246,7 +253,7 @@ decl_module! { if let Some(mint_id) = Self::council_mint() { minting::Module::::transfer_tokens(mint_id, amount, &destination)?; } else { - return Err("CouncilHashNoMint") + return Err("CouncilHasNoMint") } } @@ -255,12 +262,12 @@ decl_module! { origin, amount_per_payout: minting::BalanceOf, payout_interval: Option, - first_payout_after_term_start: T::BlockNumber + first_payout_after_reward_created: T::BlockNumber ) { ensure_root(origin)?; AmountPerPayout::::put(amount_per_payout); - FirstPayoutAfterTermStart::::put(first_payout_after_term_start); + FirstPayoutAfterRewardCreated::::put(first_payout_after_reward_created); if let Some(payout_interval) = payout_interval { PayoutInterval::::put(payout_interval); @@ -329,6 +336,12 @@ mod tests { #[test] fn council_elected_test() { initial_test_ext().execute_with(|| { + // Ensure a mint is created so we can create rewards + assert_ok!(Council::set_council_mint_capacity( + system::RawOrigin::Root.into(), + 1000 + )); + Council::council_elected( vec![ Seat { From 17e5e2266abaad4694c852d9a3f3976f7bfa387a Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Tue, 14 Apr 2020 11:17:25 +0400 Subject: [PATCH 188/286] migration: fix setting initial spec value at genesis --- node/src/chain_spec.rs | 6 +++-- runtime/src/lib.rs | 2 +- runtime/src/migration.rs | 47 +++++++++++++++++++++++++++------------- 3 files changed, 37 insertions(+), 18 deletions(-) diff --git a/node/src/chain_spec.rs b/node/src/chain_spec.rs index 99271c8c83..d86355e306 100644 --- a/node/src/chain_spec.rs +++ b/node/src/chain_spec.rs @@ -19,8 +19,9 @@ use node_runtime::{ AuthorityDiscoveryConfig, BabeConfig, Balance, BalancesConfig, ContentWorkingGroupConfig, CouncilConfig, CouncilElectionConfig, DataObjectStorageRegistryConfig, DataObjectTypeRegistryConfig, ElectionParameters, GrandpaConfig, ImOnlineConfig, IndicesConfig, - MembersConfig, Perbill, ProposalsConfig, SessionConfig, SessionKeys, Signature, StakerStatus, - StakingConfig, SudoConfig, SystemConfig, VersionedStoreConfig, DAYS, WASM_BINARY, + MembersConfig, MigrationConfig, Perbill, ProposalsConfig, SessionConfig, SessionKeys, + Signature, StakerStatus, StakingConfig, SudoConfig, SystemConfig, VersionedStoreConfig, DAYS, + WASM_BINARY, }; pub use node_runtime::{AccountId, GenesisConfig}; use primitives::{sr25519, Pair, Public}; @@ -307,5 +308,6 @@ pub fn testnet_genesis( channel_banner_constraint: crate::forum_config::new_validation(5, 1024), channel_title_constraint: crate::forum_config::new_validation(5, 1024), }), + migration: Some(MigrationConfig {}), } } diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index d4be1f6363..fa80be406b 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -826,13 +826,13 @@ construct_runtime!( RandomnessCollectiveFlip: randomness_collective_flip::{Module, Call, Storage}, Sudo: sudo, // Joystream + Migration: migration::{Module, Call, Storage, Event, Config}, Proposals: proposals::{Module, Call, Storage, Event, Config}, CouncilElection: election::{Module, Call, Storage, Event, Config}, Council: council::{Module, Call, Storage, Event, Config}, Memo: memo::{Module, Call, Storage, Event}, Members: members::{Module, Call, Storage, Event, Config}, Forum: forum::{Module, Call, Storage, Event, Config}, - Migration: migration::{Module, Call, Storage, Event}, Actors: actors::{Module, Call, Storage, Event, Config}, DataObjectTypeRegistry: data_object_type_registry::{Module, Call, Storage, Event, Config}, DataDirectory: data_directory::{Module, Call, Storage, Event}, diff --git a/runtime/src/migration.rs b/runtime/src/migration.rs index e0b144429a..071799e538 100644 --- a/runtime/src/migration.rs +++ b/runtime/src/migration.rs @@ -1,28 +1,36 @@ use crate::VERSION; use sr_primitives::{print, traits::Zero}; -use srml_support::{decl_event, decl_module, decl_storage}; +use srml_support::{debug, decl_event, decl_module, decl_storage}; use sudo; use system; impl Module { + /// This method is called from on_finalize() when a runtime upgrade is detected. This + /// happens when the runtime spec version is found to be higher than the stored value. + /// Important to note this method should be carefully maintained, because it runs on every runtime + /// upgrade. fn runtime_upgraded() { print("running runtime initializers..."); - // ... - // add initialization of modules introduced in new runtime release. This + // + // Add initialization of modules introduced in new runtime release. Typically this // would be any new storage values that need an initial value which would not - // have been initialized with config() or build() mechanism. - // ... + // have been initialized with config() or build() chainspec construction mechanism. + // Other tasks like resetting values, migrating values etc. + + // Runtime Upgrade Code for going from Rome to Constantinople // Create the Council mint. If it fails, we can't do anything about it here. - let _ = governance::council::Module::::create_new_council_mint( + let mint_creation_result = governance::council::Module::::create_new_council_mint( minting::BalanceOf::::zero(), ); - Self::deposit_event(RawEvent::Migrated( - >::block_number(), - VERSION.spec_version, - )); + if mint_creation_result.is_err() { + debug::warn!( + "Failed to create a mint for council during migration: {:?}", + mint_creation_result + ); + } } } @@ -39,9 +47,13 @@ pub trait Trait: decl_storage! { trait Store for Module as Migration { - /// Records at what runtime spec version the store was initialized. This allows the runtime - /// to know when to run initialize code if it was installed as an update. - pub SpecVersion get(spec_version) build(|_| VERSION.spec_version) : Option; + /// Records at what runtime spec version the store was initialized. At genesis this will be + /// initialized to Some(VERSION.spec_version). It is an Option because the first time the module + /// was introduced was as a runtime upgrade and type was never changed. + /// When the runtime is upgraded the spec version be updated. + pub SpecVersion get(spec_version) build(|_config: &GenesisConfig| { + VERSION.spec_version + }) : Option; } } @@ -57,11 +69,16 @@ decl_module! { fn on_initialize(_now: T::BlockNumber) { if Self::spec_version().map_or(true, |spec_version| VERSION.spec_version > spec_version) { - // mark store version with current version of the runtime + // Mark store version with current version of the runtime SpecVersion::put(VERSION.spec_version); - // run migrations and store initializers + // Run migrations and store initializers Self::runtime_upgraded(); + + Self::deposit_event(RawEvent::Migrated( + >::block_number(), + VERSION.spec_version, + )); } } } From d1d668710ec839c28e4653afd42dd4a0016f8131 Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Wed, 15 Apr 2020 09:40:25 +0400 Subject: [PATCH 189/286] runtime migration: fix comments --- runtime/src/migration.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/runtime/src/migration.rs b/runtime/src/migration.rs index 071799e538..056d6d6f87 100644 --- a/runtime/src/migration.rs +++ b/runtime/src/migration.rs @@ -5,14 +5,14 @@ use sudo; use system; impl Module { - /// This method is called from on_finalize() when a runtime upgrade is detected. This + /// This method is called from on_initialize() when a runtime upgrade is detected. This /// happens when the runtime spec version is found to be higher than the stored value. /// Important to note this method should be carefully maintained, because it runs on every runtime /// upgrade. fn runtime_upgraded() { - print("running runtime initializers..."); + print("Running runtime upgraded handler"); + - // // Add initialization of modules introduced in new runtime release. Typically this // would be any new storage values that need an initial value which would not // have been initialized with config() or build() chainspec construction mechanism. From e0b06e1fe9f1e1a8a44725d5529111d028ca7057 Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Wed, 15 Apr 2020 09:52:35 +0400 Subject: [PATCH 190/286] rustfmt --- runtime/src/migration.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/runtime/src/migration.rs b/runtime/src/migration.rs index 056d6d6f87..e3688e10d5 100644 --- a/runtime/src/migration.rs +++ b/runtime/src/migration.rs @@ -12,7 +12,6 @@ impl Module { fn runtime_upgraded() { print("Running runtime upgraded handler"); - // Add initialization of modules introduced in new runtime release. Typically this // would be any new storage values that need an initial value which would not // have been initialized with config() or build() chainspec construction mechanism. From 7012fb09aabf3a5c6028fd6db50b2de05c897fa8 Mon Sep 17 00:00:00 2001 From: Leszek Wiesner Date: Wed, 15 Apr 2020 16:57:19 +0200 Subject: [PATCH 191/286] README - adding development information --- cli/README.md | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/cli/README.md b/cli/README.md index ce7cfdaf6b..d9f83186a5 100644 --- a/cli/README.md +++ b/cli/README.md @@ -9,9 +9,35 @@ Command Line Interface for Joystream community and governance activities [![License](https://img.shields.io/npm/l/joystream-cli.svg)](https://github.com/Joystream/cli/blob/master/package.json) +* [Development](#development) * [Usage](#usage) * [Commands](#commands) + +# Development + +To run a command in developemnt environment (without installing the package): + +1. Navigate into the CLI root directory +1. Either execute any command like this: + + ``` + $ ./bin/run COMMAND + ``` + + Or use: + + ``` + $ npm link + ``` + + And then execute any command like this: + + ``` + $ joystream-cli COMMAND + ``` + + # Usage ```sh-session From 6afe50a71faee505ce3d8ba695dde4f184c52e42 Mon Sep 17 00:00:00 2001 From: Leszek Wiesner Date: Mon, 13 Apr 2020 16:16:28 +0200 Subject: [PATCH 192/286] api:query helper command --- cli/src/Api.ts | 4 ++ cli/src/commands/api/query.ts | 110 ++++++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+) create mode 100644 cli/src/commands/api/query.ts diff --git a/cli/src/Api.ts b/cli/src/Api.ts index 42e2fda8d2..731b7ce3a6 100644 --- a/cli/src/Api.ts +++ b/cli/src/Api.ts @@ -27,6 +27,10 @@ export default class Api { this._api = originalApi; } + public getOriginalApi(): ApiPromise { + return this._api; + } + private static async initApi(): Promise { formatBalance.setDefaults({ unit: TOKEN_SYMBOL }); const wsProvider:WsProvider = new WsProvider(API_URL); diff --git a/cli/src/commands/api/query.ts b/cli/src/commands/api/query.ts new file mode 100644 index 0000000000..42262608dc --- /dev/null +++ b/cli/src/commands/api/query.ts @@ -0,0 +1,110 @@ +import Api from '../../Api'; +import Command, { flags } from '@oclif/command'; +import { displayNameValueTable } from '../../helpers/display'; +import { ApiPromise } from '@polkadot/api'; +import { Text } from '@polkadot/types'; +import { QueryableModuleStorage } from '@polkadot/api/types'; +import ExitCodes from '../../ExitCodes'; +import chalk from 'chalk'; + +// This command flags +type ApiQueryFlags = { + module: string, + method: string, + makeCall: boolean, + callArgs: string +}; + +// Optional metadata attached to api.query[module][method] (this type is used to force correct TS compatibility) +type OptionalApiMeta = { meta: { documentation: Text | undefined } | undefined }; + +export default class ApiQuery extends Command { + static description = + 'Lists available node API query modules/methods and/or their documentation(s), '+ + 'or calls one of the API query methods (depending on provided arguments and flags)'; + + static examples = [ + '$ api:query', + '$ api:query --module=members', + '$ api:query --module=members --method=memberProfile', + '$ api:query --module=members --method=memberProfile -c -a=1', + ]; + + static flags = { + module: flags.string({ + description: + 'Specifies the query module, ie. "system", "staking" etc.\n'+ + 'If provided without "method" flag: lists methods in that module along with descriptions.\n'+ + 'If not provided: lists all available api.query modules.', + }), + method: flags.string({ + description: 'Specifies the api method to call/describe.', + dependsOn: ['module'] + }), + makeCall: flags.boolean({ + char: 'c', + description: 'Provide this flag if you want to execute the call, instead of displaying the method description (which is default)', + dependsOn: ['module', 'method'] + }), + callArgs: flags.string({ + char: 'a', + description: 'Specify the arguments to use when calling a method. Separate them with a comma, ie. "-a=arg1,arg2"', + dependsOn: ['module', 'method', 'makeCall'] + }) + }; + + getApiMethodWithDescription(apiModule: QueryableModuleStorage<"promise">, methodName: string) { + // Api method optionally has "meta" object attached, but TS is not aware of this unless we do it like this: + let apiMethodOrig = apiModule[methodName]; + let apiMethod = apiMethodOrig; + + if (!apiMethod) this.error('Such method was not found', { exit: ExitCodes.InvalidInput }); + + return { + apiMethod, + description: (apiMethod.meta && apiMethod.meta.documentation) ? + apiMethod.meta.documentation.toString() + : '[ No description available ]' + }; + } + + async run() { + const api: Api = await Api.create(); + const apiPromise: ApiPromise = api.getOriginalApi(); + const flags: ApiQueryFlags = this.parse(ApiQuery).flags; + + if (flags.module) { + let apiModule = apiPromise.query[flags.module]; + if (!apiModule) this.error('Such module was not found', { exit: ExitCodes.InvalidInput }); + if (flags.method) { + const { apiMethod, description } = this.getApiMethodWithDescription(apiModule, flags.method); + if (flags.makeCall) { + // Call the method + const args: string[] = flags.callArgs ? flags.callArgs.split(',') : []; + const result = await apiMethod(...args); + console.log('Original result:', result); + console.log('To string:', result.toString()); + } + else { + // Just show description (default) + this.log(description); + } + } + else { + // Only the module was specified - list methods and descriptions + const rows = Object.keys(apiModule).map((key: string) => { + const { description } = this.getApiMethodWithDescription(apiModule, key); + return { name: key, value: description }; + }); + displayNameValueTable(rows); + } + } + else { + // No module specified - list available modules + this.log(chalk.bold.white('Available modules:')); + this.log(Object.keys(apiPromise.query).map(key => chalk.white(key)).join('\n')); + } + + this.exit(ExitCodes.OK); + } + } From 683e84be419ae279d31ee7145244a4f4022fed47 Mon Sep 17 00:00:00 2001 From: Leszek Wiesner Date: Wed, 15 Apr 2020 12:50:12 +0200 Subject: [PATCH 193/286] api:inspect - the extended api:query --- cli/src/commands/api/inspect.ts | 291 ++++++++++++++++++++++++++++++++ cli/src/commands/api/query.ts | 110 ------------ 2 files changed, 291 insertions(+), 110 deletions(-) create mode 100644 cli/src/commands/api/inspect.ts delete mode 100644 cli/src/commands/api/query.ts diff --git a/cli/src/commands/api/inspect.ts b/cli/src/commands/api/inspect.ts new file mode 100644 index 0000000000..72891a74a8 --- /dev/null +++ b/cli/src/commands/api/inspect.ts @@ -0,0 +1,291 @@ +import Api from '../../Api'; +import Command, { flags } from '@oclif/command'; +import { CLIError } from '@oclif/errors'; +import { displayNameValueTable } from '../../helpers/display'; +import { ApiPromise } from '@polkadot/api'; +import { getTypeDef } from '@polkadot/types'; +import { Codec, TypeDef, TypeDefInfo } from '@polkadot/types/types'; +import { ConstantCodec } from '@polkadot/api-metadata/consts/types'; +import ExitCodes from '../../ExitCodes'; +import chalk from 'chalk'; +import { NameValueObj } from '../../Types'; +import inquirer from 'inquirer'; + +// Command flags type +type ApiInspectFlags = { + type: string, + module: string, + method: string, + exec: boolean, + callArgs: string +}; + +// Currently "inspectable" api types +const TYPES_AVAILABLE = [ + 'query', + 'consts', +] as const; + +// String literals type based on TYPES_AVAILABLE const. +// It works as if we specified: type ApiType = 'query' | 'consts'...; +type ApiType = typeof TYPES_AVAILABLE[number]; + +// Format of the api input args (as they are specified in the CLI) +type ApiMethodInputSimpleArg = string; +// This recurring type allows the correct handling of nested types like: +// ((Type1, Type2), Option) etc. +type ApiMethodInputArg = ApiMethodInputSimpleArg | ApiMethodInputArg[]; + +export default class ApiInspect extends Command { + static description = + 'Lists available node API modules/methods and/or their description(s), '+ + 'or calls one of the API methods (depending on provided arguments and flags)'; + + static examples = [ + '$ api:inspect', + '$ api:inspect -t=query', + '$ api:inspect -t=query -M=members', + '$ api:inspect -t=query -M=members -m=memberProfile', + '$ api:inspect -t=query -M=members -m=memberProfile -e', + '$ api:inspect -t=query -M=members -m=memberProfile -e -a=1', + ]; + + static flags = { + type: flags.string({ + char: 't', + description: + 'Specifies the type/category of the inspected request (ie. "query", "consts" etc.).\n'+ + 'If no "--module" flag is provided then all available modules in that type will be listed.\n'+ + 'If this flag is not provided then all available types will be listed.', + }), + module: flags.string({ + char: 'M', + description: + 'Specifies the api module, ie. "system", "staking" etc.\n'+ + 'If no "--method" flag is provided then all methods in that module will be listed along with the descriptions.', + dependsOn: ['type'], + }), + method: flags.string({ + char: 'm', + description: 'Specifies the api method to call/describe.', + dependsOn: ['module'], + }), + exec: flags.boolean({ + char: 'e', + description: 'Provide this flag if you want to execute the actual call, instead of displaying the method description (which is default)', + dependsOn: ['method'], + }), + callArgs: flags.string({ + char: 'a', + description: + 'Specifies the arguments to use when calling a method. Multiple arguments can be separated with a comma, ie. "-a=arg1,arg2".\n'+ + 'You can omit this flag even if the method requires some aguments.\n'+ + 'In that case you will be promted to provide value for each required argument.\n' + + 'Ommiting this flag is recommended when input parameters are of more complex types (and it\'s hard to specify them as just simple comma-separated strings)', + dependsOn: ['exec'], + }) + }; + + api: ApiPromise | null = null; + + async init() { + const api = await Api.create(); + this.api = api.getOriginalApi(); + } + + getApi() { + if (!this.api) throw new CLIError('Tried to get API before initialization.', { exit: ExitCodes.ApiError }); + return this.api; + } + + getMethodMeta(apiType: ApiType, apiModule: string, apiMethod: string) { + if (apiType === 'query') { + return this.getApi().query[apiModule][apiMethod].creator.meta; + } + else { + // Currently the only other optoin is api.consts + const method:ConstantCodec = this.getApi().consts[apiModule][apiMethod]; + return method.meta; + } + } + + getMethodDescription(apiType: ApiType, apiModule: string, apiMethod: string): string { + let description:string = this.getMethodMeta(apiType, apiModule, apiMethod).documentation.join(' '); + return description || 'No description available.'; + } + + getQueryMethodParamsTypes(apiModule: string, apiMethod: string): string[] { + const method = this.getApi().query[apiModule][apiMethod]; + const { type } = method.creator.meta; + if (type.isDoubleMap) { + return [ type.asDoubleMap.key1.toString(), type.asDoubleMap.key2.toString() ]; + } + if (type.isMap) { + return type.asMap.linked.isTrue ? [ `Option<${type.asMap.key.toString()}>` ] : [ type.asMap.key.toString() ]; + } + return []; + } + + getMethodReturnType(apiType: ApiType, apiModule: string, apiMethod: string): string { + if (apiType === 'query') { + const method = this.getApi().query[apiModule][apiMethod]; + const { meta: { type, modifier } } = method.creator; + if (type.isDoubleMap) { + return type.asDoubleMap.value.toString(); + } + if (modifier.isOptional) { + return `Option<${type.toString()}>`; + } + } + // Fallback for "query" and default for "consts" + return this.getMethodMeta(apiType, apiModule, apiMethod).type.toString(); + } + + // Validate the flags - throws an error if flags.type, flags.module or flags.method is invalid / does not exist in the api. + // Returns type, module and method which validity we can be sure about (notice they may still be "undefined" if weren't provided). + validateFlags(api: ApiPromise, flags: ApiInspectFlags): { apiType: ApiType | undefined, apiModule: string | undefined, apiMethod: string | undefined } { + let apiType: ApiType | undefined = undefined; + const { module: apiModule, method: apiMethod } = flags; + + if (flags.type !== undefined) { + const availableTypes: readonly string[] = TYPES_AVAILABLE; + if (!availableTypes.includes(flags.type)) { + throw new CLIError('Such type is not available', { exit: ExitCodes.InvalidInput }); + } + apiType = flags.type; + if (apiModule !== undefined) { + if (!api[apiType][apiModule]) { + throw new CLIError('Such module was not found', { exit: ExitCodes.InvalidInput }); + } + if (apiMethod !== undefined && !api[apiType][apiModule][apiMethod]) { + throw new CLIError('Such method was not found', { exit: ExitCodes.InvalidInput }); + } + } + } + + return { apiType, apiModule, apiMethod }; + } + + // Prompt for simple value (string) + async promptForSimple(typeName: string): Promise { + const userInput = await inquirer.prompt([{ + name: 'providedValue', + message: `Provide value for ${ typeName }`, + type: 'input' + } ]) + return userInput.providedValue; + } + + // Prompt for optional value (returns undefined if user refused to provide) + async promptForOption(typeDef: TypeDef): Promise { + const userInput = await inquirer.prompt([{ + name: 'confirmed', + message: `Do you want to provide the optional ${ typeDef.type } parameter?`, + type: 'confirm' + } ]); + + if (userInput.confirmed) { + const subtype = typeDef.sub; // We assume that Opion always has a single subtype + let value = await this.promptForParam(subtype.type); + return value; + } + } + + // Prompt for tuple - returns array of values + async promptForTuple(typeDef: TypeDef): Promise<(ApiMethodInputArg)[]> { + let result: ApiMethodInputArg[] = []; + + if (!typeDef.sub) return [ await this.promptForSimple(typeDef.type) ]; + + const subtypes: TypeDef[] = Array.isArray(typeDef.sub) ? typeDef.sub : [ typeDef.sub ]; + + for (let subtype of subtypes) { + let inputParam = await this.promptForParam(subtype.type); + if (inputParam !== undefined) result.push(inputParam); + } + + return result; + } + + // Prompt for param based on "paramType" string (ie. Option) + async promptForParam(paramType: string): Promise { + const typeDef: TypeDef = getTypeDef(paramType); + if (typeDef.info === TypeDefInfo.Option) return await this.promptForOption(typeDef); + else if (typeDef.info === TypeDefInfo.Tuple) return await this.promptForTuple(typeDef); + else return await this.promptForSimple(typeDef.type); + } + + // Request values for params using array of param types (strings) + async requestParamsValues(paramTypes: string[]): Promise { + let result: ApiMethodInputArg[] = []; + for (let [key, paramType] of Object.entries(paramTypes)) { + this.log(chalk.bold.white(`Parameter no. ${ parseInt(key)+1 } (${ paramType }):`)); + let paramValue = await this.promptForParam(paramType); + if (paramValue !== undefined) result.push(paramValue); + } + + return result; + } + + async run() { + const api: ApiPromise = this.getApi(); + const flags: ApiInspectFlags = this.parse(ApiInspect).flags; + const availableTypes: readonly string[] = TYPES_AVAILABLE; + const { apiType, apiModule, apiMethod } = this.validateFlags(api, flags); + + // Executing a call + if (apiType && apiModule && apiMethod && flags.exec) { + let result: Codec; + + if (apiType === 'query') { + // Api query - call with (or without) arguments + let args: ApiMethodInputArg[] = flags.callArgs ? flags.callArgs.split(',') : []; + const paramsTypes: string[] = this.getQueryMethodParamsTypes(apiModule, apiMethod); + if (args.length < paramsTypes.length) { + this.warn('Some parameters are missing! Please, provide the missing parameters:'); + let missingParamsValues = await this.requestParamsValues(paramsTypes.slice(args.length)); + args = args.concat(missingParamsValues); + } + result = await api.query[apiModule][apiMethod](...args); + } + else { + // Api consts - just assign the value + result = api.consts[apiModule][apiMethod]; + } + + this.log(chalk.green(result.toString())); + } + // Describing a method + else if (apiType && apiModule && apiMethod) { + this.log(chalk.bold.white(`${ apiType }.${ apiModule }.${ apiMethod }`)); + const description: string = this.getMethodDescription(apiType, apiModule, apiMethod); + this.log(`\n${ description }\n`); + let typesRows: NameValueObj[] = []; + if (apiType === 'query') { + typesRows.push({ name: 'Params:', value: this.getQueryMethodParamsTypes(apiModule, apiMethod).join(', ') || '-' }); + } + typesRows.push({ name: 'Returns:', value: this.getMethodReturnType(apiType, apiModule, apiMethod) }); + displayNameValueTable(typesRows); + } + // Displaying all available methods + else if (apiType && apiModule) { + const module = api[apiType][apiModule]; + const rows: NameValueObj[] = Object.keys(module).map((key: string) => { + return { name: key, value: this.getMethodDescription(apiType, apiModule, key) }; + }); + displayNameValueTable(rows); + } + // Displaying all available modules + else if (apiType) { + this.log(chalk.bold.white('Available modules:')); + this.log(Object.keys(api[apiType]).map(key => chalk.white(key)).join('\n')); + } + // Displaying all available types + else { + this.log(chalk.bold.white('Available types:')); + this.log(availableTypes.map(type => chalk.white(type)).join('\n')); + } + + this.exit(ExitCodes.OK); + } +} diff --git a/cli/src/commands/api/query.ts b/cli/src/commands/api/query.ts deleted file mode 100644 index 42262608dc..0000000000 --- a/cli/src/commands/api/query.ts +++ /dev/null @@ -1,110 +0,0 @@ -import Api from '../../Api'; -import Command, { flags } from '@oclif/command'; -import { displayNameValueTable } from '../../helpers/display'; -import { ApiPromise } from '@polkadot/api'; -import { Text } from '@polkadot/types'; -import { QueryableModuleStorage } from '@polkadot/api/types'; -import ExitCodes from '../../ExitCodes'; -import chalk from 'chalk'; - -// This command flags -type ApiQueryFlags = { - module: string, - method: string, - makeCall: boolean, - callArgs: string -}; - -// Optional metadata attached to api.query[module][method] (this type is used to force correct TS compatibility) -type OptionalApiMeta = { meta: { documentation: Text | undefined } | undefined }; - -export default class ApiQuery extends Command { - static description = - 'Lists available node API query modules/methods and/or their documentation(s), '+ - 'or calls one of the API query methods (depending on provided arguments and flags)'; - - static examples = [ - '$ api:query', - '$ api:query --module=members', - '$ api:query --module=members --method=memberProfile', - '$ api:query --module=members --method=memberProfile -c -a=1', - ]; - - static flags = { - module: flags.string({ - description: - 'Specifies the query module, ie. "system", "staking" etc.\n'+ - 'If provided without "method" flag: lists methods in that module along with descriptions.\n'+ - 'If not provided: lists all available api.query modules.', - }), - method: flags.string({ - description: 'Specifies the api method to call/describe.', - dependsOn: ['module'] - }), - makeCall: flags.boolean({ - char: 'c', - description: 'Provide this flag if you want to execute the call, instead of displaying the method description (which is default)', - dependsOn: ['module', 'method'] - }), - callArgs: flags.string({ - char: 'a', - description: 'Specify the arguments to use when calling a method. Separate them with a comma, ie. "-a=arg1,arg2"', - dependsOn: ['module', 'method', 'makeCall'] - }) - }; - - getApiMethodWithDescription(apiModule: QueryableModuleStorage<"promise">, methodName: string) { - // Api method optionally has "meta" object attached, but TS is not aware of this unless we do it like this: - let apiMethodOrig = apiModule[methodName]; - let apiMethod = apiMethodOrig; - - if (!apiMethod) this.error('Such method was not found', { exit: ExitCodes.InvalidInput }); - - return { - apiMethod, - description: (apiMethod.meta && apiMethod.meta.documentation) ? - apiMethod.meta.documentation.toString() - : '[ No description available ]' - }; - } - - async run() { - const api: Api = await Api.create(); - const apiPromise: ApiPromise = api.getOriginalApi(); - const flags: ApiQueryFlags = this.parse(ApiQuery).flags; - - if (flags.module) { - let apiModule = apiPromise.query[flags.module]; - if (!apiModule) this.error('Such module was not found', { exit: ExitCodes.InvalidInput }); - if (flags.method) { - const { apiMethod, description } = this.getApiMethodWithDescription(apiModule, flags.method); - if (flags.makeCall) { - // Call the method - const args: string[] = flags.callArgs ? flags.callArgs.split(',') : []; - const result = await apiMethod(...args); - console.log('Original result:', result); - console.log('To string:', result.toString()); - } - else { - // Just show description (default) - this.log(description); - } - } - else { - // Only the module was specified - list methods and descriptions - const rows = Object.keys(apiModule).map((key: string) => { - const { description } = this.getApiMethodWithDescription(apiModule, key); - return { name: key, value: description }; - }); - displayNameValueTable(rows); - } - } - else { - // No module specified - list available modules - this.log(chalk.bold.white('Available modules:')); - this.log(Object.keys(apiPromise.query).map(key => chalk.white(key)).join('\n')); - } - - this.exit(ExitCodes.OK); - } - } From 92ef79201b7293c0055632ca033d6395b88ff98f Mon Sep 17 00:00:00 2001 From: Leszek Wiesner Date: Wed, 15 Apr 2020 16:10:02 +0200 Subject: [PATCH 194/286] Setting/getting api uri + some state/api refatoring --- cli/package-lock.json | 28 +++++++ cli/package.json | 9 +- cli/src/Api.ts | 16 ++-- cli/src/base/AccountsCommandBase.ts | 95 +++------------------ cli/src/base/ApiCommandBase.ts | 28 +++++++ cli/src/base/DefaultCommandBase.ts | 15 ++++ cli/src/base/StateAwareCommandBase.ts | 115 ++++++++++++++++++++++++++ cli/src/commands/account/choose.ts | 2 +- cli/src/commands/account/current.ts | 1 - cli/src/commands/api/getUri.ts | 12 +++ cli/src/commands/api/inspect.ts | 30 ++----- cli/src/commands/api/setUri.ts | 21 +++++ cli/src/commands/council/info.ts | 9 +- 13 files changed, 256 insertions(+), 125 deletions(-) create mode 100644 cli/src/base/ApiCommandBase.ts create mode 100644 cli/src/base/DefaultCommandBase.ts create mode 100644 cli/src/base/StateAwareCommandBase.ts create mode 100644 cli/src/commands/api/getUri.ts create mode 100644 cli/src/commands/api/setUri.ts diff --git a/cli/package-lock.json b/cli/package-lock.json index aca93e1265..5ff94a14a9 100644 --- a/cli/package-lock.json +++ b/cli/package-lock.json @@ -610,6 +610,19 @@ "@types/node": "*" } }, + "@types/proper-lockfile": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@types/proper-lockfile/-/proper-lockfile-4.1.1.tgz", + "integrity": "sha512-HAjVfDa73pFgivViHyDu8HHHcds+W4MgOuZZAdyFJrHS8ngtCXmhl4hc2YXqSOwO6Bsa+iF2Sgxb2+gv874VOQ==", + "requires": { + "@types/retry": "*" + } + }, + "@types/retry": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz", + "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==" + }, "@types/secp256k1": { "version": "3.5.3", "resolved": "https://registry.npmjs.org/@types/secp256k1/-/secp256k1-3.5.3.tgz", @@ -3549,6 +3562,16 @@ "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", "dev": true }, + "proper-lockfile": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-4.1.1.tgz", + "integrity": "sha512-1w6rxXodisVpn7QYvLk706mzprPTAPCYAqxMvctmPN3ekuRk/kuGkGc82pangZiAt4R3lwSuUzheTTn0/Yb7Zg==", + "requires": { + "graceful-fs": "^4.1.11", + "retry": "^0.12.0", + "signal-exit": "^3.0.2" + } + }, "pseudomap": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", @@ -3796,6 +3819,11 @@ "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==", "dev": true }, + "retry": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", + "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=" + }, "reusify": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", diff --git a/cli/package.json b/cli/package.json index 70571276b5..942dfc1414 100644 --- a/cli/package.json +++ b/cli/package.json @@ -14,10 +14,12 @@ "@oclif/plugin-help": "^2.2.3", "@polkadot/api": "^0.96.1", "@types/inquirer": "^6.5.0", + "@types/proper-lockfile": "^4.1.1", "@types/slug": "^0.9.1", "cli-ux": "^5.4.5", "inquirer": "^7.1.0", "moment": "^2.24.0", + "proper-lockfile": "^4.1.1", "slug": "^2.1.1", "tslib": "^1.11.1" }, @@ -66,12 +68,15 @@ }, "account": { "description": "Accounts management - create, import or switch currently used account" + }, + "api": { + "description": "Inspect the substrate node api, perform lower-level api calls or change the current api provider uri" } } }, "repository": { - "type" : "git", - "url" : "https://github.com/Joystream/substrate-runtime-joystream", + "type": "git", + "url": "https://github.com/Joystream/substrate-runtime-joystream", "directory": "cli" }, "scripts": { diff --git a/cli/src/Api.ts b/cli/src/Api.ts index 731b7ce3a6..9bbe4b749e 100644 --- a/cli/src/Api.ts +++ b/cli/src/Api.ts @@ -11,12 +11,8 @@ import { DerivedFees, DerivedBalances } from '@polkadot/api-derive/types'; import { CLIError } from '@oclif/errors'; import ExitCodes from './ExitCodes'; -const API_URL = process.env.WS_URL || ( - process.env.MAIN_TESTNET ? - 'wss://rome-rpc-endpoint.joystream.org:9944/' - : 'wss://rome-staging-2.joystream.org/staging/rpc/' -); -const TOKEN_SYMBOL = 'JOY'; +export const DEFAULT_API_URI = 'wss://rome-rpc-endpoint.joystream.org:9944/'; +export const TOKEN_SYMBOL = 'JOY'; // Api wrapper for handling most common api calls and allowing easy API implementation switch in the future @@ -31,16 +27,16 @@ export default class Api { return this._api; } - private static async initApi(): Promise { + private static async initApi(apiUri: string = DEFAULT_API_URI): Promise { formatBalance.setDefaults({ unit: TOKEN_SYMBOL }); - const wsProvider:WsProvider = new WsProvider(API_URL); + const wsProvider:WsProvider = new WsProvider(apiUri); registerJoystreamTypes(); return await ApiPromise.create({ provider: wsProvider }); } - static async create(): Promise { - const originalApi: ApiPromise = await Api.initApi(); + static async create(apiUri: string = DEFAULT_API_URI): Promise { + const originalApi: ApiPromise = await Api.initApi(apiUri); return new Api(originalApi); } diff --git a/cli/src/base/AccountsCommandBase.ts b/cli/src/base/AccountsCommandBase.ts index b47d43992e..dbe2a15b00 100644 --- a/cli/src/base/AccountsCommandBase.ts +++ b/cli/src/base/AccountsCommandBase.ts @@ -4,38 +4,23 @@ import slug from 'slug'; import inquirer from 'inquirer'; import ExitCodes from '../ExitCodes'; import { CLIError } from '@oclif/errors'; -import { Command } from '@oclif/command'; +import ApiCommandBase from './ApiCommandBase'; import { Keyring } from '@polkadot/api'; -import { KeyringPair$Json, KeyringPair } from '@polkadot/keyring/types'; -import Api from '../Api'; import { formatBalance } from '@polkadot/util'; import { AccountBalances, NamedKeyringPair } from '../Types'; -type StateObject = { selectedAccountFilename: string }; +const ACCOUNTS_DIRNAME = '/accounts'; /** * Abstract base class for account-related commands. * * All the accounts available in the CLI are stored in the form of json backup files inside: * { this.config.dataDir }/{ ACCOUNTS_DIRNAME } (ie. ~/.local/share/joystream-cli/accounts on Ubuntu) - * Where: this.config.dataDir is provided by oclif and ACCOUNTS_DIRNAME is a static of AccountsCommandBase. - * - * Additionally, there is a state.json file kept inside the data directory (this.config.dataDir). - * Currently it just stores information about the default account that can be choosen by the user - * by executing account:choose command (see "StateObject" type above). + * Where: this.config.dataDir is provided by oclif and ACCOUNTS_DIRNAME is a const (see above). */ -export default abstract class AccountsCommandBase extends Command { - static ACCOUNTS_DIRNAME = '/accounts'; - static STATE_FILE = '/state.json'; - private api: Api | null = null; - - getApi(): Api { - if (!this.api) throw new CLIError('Tried to get API before initialization.', { exit: ExitCodes.ApiError }); - return this.api; - } - +export default abstract class AccountsCommandBase extends ApiCommandBase { getAccountsDirPath(): string { - return path.join(this.config.dataDir, AccountsCommandBase.ACCOUNTS_DIRNAME); + return path.join(this.config.dataDir, ACCOUNTS_DIRNAME); } getAccountFilePath(account: NamedKeyringPair): string { @@ -46,35 +31,10 @@ export default abstract class AccountsCommandBase extends Command { return `${ slug(account.meta.name, '_') }__${ account.address }.json`; } - getStateFilePath(): string { - return path.join(this.config.dataDir, AccountsCommandBase.STATE_FILE); - } - - private createDataReadError(): CLIError { - return new CLIError( - `Unexpected error while trying to read from the data directory (${this.config.dataDir})! Permissions issue?`, - { exit: ExitCodes.FsOperationFailed } - ); - } - - private createDataWriteError(): CLIError { - return new CLIError( - `Unexpected error while trying to write into the data directory (${this.config.dataDir})! Permissions issue?`, - { exit: ExitCodes.FsOperationFailed } - ); - } - - private initDataDir(): void { - const initialState: StateObject = { selectedAccountFilename: '' }; - if (!fs.existsSync(this.config.dataDir)) { - fs.mkdirSync(this.config.dataDir); - } + private initAccountsFs(): void { if (!fs.existsSync(this.getAccountsDirPath())) { fs.mkdirSync(this.getAccountsDirPath()); } - if (!fs.existsSync(this.getStateFilePath())) { - fs.writeFileSync(this.getStateFilePath(), JSON.stringify(initialState)); - } } saveAccount(account: NamedKeyringPair, password: string): void { @@ -147,16 +107,8 @@ export default abstract class AccountsCommandBase extends Command { .filter(accObj => accObj !== null); } - // TODO: Probably some better way to handle state will be required later getSelectedAccountFilename(): string { - let state: StateObject; - try { - state = require(this.getStateFilePath()); - } catch(e) { - throw this.createDataReadError(); - } - - return state.selectedAccountFilename; + return this.getPreservedState().selectedAccountFilename; } getSelectedAccount(): NamedKeyringPair | null { @@ -190,21 +142,8 @@ export default abstract class AccountsCommandBase extends Command { return selectedAccount; } - setSelectedAccount(account: NamedKeyringPair): void { - let state: StateObject; - try { - state = require(this.getStateFilePath()); - } catch(e) { - throw this.createDataReadError(); - } - - state.selectedAccountFilename = this.generateAccountFilename(account); - - try { - fs.writeFileSync(this.getStateFilePath(), JSON.stringify(state)); - } catch(e) { - throw this.createDataWriteError(); - } + async setSelectedAccount(account: NamedKeyringPair): Promise { + await this.setPreservedState({ selectedAccountFilename: this.generateAccountFilename(account) }); } async promptForPassword(message:string = 'Your account\'s password') { @@ -259,21 +198,11 @@ export default abstract class AccountsCommandBase extends Command { } async init() { - this.api = await Api.create(); + await super.init(); try { - this.initDataDir(); + this.initAccountsFs(); } catch (e) { - this.error( - 'Unexpected error while trying to initialize the data directory! Permissions issue?', - { exit: ExitCodes.FsOperationFailed } - ); + throw this.createDataDirInitError(); } } - - async finally(err: any) { - // called after run and catch regardless of whether or not the command errored - // We'll force exit here, in case there is no error, to prevent console.log from hanging the process - if (!err) this.exit(ExitCodes.OK); - super.finally(err); - } } diff --git a/cli/src/base/ApiCommandBase.ts b/cli/src/base/ApiCommandBase.ts new file mode 100644 index 0000000000..017810b9af --- /dev/null +++ b/cli/src/base/ApiCommandBase.ts @@ -0,0 +1,28 @@ +import ExitCodes from '../ExitCodes'; +import { CLIError } from '@oclif/errors'; +import StateAwareCommandBase from './StateAwareCommandBase'; +import Api from '../Api'; +import { ApiPromise } from '@polkadot/api' + +/** + * Abstract base class for commands that require access to the API. + */ +export default abstract class ApiCommandBase extends StateAwareCommandBase { + private api: Api | null = null; + + getApi(): Api { + if (!this.api) throw new CLIError('Tried to get API before initialization.', { exit: ExitCodes.ApiError }); + return this.api; + } + + // Get original api for lower-level api calls + getOriginalApi(): ApiPromise { + return this.getApi().getOriginalApi(); + } + + async init() { + await super.init(); + const apiUri: string = this.getPreservedState().apiUri; + this.api = await Api.create(apiUri); + } +} diff --git a/cli/src/base/DefaultCommandBase.ts b/cli/src/base/DefaultCommandBase.ts new file mode 100644 index 0000000000..24985e1446 --- /dev/null +++ b/cli/src/base/DefaultCommandBase.ts @@ -0,0 +1,15 @@ +import ExitCodes from '../ExitCodes'; +import Command from '@oclif/command'; + +/** + * Abstract base class for pretty much all commands + * (prevents console.log from hanging the process and unifies the default exit code) + */ +export default abstract class DefaultCommandBase extends Command { + async finally(err: any) { + // called after run and catch regardless of whether or not the command errored + // We'll force exit here, in case there is no error, to prevent console.log from hanging the process + if (!err) this.exit(ExitCodes.OK); + super.finally(err); + } +} diff --git a/cli/src/base/StateAwareCommandBase.ts b/cli/src/base/StateAwareCommandBase.ts new file mode 100644 index 0000000000..5c5f924994 --- /dev/null +++ b/cli/src/base/StateAwareCommandBase.ts @@ -0,0 +1,115 @@ +import fs from 'fs'; +import path from 'path'; +import ExitCodes from '../ExitCodes'; +import { CLIError } from '@oclif/errors'; +import { DEFAULT_API_URI } from '../Api'; +import lockFile from 'proper-lockfile'; +import DefaultCommandBase from './DefaultCommandBase'; + +// Type for the state object (which is preserved as json in the state file) +type StateObject = { + selectedAccountFilename: string, + apiUri: string +}; + +// State object default values +const DEFAULT_STATE: StateObject = { + selectedAccountFilename: '', + apiUri: DEFAULT_API_URI +} + +// State file path (relative to this.config.dataDir) +const STATE_FILE = '/state.json'; + +// Possible data directory access errors +enum DataDirErrorType { + Init = 0, + Read = 1, + Write = 2, +} + +/** + * Abstract base class for commands that need to work with the preserved state. + * + * The preserved state is kept in a json file inside the data directory (this.config.dataDir, supplied by oclif). + * The state object contains all the information that needs to be preserved across sessions, ie. the default account + * choosen by the user after executing account:choose command etc. (see "StateObject" type above). + */ +export default abstract class StateAwareCommandBase extends DefaultCommandBase { + getStateFilePath(): string { + return path.join(this.config.dataDir, STATE_FILE); + } + + private createDataDirFsError(errorType: DataDirErrorType, specificPath: string = '') { + const actionStrs: { [x in DataDirErrorType]: string } = { + [DataDirErrorType.Init]: 'initialize', + [DataDirErrorType.Read]: 'read from', + [DataDirErrorType.Write]: 'write into' + }; + + const errorMsg = + `Unexpected error while trying to ${ actionStrs[errorType] } the data directory.`+ + `(${ path.join(this.config.dataDir, specificPath) })! Permissions issue?`; + + return new CLIError(errorMsg, { exit: ExitCodes.FsOperationFailed }); + } + + createDataReadError(specificPath: string = ''): CLIError { + return this.createDataDirFsError(DataDirErrorType.Read, specificPath); + } + + createDataWriteError(specificPath: string = ''): CLIError { + return this.createDataDirFsError(DataDirErrorType.Write, specificPath); + } + + createDataDirInitError(specificPath: string = ''): CLIError { + return this.createDataDirFsError(DataDirErrorType.Init, specificPath); + } + + private initStateFs(): void { + if (!fs.existsSync(this.config.dataDir)) { + fs.mkdirSync(this.config.dataDir); + } + if (!fs.existsSync(this.getStateFilePath())) { + fs.writeFileSync(this.getStateFilePath(), JSON.stringify(DEFAULT_STATE)); + } + } + + getPreservedState(): StateObject { + let preservedState: StateObject; + try { + preservedState = require(this.getStateFilePath()); + } catch(e) { + throw this.createDataReadError(); + } + // The state preserved in a file may be missing some required values ie. + // if the user previously used the older version of the software. + // That's why we combine it with default state before returing. + return { ...DEFAULT_STATE, ...preservedState }; + } + + // Modifies preserved state. Uses file lock in order to avoid updating an older state. + // (which could potentialy change between read and write operation) + async setPreservedState(modifiedState: Partial): Promise { + const stateFilePath = this.getStateFilePath(); + const unlock = await lockFile.lock(stateFilePath); + let oldState: StateObject = this.getPreservedState(); + let newState: StateObject = { ...oldState, ...modifiedState }; + try { + fs.writeFileSync(stateFilePath, JSON.stringify(newState)); + } catch(e) { + await unlock(); + throw this.createDataWriteError(); + } + await unlock(); + } + + async init() { + await super.init(); + try { + await this.initStateFs(); + } catch (e) { + throw this.createDataDirInitError(); + } + } +} diff --git a/cli/src/commands/account/choose.ts b/cli/src/commands/account/choose.ts index 8c548a423e..d1db149ae3 100644 --- a/cli/src/commands/account/choose.ts +++ b/cli/src/commands/account/choose.ts @@ -19,7 +19,7 @@ export default class AccountChoose extends AccountsCommandBase { const choosenAccount: NamedKeyringPair = await this.promptForAccount(accounts, selectedAccount); - this.setSelectedAccount(choosenAccount); + await this.setSelectedAccount(choosenAccount); this.log(chalk.greenBright("\nAccount switched!")); } } diff --git a/cli/src/commands/account/current.ts b/cli/src/commands/account/current.ts index c6fe63f0a4..b36a07da55 100644 --- a/cli/src/commands/account/current.ts +++ b/cli/src/commands/account/current.ts @@ -1,5 +1,4 @@ import AccountsCommandBase from '../../base/AccountsCommandBase'; -import Api from '../../Api'; import { AccountSummary, NameValueObj, NamedKeyringPair } from '../../Types'; import { displayHeader, displayNameValueTable } from '../../helpers/display'; import { formatBalance } from '@polkadot/util'; diff --git a/cli/src/commands/api/getUri.ts b/cli/src/commands/api/getUri.ts new file mode 100644 index 0000000000..c404799d84 --- /dev/null +++ b/cli/src/commands/api/getUri.ts @@ -0,0 +1,12 @@ +import StateAwareCommandBase from '../../base/StateAwareCommandBase'; +import chalk from 'chalk'; + + +export default class ApiGetUri extends StateAwareCommandBase { + static description = 'Get current api WS provider uri'; + + async run() { + const currentUri:string = this.getPreservedState().apiUri; + this.log(chalk.green(currentUri)); + } + } diff --git a/cli/src/commands/api/inspect.ts b/cli/src/commands/api/inspect.ts index 72891a74a8..cd309cba42 100644 --- a/cli/src/commands/api/inspect.ts +++ b/cli/src/commands/api/inspect.ts @@ -1,5 +1,4 @@ -import Api from '../../Api'; -import Command, { flags } from '@oclif/command'; +import { flags } from '@oclif/command'; import { CLIError } from '@oclif/errors'; import { displayNameValueTable } from '../../helpers/display'; import { ApiPromise } from '@polkadot/api'; @@ -10,6 +9,7 @@ import ExitCodes from '../../ExitCodes'; import chalk from 'chalk'; import { NameValueObj } from '../../Types'; import inquirer from 'inquirer'; +import ApiCommandBase from '../../base/ApiCommandBase'; // Command flags type type ApiInspectFlags = { @@ -36,7 +36,7 @@ type ApiMethodInputSimpleArg = string; // ((Type1, Type2), Option) etc. type ApiMethodInputArg = ApiMethodInputSimpleArg | ApiMethodInputArg[]; -export default class ApiInspect extends Command { +export default class ApiInspect extends ApiCommandBase { static description = 'Lists available node API modules/methods and/or their description(s), '+ 'or calls one of the API methods (depending on provided arguments and flags)'; @@ -86,25 +86,13 @@ export default class ApiInspect extends Command { }) }; - api: ApiPromise | null = null; - - async init() { - const api = await Api.create(); - this.api = api.getOriginalApi(); - } - - getApi() { - if (!this.api) throw new CLIError('Tried to get API before initialization.', { exit: ExitCodes.ApiError }); - return this.api; - } - getMethodMeta(apiType: ApiType, apiModule: string, apiMethod: string) { if (apiType === 'query') { - return this.getApi().query[apiModule][apiMethod].creator.meta; + return this.getOriginalApi().query[apiModule][apiMethod].creator.meta; } else { // Currently the only other optoin is api.consts - const method:ConstantCodec = this.getApi().consts[apiModule][apiMethod]; + const method:ConstantCodec = this.getOriginalApi().consts[apiModule][apiMethod]; return method.meta; } } @@ -115,7 +103,7 @@ export default class ApiInspect extends Command { } getQueryMethodParamsTypes(apiModule: string, apiMethod: string): string[] { - const method = this.getApi().query[apiModule][apiMethod]; + const method = this.getOriginalApi().query[apiModule][apiMethod]; const { type } = method.creator.meta; if (type.isDoubleMap) { return [ type.asDoubleMap.key1.toString(), type.asDoubleMap.key2.toString() ]; @@ -128,7 +116,7 @@ export default class ApiInspect extends Command { getMethodReturnType(apiType: ApiType, apiModule: string, apiMethod: string): string { if (apiType === 'query') { - const method = this.getApi().query[apiModule][apiMethod]; + const method = this.getOriginalApi().query[apiModule][apiMethod]; const { meta: { type, modifier } } = method.creator; if (type.isDoubleMap) { return type.asDoubleMap.value.toString(); @@ -228,7 +216,7 @@ export default class ApiInspect extends Command { } async run() { - const api: ApiPromise = this.getApi(); + const api: ApiPromise = this.getOriginalApi(); const flags: ApiInspectFlags = this.parse(ApiInspect).flags; const availableTypes: readonly string[] = TYPES_AVAILABLE; const { apiType, apiModule, apiMethod } = this.validateFlags(api, flags); @@ -285,7 +273,5 @@ export default class ApiInspect extends Command { this.log(chalk.bold.white('Available types:')); this.log(availableTypes.map(type => chalk.white(type)).join('\n')); } - - this.exit(ExitCodes.OK); } } diff --git a/cli/src/commands/api/setUri.ts b/cli/src/commands/api/setUri.ts new file mode 100644 index 0000000000..5d834d91f7 --- /dev/null +++ b/cli/src/commands/api/setUri.ts @@ -0,0 +1,21 @@ +import StateAwareCommandBase from '../../base/StateAwareCommandBase'; +import chalk from 'chalk'; + +type ApiSetUriArgs = { uri: string }; + +export default class ApiSetUri extends StateAwareCommandBase { + static description = 'Set api WS provider uri'; + static args = [ + { + name: 'uri', + required: true, + description: 'Uri of the node api WS provider' + } + ]; + + async run() { + const args: ApiSetUriArgs = this.parse(ApiSetUri).args; + await this.setPreservedState({ apiUri: args.uri }); + this.log(chalk.greenBright('Api uri successfuly changed! New uri: ') + chalk.white(args.uri)) + } + } diff --git a/cli/src/commands/council/info.ts b/cli/src/commands/council/info.ts index 2226489f43..d68b0215ac 100644 --- a/cli/src/commands/council/info.ts +++ b/cli/src/commands/council/info.ts @@ -1,12 +1,11 @@ import { ElectionStage } from '@joystream/types'; import { formatNumber, formatBalance } from '@polkadot/util'; import { BlockNumber } from '@polkadot/types/interfaces'; -import Command from '@oclif/command'; import { CouncilInfoObj, NameValueObj } from '../../Types'; import { displayHeader, displayNameValueTable } from '../../helpers/display'; -import Api from '../../Api'; +import ApiCommandBase from '../../base/ApiCommandBase'; -export default class CouncilInfo extends Command { +export default class CouncilInfo extends ApiCommandBase { static description = 'Get current council and council elections information'; displayInfo(infoObj: CouncilInfoObj) { @@ -52,9 +51,7 @@ export default class CouncilInfo extends Command { } async run() { - const api = await Api.create(); - const infoObj = await api.getCouncilInfo(); + const infoObj = await this.getApi().getCouncilInfo(); this.displayInfo(infoObj); - this.exit(); } } From 2b7041b12f8f8d9a1f691b1752f3b905f864d0c3 Mon Sep 17 00:00:00 2001 From: Leszek Wiesner Date: Wed, 15 Apr 2020 16:31:46 +0200 Subject: [PATCH 195/286] Minor api:setUri validation --- cli/src/Api.ts | 3 ++- cli/src/commands/api/setUri.ts | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/cli/src/Api.ts b/cli/src/Api.ts index 9bbe4b749e..e78a8f703f 100644 --- a/cli/src/Api.ts +++ b/cli/src/Api.ts @@ -52,7 +52,8 @@ export default class Api { if (!results.length || results.length !== queries.length) { throw new CLIError('API querying issue', { exit: ExitCodes.ApiError }); } - return results; + + return results; } async getAccountsBalancesInfo(accountAddresses:string[]): Promise { diff --git a/cli/src/commands/api/setUri.ts b/cli/src/commands/api/setUri.ts index 5d834d91f7..591fc12889 100644 --- a/cli/src/commands/api/setUri.ts +++ b/cli/src/commands/api/setUri.ts @@ -1,5 +1,7 @@ import StateAwareCommandBase from '../../base/StateAwareCommandBase'; import chalk from 'chalk'; +import { WsProvider } from '@polkadot/api'; +import ExitCodes from '../../ExitCodes'; type ApiSetUriArgs = { uri: string }; @@ -15,6 +17,11 @@ export default class ApiSetUri extends StateAwareCommandBase { async run() { const args: ApiSetUriArgs = this.parse(ApiSetUri).args; + try { + new WsProvider(args.uri); + } catch(e) { + this.error('The WS provider uri seems to be incorrect', { exit: ExitCodes.InvalidInput }); + } await this.setPreservedState({ apiUri: args.uri }); this.log(chalk.greenBright('Api uri successfuly changed! New uri: ') + chalk.white(args.uri)) } From 23bc9034e208a59cb3ecaa9f5f85d8fc316ab90d Mon Sep 17 00:00:00 2001 From: Leszek Wiesner Date: Wed, 15 Apr 2020 17:05:13 +0200 Subject: [PATCH 196/286] README update --- cli/README.md | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/cli/README.md b/cli/README.md index d9f83186a5..591a949854 100644 --- a/cli/README.md +++ b/cli/README.md @@ -61,6 +61,9 @@ USAGE * [`joystream-cli account:forget`](#joystream-cli-accountforget) * [`joystream-cli account:import BACKUPFILEPATH`](#joystream-cli-accountimport-backupfilepath) * [`joystream-cli account:transferTokens RECIPIENT AMOUNT`](#joystream-cli-accounttransfertokens-recipient-amount) +* [`joystream-cli api:getUri`](#joystream-cli-apigeturi) +* [`joystream-cli api:inspect`](#joystream-cli-apiinspect) +* [`joystream-cli api:setUri URI`](#joystream-cli-apiseturi-uri) * [`joystream-cli council:info`](#joystream-cli-councilinfo) * [`joystream-cli help [COMMAND]`](#joystream-cli-help-command) @@ -161,6 +164,75 @@ ARGUMENTS _See code: [src/commands/account/transferTokens.ts](https://github.com/Joystream/substrate-runtime-joystream/blob/master/cli/src/commands/account/transferTokens.ts)_ +## `joystream-cli api:getUri` + +Get current api WS provider uri + +``` +USAGE + $ joystream-cli api:getUri +``` + +_See code: [src/commands/api/getUri.ts](https://github.com/Joystream/substrate-runtime-joystream/blob/master/cli/src/commands/api/getUri.ts)_ + +## `joystream-cli api:inspect` + +Lists available node API modules/methods and/or their description(s), or calls one of the API methods (depending on provided arguments and flags) + +``` +USAGE + $ joystream-cli api:inspect + +OPTIONS + -M, --module=module + Specifies the api module, ie. "system", "staking" etc. + If no "--method" flag is provided then all methods in that module will be listed along with the descriptions. + + -a, --callArgs=callArgs + Specifies the arguments to use when calling a method. Multiple arguments can be separated with a comma, ie. + "-a=arg1,arg2". + You can omit this flag even if the method requires some aguments. + In that case you will be promted to provide value for each required argument. + Ommiting this flag is recommended when input parameters are of more complex types (and it's hard to specify them as + just simple comma-separated strings) + + -e, --exec + Provide this flag if you want to execute the actual call, instead of displaying the method description (which is + default) + + -m, --method=method + Specifies the api method to call/describe. + + -t, --type=type + Specifies the type/category of the inspected request (ie. "query", "consts" etc.). + If no "--module" flag is provided then all available modules in that type will be listed. + If this flag is not provided then all available types will be listed. + +EXAMPLES + $ api:inspect + $ api:inspect -t=query + $ api:inspect -t=query -M=members + $ api:inspect -t=query -M=members -m=memberProfile + $ api:inspect -t=query -M=members -m=memberProfile -e + $ api:inspect -t=query -M=members -m=memberProfile -e -a=1 +``` + +_See code: [src/commands/api/inspect.ts](https://github.com/Joystream/substrate-runtime-joystream/blob/master/cli/src/commands/api/inspect.ts)_ + +## `joystream-cli api:setUri URI` + +Set api WS provider uri + +``` +USAGE + $ joystream-cli api:setUri URI + +ARGUMENTS + URI Uri of the node api WS provider +``` + +_See code: [src/commands/api/setUri.ts](https://github.com/Joystream/substrate-runtime-joystream/blob/master/cli/src/commands/api/setUri.ts)_ + ## `joystream-cli council:info` Get current council and council elections information From 7551285f3cffe603a3402be1ca9b5e9bfdbdb519 Mon Sep 17 00:00:00 2001 From: Leszek Wiesner Date: Thu, 16 Apr 2020 13:56:04 +0200 Subject: [PATCH 197/286] Better balances handling / displaying --- cli/src/Api.ts | 27 ++++++---------------- cli/src/Types.ts | 8 ------- cli/src/base/AccountsCommandBase.ts | 23 ++++++++++++------ cli/src/commands/account/current.ts | 15 ++++++++---- cli/src/commands/account/transferTokens.ts | 6 ++--- cli/src/helpers/display.ts | 8 +++++++ cli/src/helpers/validation.ts | 6 ++--- 7 files changed, 48 insertions(+), 45 deletions(-) diff --git a/cli/src/Api.ts b/cli/src/Api.ts index e78a8f703f..b499a50a42 100644 --- a/cli/src/Api.ts +++ b/cli/src/Api.ts @@ -3,10 +3,10 @@ import { registerJoystreamTypes } from '@joystream/types'; import { ApiPromise, WsProvider } from '@polkadot/api'; import { QueryableStorageMultiArg } from '@polkadot/api/types'; import { formatBalance } from '@polkadot/util'; -import { Balance, Hash } from '@polkadot/types/interfaces'; +import { Hash } from '@polkadot/types/interfaces'; import { KeyringPair } from '@polkadot/keyring/types'; import { Codec } from '@polkadot/types/types'; -import { AccountBalances, AccountSummary, CouncilInfoObj, CouncilInfoTuple, createCouncilInfoObj } from './Types'; +import { AccountSummary, CouncilInfoObj, CouncilInfoTuple, createCouncilInfoObj } from './Types'; import { DerivedFees, DerivedBalances } from '@polkadot/api-derive/types'; import { CLIError } from '@oclif/errors'; import ExitCodes from './ExitCodes'; @@ -56,30 +56,17 @@ export default class Api { return results; } - async getAccountsBalancesInfo(accountAddresses:string[]): Promise { - let apiQueries:any = []; - for (let address of accountAddresses) { - apiQueries.push([this._api.query.balances.freeBalance, address]); - apiQueries.push([this._api.query.balances.reservedBalance, address]); - } - - let balances: AccountBalances[] = []; - let balancesRes = await this.queryMultiOnce(apiQueries); - for (let key in accountAddresses) { - let numKey: number = parseInt(key); - const free: Balance = balancesRes[numKey*2]; - const reserved: Balance = balancesRes[numKey*2 + 1]; - const total: Balance = this._api.createType('Balance', free.add(reserved)); - balances[key] = { free, reserved, total }; - } + async getAccountsBalancesInfo(accountAddresses:string[]): Promise { + let accountsBalances: DerivedBalances[] = await this._api.derive.balances.votingBalances(accountAddresses); - return balances; + return accountsBalances; } // Get on-chain data related to given account. // For now it's just account balances async getAccountSummary(accountAddresses:string): Promise { - const balances: DerivedBalances = await this._api.derive.balances.all(accountAddresses); + const balances: DerivedBalances = (await this.getAccountsBalancesInfo([accountAddresses]))[0]; + // TODO: Some more information can be fetched here in the future return { balances }; } diff --git a/cli/src/Types.ts b/cli/src/Types.ts index d8d0bf8865..5d38d06aab 100644 --- a/cli/src/Types.ts +++ b/cli/src/Types.ts @@ -14,14 +14,6 @@ export type NamedKeyringPair = KeyringPair & { } } -// Simplified account balances (used when listing multiple accounts etc.) -// Combines results returned by api.query.balances.freeBalance and api.query.balances.reservedBalance -export type AccountBalances = { - free: Balance, - reserved: Balance, - total: Balance -}; - // Summary of the account information fetched from the api for "account:current" purposes (currently just balances) export type AccountSummary = { balances: DerivedBalances diff --git a/cli/src/base/AccountsCommandBase.ts b/cli/src/base/AccountsCommandBase.ts index dbe2a15b00..5f676cc9e4 100644 --- a/cli/src/base/AccountsCommandBase.ts +++ b/cli/src/base/AccountsCommandBase.ts @@ -7,7 +7,9 @@ import { CLIError } from '@oclif/errors'; import ApiCommandBase from './ApiCommandBase'; import { Keyring } from '@polkadot/api'; import { formatBalance } from '@polkadot/util'; -import { AccountBalances, NamedKeyringPair } from '../Types'; +import { NamedKeyringPair } from '../Types'; +import { DerivedBalances } from '@polkadot/api-derive/types'; +import { toFixedLength } from '../helpers/display'; const ACCOUNTS_DIRNAME = '/accounts'; @@ -167,20 +169,27 @@ export default abstract class AccountsCommandBase extends ApiCommandBase { message: string = 'Select an account', showBalances: boolean = true ): Promise { - let balances: AccountBalances[]; + let balances: DerivedBalances[]; if (showBalances) { balances = await this.getApi().getAccountsBalancesInfo(accounts.map(acc => acc.address)); } + const longestAccNameLength: number = accounts.reduce((prev, curr) => Math.max(curr.meta.name.length, prev), 0); + const accNameColLength: number = Math.min(longestAccNameLength + 1, 20); const { chosenAccountFilename } = await inquirer.prompt([{ name: 'chosenAccountFilename', message, type: 'list', choices: accounts.map((account: NamedKeyringPair, i) => ({ - name: - `${ account.meta.name }: `+ - ( showBalances ? `${ formatBalance(balances[i].free) } / ${ formatBalance(balances[i].total) } ` : ' ')+ - account.address, - value: this.generateAccountFilename(account) + name: ( + `${ toFixedLength(account.meta.name, accNameColLength) } | `+ + `${ account.address } | ` + + ((showBalances || '') && ( + `${ formatBalance(balances[i].availableBalance) } / `+ + `${ formatBalance(balances[i].votingBalance) }` + )) + ), + value: this.generateAccountFilename(account), + short: `${ account.meta.name } (${ account.address })` })), default: defaultAccount && this.generateAccountFilename(defaultAccount) }]); diff --git a/cli/src/commands/account/current.ts b/cli/src/commands/account/current.ts index b36a07da55..b820502d0b 100644 --- a/cli/src/commands/account/current.ts +++ b/cli/src/commands/account/current.ts @@ -1,5 +1,6 @@ import AccountsCommandBase from '../../base/AccountsCommandBase'; import { AccountSummary, NameValueObj, NamedKeyringPair } from '../../Types'; +import { DerivedBalances } from '@polkadot/api-derive/types'; import { displayHeader, displayNameValueTable } from '../../helpers/display'; import { formatBalance } from '@polkadot/util'; import moment from 'moment'; @@ -24,11 +25,17 @@ export default class AccountCurrent extends AccountsCommandBase { displayNameValueTable(accountRows); displayHeader('Balances'); - const balancesRows: NameValueObj[] = [ - { name: 'Available balance:', value: formatBalance(summary.balances.availableBalance) }, - { name: 'Free balance:', value: formatBalance(summary.balances.freeBalance) }, - { name: 'Locked balance:', value: formatBalance(summary.balances.lockedBalance) } + const balances: DerivedBalances = summary.balances; + let balancesRows: NameValueObj[] = [ + { name: 'Total balance:', value: formatBalance(balances.votingBalance) }, + { name: 'Transferable balance:', value: formatBalance(balances.availableBalance) } ]; + if (balances.lockedBalance.gtn(0)) { + balancesRows.push({ name: 'Locked balance:', value: formatBalance(balances.lockedBalance) }); + } + if (balances.reservedBalance.gtn(0)) { + balancesRows.push({ name: 'Reserved balance:', value: formatBalance(balances.reservedBalance) }); + } displayNameValueTable(balancesRows); } } diff --git a/cli/src/commands/account/transferTokens.ts b/cli/src/commands/account/transferTokens.ts index 5e39df6d0a..953acb22d2 100644 --- a/cli/src/commands/account/transferTokens.ts +++ b/cli/src/commands/account/transferTokens.ts @@ -4,9 +4,9 @@ import chalk from 'chalk'; import ExitCodes from '../../ExitCodes'; import { formatBalance } from '@polkadot/util'; import { Hash } from '@polkadot/types/interfaces'; -import Api from '../../Api'; -import { AccountBalances, NamedKeyringPair } from '../../Types'; +import { NamedKeyringPair } from '../../Types'; import { checkBalance, validateAddress } from '../../helpers/validation'; +import { DerivedBalances } from '@polkadot/api-derive/types'; type AccountTransferArgs = { recipient: string, @@ -36,7 +36,7 @@ export default class AccountTransferTokens extends AccountsCommandBase { // Initial validation validateAddress(args.recipient, 'Invalid recipient address'); - const accBalances: AccountBalances = (await this.getApi().getAccountsBalancesInfo([ selectedAccount.address ]))[0]; + const accBalances: DerivedBalances = (await this.getApi().getAccountsBalancesInfo([ selectedAccount.address ]))[0]; checkBalance(accBalances, amountBN); await this.requestAccountDecoding(selectedAccount); diff --git a/cli/src/helpers/display.ts b/cli/src/helpers/display.ts index f8b3db0d52..13a189c938 100644 --- a/cli/src/helpers/display.ts +++ b/cli/src/helpers/display.ts @@ -23,3 +23,11 @@ export function displayNameValueTable(rows: NameValueObj[]) { ); } +export function toFixedLength(text: string, length: number, spacesOnLeft = false): string { + if (text.length > length && length > 3) { + return text.slice(0, length-3) + '...'; + } + while(text.length < length) { spacesOnLeft ? text = ' '+text : text += ' ' }; + + return text; +} diff --git a/cli/src/helpers/validation.ts b/cli/src/helpers/validation.ts index f18c66d3ab..cce907b13d 100644 --- a/cli/src/helpers/validation.ts +++ b/cli/src/helpers/validation.ts @@ -1,7 +1,7 @@ import BN from 'bn.js'; import ExitCodes from '../ExitCodes'; import { decodeAddress } from '@polkadot/util-crypto'; -import { AccountBalances } from '../Types'; +import { DerivedBalances } from '@polkadot/api-derive/types'; import { CLIError } from '@oclif/errors'; export function validateAddress(address: string, errorMessage: string = 'Invalid address'): void { @@ -12,8 +12,8 @@ export function validateAddress(address: string, errorMessage: string = 'Invalid } } -export function checkBalance(accBalances: AccountBalances, requiredBalance: BN): void { - if (requiredBalance.gt(accBalances.free)) { +export function checkBalance(accBalances: DerivedBalances, requiredBalance: BN): void { + if (requiredBalance.gt(accBalances.availableBalance)) { throw new CLIError('Not enough balance available', { exit: ExitCodes.InvalidInput }); } } From 34b0e7cc9abdbb39171e38b5ec79442649310a02 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Wed, 1 Apr 2020 19:11:01 +0300 Subject: [PATCH 198/286] Add codex ProposalDetails for the frontend --- runtime-modules/proposals/codex/Cargo.toml | 12 +- runtime-modules/proposals/codex/src/lib.rs | 49 +++++-- .../proposals/codex/src/proposal_types/mod.rs | 125 +++++------------- .../codex/src/proposal_types/parameters.rs | 98 ++++++++++++++ .../proposals/codex/src/tests/mod.rs | 19 ++- 5 files changed, 194 insertions(+), 109 deletions(-) create mode 100644 runtime-modules/proposals/codex/src/proposal_types/parameters.rs diff --git a/runtime-modules/proposals/codex/Cargo.toml b/runtime-modules/proposals/codex/Cargo.toml index a1186abc73..98899c176c 100644 --- a/runtime-modules/proposals/codex/Cargo.toml +++ b/runtime-modules/proposals/codex/Cargo.toml @@ -83,6 +83,12 @@ default-features = false git = 'https://github.com/paritytech/substrate.git' rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' +[dependencies.runtime-io] +default_features = false +git = 'https://github.com/paritytech/substrate.git' +package = 'sr-io' +rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' + [dependencies.stake] default_features = false package = 'substrate-stake-module' @@ -123,12 +129,6 @@ default_features = false package = 'substrate-content-working-group-module' path = '../../content-working-group' -[dev-dependencies.runtime-io] -default_features = false -git = 'https://github.com/paritytech/substrate.git' -package = 'sr-io' -rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' - [dev-dependencies.hiring] default_features = false package = 'substrate-hiring-module' diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index 0ed555210e..8671496ac7 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -9,7 +9,8 @@ //! During the proposal creation `codex` also create a discussion thread using the `discussion` //! proposals module. `Codex` uses predefined parameters (eg.:`voting_period`) for each proposal and //! encodes extrinsic calls from dependency modules in order to create proposals inside the `engine` -//! module. +//! module. For each proposal, [its crucial details](./enum.ProposalDetails.html) are saved to the +//! `ProposalDetailsByProposalId` map. //! //! ### Supported extrinsics (proposal types) //! - [create_text_proposal](./struct.Module.html#method.create_text_proposal) @@ -50,12 +51,15 @@ use rstd::clone::Clone; use rstd::prelude::*; use rstd::str::from_utf8; use rstd::vec::Vec; +use runtime_io::blake2_256; use sr_primitives::traits::Zero; use srml_support::dispatch::DispatchResult; use srml_support::traits::{Currency, Get}; use srml_support::{decl_error, decl_module, decl_storage, ensure, print}; use system::{ensure_root, RawOrigin}; +pub use proposal_types::ProposalDetails; + /// 'Proposals codex' substrate module Trait pub trait Trait: system::Trait @@ -158,6 +162,16 @@ decl_storage! { /// Map proposal id to its discussion thread id pub ThreadIdByProposalId get(fn thread_id_by_proposal_id): map T::ProposalId => T::ThreadId; + + /// Map proposal id to proposal details + pub ProposalDetailsByProposalId get(fn proposal_details_by_proposal_id): + map T::ProposalId => ProposalDetails< + BalanceOfMint, + BalanceOfGovernanceCurrency, + T::BlockNumber, + T::AccountId, + T::MemberId + >; } } @@ -182,7 +196,7 @@ decl_module! { let proposal_parameters = proposal_types::parameters::text_proposal::(); let proposal_code = - >::execute_text_proposal(title.clone(), description.clone(), text); + >::execute_text_proposal(title.clone(), description.clone(), text.clone()); Self::create_proposal( origin, @@ -192,6 +206,7 @@ decl_module! { stake_balance, proposal_code.encode(), proposal_parameters, + ProposalDetails::Text(text), )?; } @@ -208,6 +223,8 @@ decl_module! { ensure!(wasm.len() as u32 <= T::RuntimeUpgradeWasmProposalMaxLength::get(), Error::RuntimeProposalSizeExceeded); + let wasm_hash = blake2_256(&wasm); + let proposal_code = >::execute_runtime_upgrade_proposal(title.clone(), description.clone(), wasm); @@ -221,6 +238,7 @@ decl_module! { stake_balance, proposal_code.encode(), proposal_parameters, + ProposalDetails::RuntimeUpgrade(wasm_hash.to_vec()), )?; } @@ -237,7 +255,7 @@ decl_module! { election_parameters.ensure_valid()?; let proposal_code = - >::set_election_parameters(election_parameters); + >::set_election_parameters(election_parameters.clone()); let proposal_parameters = proposal_types::parameters::set_election_parameters_proposal::(); @@ -250,6 +268,7 @@ decl_module! { stake_balance, proposal_code.encode(), proposal_parameters, + ProposalDetails::SetElectionParameters(election_parameters), )?; } @@ -265,7 +284,7 @@ decl_module! { mint_balance: BalanceOfMint, ) { let proposal_code = - >::set_council_mint_capacity(mint_balance); + >::set_council_mint_capacity(mint_balance.clone()); let proposal_parameters = proposal_types::parameters::set_council_mint_capacity_proposal::(); @@ -278,6 +297,7 @@ decl_module! { stake_balance, proposal_code.encode(), proposal_parameters, + ProposalDetails::SetCouncilMintCapacity(mint_balance), )?; } @@ -292,7 +312,7 @@ decl_module! { mint_balance: BalanceOfMint, ) { let proposal_code = - >::set_mint_capacity(mint_balance); + >::set_mint_capacity(mint_balance.clone()); let proposal_parameters = proposal_types::parameters::set_content_working_group_mint_capacity_proposal::(); @@ -305,6 +325,7 @@ decl_module! { stake_balance, proposal_code.encode(), proposal_parameters, + ProposalDetails::SetContentWorkingGroupMintCapacity(mint_balance), )?; } @@ -321,8 +342,10 @@ decl_module! { ) { ensure!(balance != BalanceOfMint::::zero(), Error::SpendingProposalZeroBalance); - let proposal_code = - >::spend_from_council_mint(balance, destination); + let proposal_code = >::spend_from_council_mint( + balance.clone(), + destination.clone() + ); let proposal_parameters = proposal_types::parameters::spending_proposal::(); @@ -335,6 +358,7 @@ decl_module! { stake_balance, proposal_code.encode(), proposal_parameters, + ProposalDetails::Spending(balance, destination), )?; } @@ -350,7 +374,7 @@ decl_module! { new_lead: Option<(T::MemberId, T::AccountId)> ) { let proposal_code = - >::replace_lead(new_lead); + >::replace_lead(new_lead.clone()); let proposal_parameters = proposal_types::parameters::set_lead_proposal::(); @@ -363,6 +387,7 @@ decl_module! { stake_balance, proposal_code.encode(), proposal_parameters, + ProposalDetails::SetLead(new_lead), )?; } @@ -434,6 +459,13 @@ impl Module { stake_balance: Option>, proposal_code: Vec, proposal_parameters: ProposalParameters>, + proposal_details: ProposalDetails< + BalanceOfMint, + BalanceOfGovernanceCurrency, + T::BlockNumber, + T::AccountId, + T::MemberId, + >, ) -> DispatchResult { let account_id = T::MembershipOriginValidator::ensure_actor_origin(origin, member_id.clone())?; @@ -461,6 +493,7 @@ impl Module { )?; >::insert(proposal_id, discussion_thread_id); + >::insert(proposal_id, proposal_details); Ok(()) } diff --git a/runtime-modules/proposals/codex/src/proposal_types/mod.rs b/runtime-modules/proposals/codex/src/proposal_types/mod.rs index ee65d7af17..4c5fff4519 100644 --- a/runtime-modules/proposals/codex/src/proposal_types/mod.rs +++ b/runtime-modules/proposals/codex/src/proposal_types/mod.rs @@ -1,101 +1,42 @@ -pub(crate) mod parameters { - use crate::{BalanceOf, ProposalParameters}; +pub(crate) mod parameters; - // Proposal parameters for the upgrade runtime proposal - pub(crate) fn upgrade_runtime( - ) -> ProposalParameters> { - ProposalParameters { - voting_period: T::BlockNumber::from(50000u32), - grace_period: T::BlockNumber::from(10000u32), - approval_quorum_percentage: 80, - approval_threshold_percentage: 80, - slashing_quorum_percentage: 80, - slashing_threshold_percentage: 80, - required_stake: Some(>::from(50000u32)), - } - } +use codec::{Decode, Encode}; +use rstd::vec::Vec; +#[cfg(feature = "std")] +use serde::{Deserialize, Serialize}; - // Proposal parameters for the text proposal - pub(crate) fn text_proposal( - ) -> ProposalParameters> { - ProposalParameters { - voting_period: T::BlockNumber::from(50000u32), - grace_period: T::BlockNumber::from(10000u32), - approval_quorum_percentage: 40, - approval_threshold_percentage: 51, - slashing_quorum_percentage: 80, - slashing_threshold_percentage: 82, - required_stake: Some(>::from(500u32)), - } - } +use crate::ElectionParameters; - // Proposal parameters for the 'Set Election Parameters' proposal - pub(crate) fn set_election_parameters_proposal( - ) -> ProposalParameters> { - ProposalParameters { - voting_period: T::BlockNumber::from(50000u32), - grace_period: T::BlockNumber::from(10000u32), - approval_quorum_percentage: 40, - approval_threshold_percentage: 51, - slashing_quorum_percentage: 81, - slashing_threshold_percentage: 80, - required_stake: Some(>::from(500u32)), - } - } +/// Proposal details provide voters the information required for the perceived voting. +#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive(Encode, Decode, Clone, PartialEq, Debug)] +pub enum ProposalDetails { + /// The text of the `text proposal` + Text(Vec), - // Proposal parameters for the 'Set council mint capacity' proposal - pub(crate) fn set_council_mint_capacity_proposal( - ) -> ProposalParameters> { - ProposalParameters { - voting_period: T::BlockNumber::from(50000u32), - grace_period: T::BlockNumber::from(10000u32), - approval_quorum_percentage: 40, - approval_threshold_percentage: 51, - slashing_quorum_percentage: 81, - slashing_threshold_percentage: 84, - required_stake: Some(>::from(500u32)), - } - } + /// The hash of wasm code for the `runtime upgrade proposal` + RuntimeUpgrade(Vec), - // Proposal parameters for the 'Set content working group mint capacity' proposal - pub(crate) fn set_content_working_group_mint_capacity_proposal( - ) -> ProposalParameters> { - ProposalParameters { - voting_period: T::BlockNumber::from(50000u32), - grace_period: T::BlockNumber::from(10000u32), - approval_quorum_percentage: 40, - approval_threshold_percentage: 51, - slashing_quorum_percentage: 81, - slashing_threshold_percentage: 85, - required_stake: Some(>::from(500u32)), - } - } + /// Election parameters for the `set election parameters proposal` + SetElectionParameters(ElectionParameters), - // Proposal parameters for the 'Spending' proposal - pub(crate) fn spending_proposal( - ) -> ProposalParameters> { - ProposalParameters { - voting_period: T::BlockNumber::from(50000u32), - grace_period: T::BlockNumber::from(10000u32), - approval_quorum_percentage: 40, - approval_threshold_percentage: 51, - slashing_quorum_percentage: 84, - slashing_threshold_percentage: 85, - required_stake: Some(>::from(500u32)), - } - } + /// Balance and destination account for the `spending proposal` + Spending(MintedBalance, AccountId), + + /// New leader memberId and account_id for the `set lead proposal` + SetLead(Option<(MemberId, AccountId)>), + + /// Balance for the `set council mint capacity proposal` + SetCouncilMintCapacity(MintedBalance), + + /// Balance for the `set content working group mint capacity proposal` + SetContentWorkingGroupMintCapacity(MintedBalance), +} - // Proposal parameters for the 'Set lead' proposal - pub(crate) fn set_lead_proposal( - ) -> ProposalParameters> { - ProposalParameters { - voting_period: T::BlockNumber::from(50000u32), - grace_period: T::BlockNumber::from(10000u32), - approval_quorum_percentage: 40, - approval_threshold_percentage: 51, - slashing_quorum_percentage: 81, - slashing_threshold_percentage: 86, - required_stake: Some(>::from(500u32)), - } +impl Default + for ProposalDetails +{ + fn default() -> Self { + ProposalDetails::Text(b"invalid proposal details".to_vec()) } } diff --git a/runtime-modules/proposals/codex/src/proposal_types/parameters.rs b/runtime-modules/proposals/codex/src/proposal_types/parameters.rs new file mode 100644 index 0000000000..b9dd1bd4c9 --- /dev/null +++ b/runtime-modules/proposals/codex/src/proposal_types/parameters.rs @@ -0,0 +1,98 @@ +use crate::{BalanceOf, ProposalParameters}; + +// Proposal parameters for the upgrade runtime proposal +pub(crate) fn upgrade_runtime() -> ProposalParameters> +{ + ProposalParameters { + voting_period: T::BlockNumber::from(50000u32), + grace_period: T::BlockNumber::from(10000u32), + approval_quorum_percentage: 80, + approval_threshold_percentage: 80, + slashing_quorum_percentage: 80, + slashing_threshold_percentage: 80, + required_stake: Some(>::from(50000u32)), + } +} + +// Proposal parameters for the text proposal +pub(crate) fn text_proposal() -> ProposalParameters> { + ProposalParameters { + voting_period: T::BlockNumber::from(50000u32), + grace_period: T::BlockNumber::from(10000u32), + approval_quorum_percentage: 40, + approval_threshold_percentage: 51, + slashing_quorum_percentage: 80, + slashing_threshold_percentage: 82, + required_stake: Some(>::from(500u32)), + } +} + +// Proposal parameters for the 'Set Election Parameters' proposal +pub(crate) fn set_election_parameters_proposal( +) -> ProposalParameters> { + ProposalParameters { + voting_period: T::BlockNumber::from(50000u32), + grace_period: T::BlockNumber::from(10000u32), + approval_quorum_percentage: 40, + approval_threshold_percentage: 51, + slashing_quorum_percentage: 81, + slashing_threshold_percentage: 80, + required_stake: Some(>::from(500u32)), + } +} + +// Proposal parameters for the 'Set council mint capacity' proposal +pub(crate) fn set_council_mint_capacity_proposal( +) -> ProposalParameters> { + ProposalParameters { + voting_period: T::BlockNumber::from(50000u32), + grace_period: T::BlockNumber::from(10000u32), + approval_quorum_percentage: 40, + approval_threshold_percentage: 51, + slashing_quorum_percentage: 81, + slashing_threshold_percentage: 84, + required_stake: Some(>::from(500u32)), + } +} + +// Proposal parameters for the 'Set content working group mint capacity' proposal +pub(crate) fn set_content_working_group_mint_capacity_proposal( +) -> ProposalParameters> { + ProposalParameters { + voting_period: T::BlockNumber::from(50000u32), + grace_period: T::BlockNumber::from(10000u32), + approval_quorum_percentage: 40, + approval_threshold_percentage: 51, + slashing_quorum_percentage: 81, + slashing_threshold_percentage: 85, + required_stake: Some(>::from(500u32)), + } +} + +// Proposal parameters for the 'Spending' proposal +pub(crate) fn spending_proposal( +) -> ProposalParameters> { + ProposalParameters { + voting_period: T::BlockNumber::from(50000u32), + grace_period: T::BlockNumber::from(10000u32), + approval_quorum_percentage: 40, + approval_threshold_percentage: 51, + slashing_quorum_percentage: 84, + slashing_threshold_percentage: 85, + required_stake: Some(>::from(500u32)), + } +} + +// Proposal parameters for the 'Set lead' proposal +pub(crate) fn set_lead_proposal( +) -> ProposalParameters> { + ProposalParameters { + voting_period: T::BlockNumber::from(50000u32), + grace_period: T::BlockNumber::from(10000u32), + approval_quorum_percentage: 40, + approval_threshold_percentage: 51, + slashing_quorum_percentage: 81, + slashing_threshold_percentage: 86, + required_stake: Some(>::from(500u32)), + } +} diff --git a/runtime-modules/proposals/codex/src/tests/mod.rs b/runtime-modules/proposals/codex/src/tests/mod.rs index 71d691ecd2..c82d34027b 100644 --- a/runtime-modules/proposals/codex/src/tests/mod.rs +++ b/runtime-modules/proposals/codex/src/tests/mod.rs @@ -5,9 +5,10 @@ use srml_support::traits::Currency; use srml_support::StorageMap; use system::RawOrigin; -use crate::{BalanceOf, Error}; +use crate::{BalanceOf, Error, ProposalDetails}; use mock::*; use proposal_engine::ProposalParameters; +use runtime_io::blake2_256; use srml_support::dispatch::DispatchResult; struct ProposalTestFixture @@ -22,6 +23,7 @@ where invalid_stake_call: InvalidStakeCall, successful_call: SuccessfulCall, proposal_parameters: ProposalParameters, + proposal_details: ProposalDetails, } impl @@ -59,6 +61,10 @@ where let proposal = ProposalsEngine::proposals(proposal_id); // check for correct proposal parameters assert_eq!(proposal.parameters, self.proposal_parameters); + + // proposal details was set + let details = >::get(proposal_id); + assert_eq!(details, self.proposal_details); } pub fn check_all(&self) { @@ -113,6 +119,7 @@ fn create_text_proposal_common_checks_succeed() { ) }, proposal_parameters: crate::proposal_types::parameters::text_proposal::(), + proposal_details: ProposalDetails::Text(b"text".to_vec()), }; proposal_fixture.check_all(); }); @@ -195,6 +202,7 @@ fn create_runtime_upgrade_common_checks_succeed() { ) }, proposal_parameters: crate::proposal_types::parameters::upgrade_runtime::(), + proposal_details: ProposalDetails::RuntimeUpgrade(blake2_256(b"wasm").to_vec()), }; proposal_fixture.check_all(); }); @@ -289,6 +297,7 @@ fn create_set_election_parameters_proposal_common_checks_succeed() { }, proposal_parameters: crate::proposal_types::parameters::set_election_parameters_proposal::(), + proposal_details: ProposalDetails::SetElectionParameters(election_parameters), }; proposal_fixture.check_all(); }); @@ -355,11 +364,12 @@ fn create_set_council_mint_capacity_proposal_common_checks_succeed() { b"title".to_vec(), b"body".to_vec(), Some(>::from(500u32)), - 0, + 10, ) }, proposal_parameters: crate::proposal_types::parameters::set_council_mint_capacity_proposal::(), + proposal_details: ProposalDetails::SetCouncilMintCapacity(10), }; proposal_fixture.check_all(); }); @@ -406,10 +416,11 @@ fn create_set_content_working_group_mint_capacity_proposal_common_checks_succeed b"title".to_vec(), b"body".to_vec(), Some(>::from(500u32)), - 0, + 10, ) }, proposal_parameters: crate::proposal_types::parameters::set_content_working_group_mint_capacity_proposal::(), + proposal_details: ProposalDetails::SetContentWorkingGroupMintCapacity(10), }; proposal_fixture.check_all(); }); @@ -464,6 +475,7 @@ fn create_spending_proposal_common_checks_succeed() { ) }, proposal_parameters: crate::proposal_types::parameters::spending_proposal::(), + proposal_details: ProposalDetails::Spending(100, 2), }; proposal_fixture.check_all(); }); @@ -532,6 +544,7 @@ fn create_set_lead_proposal_common_checks_succeed() { ) }, proposal_parameters: crate::proposal_types::parameters::set_lead_proposal::(), + proposal_details: ProposalDetails::SetLead(Some((20, 10))), }; proposal_fixture.check_all(); }); From 51cde50fb4c314a137abc5550222bd8c6a5b210d Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Thu, 2 Apr 2020 11:51:58 +0300 Subject: [PATCH 199/286] =?UTF-8?q?Add=20=E2=80=98create=5Fevict=5Fstorage?= =?UTF-8?q?=5Fprovider=5Fproposal=E2=80=99=20extrinsic?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - add ‘create_evict_storage_provider_proposal’ extrinsic to the codex module - add tests --- Cargo.lock | 1 + runtime-modules/proposals/codex/Cargo.toml | 6 +++ runtime-modules/proposals/codex/src/lib.rs | 32 ++++++++++- .../proposals/codex/src/proposal_types/mod.rs | 3 ++ .../codex/src/proposal_types/parameters.rs | 18 ++++++- .../proposals/codex/src/tests/mock.rs | 9 ++++ .../proposals/codex/src/tests/mod.rs | 53 ++++++++++++++++++- 7 files changed, 118 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8621e62937..536145fff1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5122,6 +5122,7 @@ dependencies = [ "substrate-proposals-discussion-module", "substrate-proposals-engine-module", "substrate-recurring-reward-module", + "substrate-roles-module", "substrate-stake-module", "substrate-token-mint-module", "substrate-versioned-store", diff --git a/runtime-modules/proposals/codex/Cargo.toml b/runtime-modules/proposals/codex/Cargo.toml index 98899c176c..d8a27c08c0 100644 --- a/runtime-modules/proposals/codex/Cargo.toml +++ b/runtime-modules/proposals/codex/Cargo.toml @@ -23,6 +23,7 @@ std = [ 'membership/std', 'governance/std', 'mint/std', + 'roles/std', ] @@ -129,6 +130,11 @@ default_features = false package = 'substrate-content-working-group-module' path = '../../content-working-group' +[dependencies.roles] +default_features = false +package = 'substrate-roles-module' +path = '../../roles' + [dev-dependencies.hiring] default_features = false package = 'substrate-hiring-module' diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index 8671496ac7..ff3db1f482 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -20,6 +20,7 @@ //! - [create_set_content_working_group_mint_capacity_proposal](./struct.Module.html#method.create_set_content_working_group_mint_capacity_proposal) //! - [create_spending_proposal](./struct.Module.html#method.create_spending_proposal) //! - [create_set_lead_proposal](./struct.Module.html#method.create_set_lead_proposal) +//! - [create_evict_storage_provider_proposal](./struct.Module.html#method.create_evict_storage_provider_proposal) //! //! ### Proposal implementations of this module //! - execute_text_proposal - prints the proposal to the log @@ -68,6 +69,7 @@ pub trait Trait: + membership::members::Trait + governance::election::Trait + content_working_group::Trait + + roles::actors::Trait { /// Defines max allowed text proposal length. type TextProposalMaxLength: Get; @@ -228,7 +230,7 @@ decl_module! { let proposal_code = >::execute_runtime_upgrade_proposal(title.clone(), description.clone(), wasm); - let proposal_parameters = proposal_types::parameters::upgrade_runtime::(); + let proposal_parameters = proposal_types::parameters::runtime_upgrade_proposal::(); Self::create_proposal( origin, @@ -391,6 +393,34 @@ decl_module! { )?; } + /// Create 'Evict storage provider' proposal type. + /// This proposal uses `remove_actor()` extrinsic from the `roles::actors` module. + pub fn create_evict_storage_provider_proposal( + origin, + member_id: MemberId, + title: Vec, + description: Vec, + stake_balance: Option>, + actor_account: T::AccountId, + ) { + let proposal_code = + >::remove_actor(actor_account.clone()); + + let proposal_parameters = + proposal_types::parameters::evict_storage_provider_proposal::(); + + Self::create_proposal( + origin, + member_id, + title, + description, + stake_balance, + proposal_code.encode(), + proposal_parameters, + ProposalDetails::EvictStorageProvider(actor_account), + )?; + } + // *************** Extrinsic to execute /// Text proposal extrinsic. Should be used as callable object to pass to the `engine` module. diff --git a/runtime-modules/proposals/codex/src/proposal_types/mod.rs b/runtime-modules/proposals/codex/src/proposal_types/mod.rs index 4c5fff4519..bf1eaadd2d 100644 --- a/runtime-modules/proposals/codex/src/proposal_types/mod.rs +++ b/runtime-modules/proposals/codex/src/proposal_types/mod.rs @@ -31,6 +31,9 @@ pub enum ProposalDetails Default diff --git a/runtime-modules/proposals/codex/src/proposal_types/parameters.rs b/runtime-modules/proposals/codex/src/proposal_types/parameters.rs index b9dd1bd4c9..bd1162b7c5 100644 --- a/runtime-modules/proposals/codex/src/proposal_types/parameters.rs +++ b/runtime-modules/proposals/codex/src/proposal_types/parameters.rs @@ -1,8 +1,8 @@ use crate::{BalanceOf, ProposalParameters}; // Proposal parameters for the upgrade runtime proposal -pub(crate) fn upgrade_runtime() -> ProposalParameters> -{ +pub(crate) fn runtime_upgrade_proposal( +) -> ProposalParameters> { ProposalParameters { voting_period: T::BlockNumber::from(50000u32), grace_period: T::BlockNumber::from(10000u32), @@ -96,3 +96,17 @@ pub(crate) fn set_lead_proposal( required_stake: Some(>::from(500u32)), } } + +// Proposal parameters for the 'Evict storage provider' proposal +pub(crate) fn evict_storage_provider_proposal( +) -> ProposalParameters> { + ProposalParameters { + voting_period: T::BlockNumber::from(50000u32), + grace_period: T::BlockNumber::from(10000u32), + approval_quorum_percentage: 40, + approval_threshold_percentage: 51, + slashing_quorum_percentage: 81, + slashing_threshold_percentage: 87, + required_stake: Some(>::from(500u32)), + } +} diff --git a/runtime-modules/proposals/codex/src/tests/mock.rs b/runtime-modules/proposals/codex/src/tests/mock.rs index 37a958aa68..4cc7ea64d1 100644 --- a/runtime-modules/proposals/codex/src/tests/mock.rs +++ b/runtime-modules/proposals/codex/src/tests/mock.rs @@ -187,6 +187,15 @@ impl hiring::Trait for Test { type StakeHandlerProvider = hiring::Module; } +impl roles::actors::Trait for Test { + type Event = (); + type OnActorRemoved = (); +} + +impl roles::actors::ActorRemoved for () { + fn actor_removed(_: &u64) {} +} + impl crate::Trait for Test { type TextProposalMaxLength = TextProposalMaxLength; type RuntimeUpgradeWasmProposalMaxLength = RuntimeUpgradeWasmProposalMaxLength; diff --git a/runtime-modules/proposals/codex/src/tests/mod.rs b/runtime-modules/proposals/codex/src/tests/mod.rs index c82d34027b..3f9d6e5259 100644 --- a/runtime-modules/proposals/codex/src/tests/mod.rs +++ b/runtime-modules/proposals/codex/src/tests/mod.rs @@ -201,7 +201,7 @@ fn create_runtime_upgrade_common_checks_succeed() { b"wasm".to_vec(), ) }, - proposal_parameters: crate::proposal_types::parameters::upgrade_runtime::(), + proposal_parameters: crate::proposal_types::parameters::runtime_upgrade_proposal::(), proposal_details: ProposalDetails::RuntimeUpgrade(blake2_256(b"wasm").to_vec()), }; proposal_fixture.check_all(); @@ -549,3 +549,54 @@ fn create_set_lead_proposal_common_checks_succeed() { proposal_fixture.check_all(); }); } + +#[test] +fn create_evict_storage_provider_common_checks_succeed() { + initial_test_ext().execute_with(|| { + let proposal_fixture = ProposalTestFixture { + insufficient_rights_call: || { + ProposalCodex::create_evict_storage_provider_proposal( + RawOrigin::None.into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + None, + 1, + ) + }, + empty_stake_call: || { + ProposalCodex::create_evict_storage_provider_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + None, + 1, + ) + }, + invalid_stake_call: || { + ProposalCodex::create_evict_storage_provider_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + Some(>::from(5000u32)), + 1, + ) + }, + successful_call: || { + ProposalCodex::create_evict_storage_provider_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + Some(>::from(500u32)), + 1, + ) + }, + proposal_parameters: crate::proposal_types::parameters::evict_storage_provider_proposal::(), + proposal_details: ProposalDetails::EvictStorageProvider(1), + }; + proposal_fixture.check_all(); + }); +} From b994ee7016aee00775a9ed120667348b599055d4 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Thu, 2 Apr 2020 13:37:57 +0300 Subject: [PATCH 200/286] =?UTF-8?q?Add=20=E2=80=98create=5Fset=5Fvalidator?= =?UTF-8?q?=5Fcount=5Fproposal=E2=80=99=20extrinsic?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - add ‘create_set_validator_count_proposal’ extrinsic to the codex module - add tests --- Cargo.lock | 3 + runtime-modules/proposals/codex/Cargo.toml | 21 +++++++ runtime-modules/proposals/codex/src/lib.rs | 30 ++++++++++ .../proposals/codex/src/proposal_types/mod.rs | 3 + .../codex/src/proposal_types/parameters.rs | 14 +++++ .../proposals/codex/src/tests/mock.rs | 55 +++++++++++++++++-- .../proposals/codex/src/tests/mod.rs | 55 ++++++++++++++++++- 7 files changed, 176 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 536145fff1..f2c844959b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5108,8 +5108,11 @@ dependencies = [ "serde", "sr-io", "sr-primitives", + "sr-staking-primitives", "sr-std", "srml-balances", + "srml-staking", + "srml-staking-reward-curve", "srml-support", "srml-system", "srml-timestamp", diff --git a/runtime-modules/proposals/codex/Cargo.toml b/runtime-modules/proposals/codex/Cargo.toml index d8a27c08c0..9369a6daf9 100644 --- a/runtime-modules/proposals/codex/Cargo.toml +++ b/runtime-modules/proposals/codex/Cargo.toml @@ -15,6 +15,7 @@ std = [ 'sr-primitives/std', 'system/std', 'timestamp/std', + 'staking/std', 'serde', 'proposal_engine/std', 'proposal_discussion/std', @@ -84,6 +85,12 @@ default-features = false git = 'https://github.com/paritytech/substrate.git' rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' +[dependencies.staking] +default_features = false +git = 'https://github.com/paritytech/substrate.git' +package = 'srml-staking' +rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' + [dependencies.runtime-io] default_features = false git = 'https://github.com/paritytech/substrate.git' @@ -159,3 +166,17 @@ path = '../../versioned-store-permissions' default_features = false package = 'substrate-recurring-reward-module' path = '../../recurring-reward' + +[dev-dependencies.sr-staking-primitives] +default_features = false +git = 'https://github.com/paritytech/substrate.git' +package = 'sr-staking-primitives' +rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' + +# don't rename the dependency it is causing some strange compiler error: +# https://github.com/rust-lang/rust/issues/64450 +[dev-dependencies.srml-staking-reward-curve] +package = 'srml-staking-reward-curve' +git = 'https://github.com/paritytech/substrate.git' +default_features = false +rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' \ No newline at end of file diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index ff3db1f482..ce0b4eb2fb 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -21,6 +21,7 @@ //! - [create_spending_proposal](./struct.Module.html#method.create_spending_proposal) //! - [create_set_lead_proposal](./struct.Module.html#method.create_set_lead_proposal) //! - [create_evict_storage_provider_proposal](./struct.Module.html#method.create_evict_storage_provider_proposal) +//! - [create_set_validator_count_proposal](./struct.Module.html#method.create_set_validator_count_proposal) //! //! ### Proposal implementations of this module //! - execute_text_proposal - prints the proposal to the log @@ -70,6 +71,7 @@ pub trait Trait: + governance::election::Trait + content_working_group::Trait + roles::actors::Trait + + staking::Trait { /// Defines max allowed text proposal length. type TextProposalMaxLength: Get; @@ -421,6 +423,34 @@ decl_module! { )?; } + /// Create 'Evict storage provider' proposal type. + /// This proposal uses `set_validator_count()` extrinsic from the Substrate `staking` module. + pub fn create_set_validator_count_proposal( + origin, + member_id: MemberId, + title: Vec, + description: Vec, + stake_balance: Option>, + new_validator_count: u32, + ) { + let proposal_code = + >::set_validator_count(new_validator_count); + + let proposal_parameters = + proposal_types::parameters::set_validator_count_proposal::(); + + Self::create_proposal( + origin, + member_id, + title, + description, + stake_balance, + proposal_code.encode(), + proposal_parameters, + ProposalDetails::SetValidatorCount(new_validator_count), + )?; + } + // *************** Extrinsic to execute /// Text proposal extrinsic. Should be used as callable object to pass to the `engine` module. diff --git a/runtime-modules/proposals/codex/src/proposal_types/mod.rs b/runtime-modules/proposals/codex/src/proposal_types/mod.rs index bf1eaadd2d..cbaa17c1bd 100644 --- a/runtime-modules/proposals/codex/src/proposal_types/mod.rs +++ b/runtime-modules/proposals/codex/src/proposal_types/mod.rs @@ -34,6 +34,9 @@ pub enum ProposalDetails Default diff --git a/runtime-modules/proposals/codex/src/proposal_types/parameters.rs b/runtime-modules/proposals/codex/src/proposal_types/parameters.rs index bd1162b7c5..f4be5877a9 100644 --- a/runtime-modules/proposals/codex/src/proposal_types/parameters.rs +++ b/runtime-modules/proposals/codex/src/proposal_types/parameters.rs @@ -110,3 +110,17 @@ pub(crate) fn evict_storage_provider_proposal( required_stake: Some(>::from(500u32)), } } + +// Proposal parameters for the 'Set validator count' proposal +pub(crate) fn set_validator_count_proposal( +) -> ProposalParameters> { + ProposalParameters { + voting_period: T::BlockNumber::from(50000u32), + grace_period: T::BlockNumber::from(10000u32), + approval_quorum_percentage: 40, + approval_threshold_percentage: 51, + slashing_quorum_percentage: 82, + slashing_threshold_percentage: 87, + required_stake: Some(>::from(500u32)), + } +} diff --git a/runtime-modules/proposals/codex/src/tests/mock.rs b/runtime-modules/proposals/codex/src/tests/mock.rs index 4cc7ea64d1..c911208c6a 100644 --- a/runtime-modules/proposals/codex/src/tests/mock.rs +++ b/runtime-modules/proposals/codex/src/tests/mock.rs @@ -1,17 +1,20 @@ #![cfg(test)] - -pub use system; +// srml_staking_reward_curve::build! - substrate macro produces a warning. +// TODO: remove after post-Rome substrate upgrade +#![allow(array_into_iter)] pub use primitives::{Blake2Hasher, H256}; +use proposal_engine::VotersParameters; +use sr_primitives::curve::PiecewiseLinear; pub use sr_primitives::{ testing::{Digest, DigestItem, Header, UintAuthorityId}, traits::{BlakeTwo256, Convert, IdentityLookup, OnFinalize}, weights::Weight, BuildStorage, DispatchError, Perbill, }; - -use proposal_engine::VotersParameters; +use sr_staking_primitives::SessionIndex; use srml_support::{impl_outer_dispatch, impl_outer_origin, parameter_types}; +pub use system; impl_outer_origin! { pub enum Origin for Test {} @@ -196,6 +199,50 @@ impl roles::actors::ActorRemoved for () { fn actor_removed(_: &u64) {} } +srml_staking_reward_curve::build! { + const I_NPOS: PiecewiseLinear<'static> = curve!( + min_inflation: 0_025_000, + max_inflation: 0_100_000, + ideal_stake: 0_500_000, + falloff: 0_050_000, + max_piece_count: 40, + test_precision: 0_005_000, + ); +} + +parameter_types! { + pub const SessionsPerEra: SessionIndex = 3; + pub const BondingDuration: staking::EraIndex = 3; + pub const RewardCurve: &'static PiecewiseLinear<'static> = &I_NPOS; +} +impl staking::Trait for Test { + type Currency = balances::Module; + type Time = timestamp::Module; + type CurrencyToVote = (); + type RewardRemainder = (); + type Event = (); + type Slash = (); + type Reward = (); + type SessionsPerEra = SessionsPerEra; + type BondingDuration = BondingDuration; + type SessionInterface = Self; + type RewardCurve = RewardCurve; +} + +impl staking::SessionInterface for Test { + fn disable_validator(_: &u64) -> Result { + unimplemented!() + } + + fn validators() -> Vec { + unimplemented!() + } + + fn prune_historical_up_to(_: u32) { + unimplemented!() + } +} + impl crate::Trait for Test { type TextProposalMaxLength = TextProposalMaxLength; type RuntimeUpgradeWasmProposalMaxLength = RuntimeUpgradeWasmProposalMaxLength; diff --git a/runtime-modules/proposals/codex/src/tests/mod.rs b/runtime-modules/proposals/codex/src/tests/mod.rs index 3f9d6e5259..5a0922f817 100644 --- a/runtime-modules/proposals/codex/src/tests/mod.rs +++ b/runtime-modules/proposals/codex/src/tests/mod.rs @@ -551,7 +551,7 @@ fn create_set_lead_proposal_common_checks_succeed() { } #[test] -fn create_evict_storage_provider_common_checks_succeed() { +fn create_evict_storage_provider_proposal_common_checks_succeed() { initial_test_ext().execute_with(|| { let proposal_fixture = ProposalTestFixture { insufficient_rights_call: || { @@ -600,3 +600,56 @@ fn create_evict_storage_provider_common_checks_succeed() { proposal_fixture.check_all(); }); } + +#[test] +fn create_set_validator_count_proposal_common_checks_succeed() { + initial_test_ext().execute_with(|| { + let proposal_fixture = ProposalTestFixture { + insufficient_rights_call: || { + ProposalCodex::create_set_validator_count_proposal( + RawOrigin::None.into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + None, + 1, + ) + }, + empty_stake_call: || { + ProposalCodex::create_set_validator_count_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + None, + 1, + ) + }, + invalid_stake_call: || { + ProposalCodex::create_set_validator_count_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + Some(>::from(5000u32)), + 1, + ) + }, + successful_call: || { + ProposalCodex::create_set_validator_count_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + Some(>::from(500u32)), + 1, + ) + }, + proposal_parameters: crate::proposal_types::parameters::set_validator_count_proposal::< + Test, + >(), + proposal_details: ProposalDetails::SetValidatorCount(1), + }; + proposal_fixture.check_all(); + }); +} From e77768af7c8b514c675fdd47dd66d8b267c1c149 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Thu, 2 Apr 2020 18:19:54 +0300 Subject: [PATCH 201/286] =?UTF-8?q?Add=20=E2=80=98create=5Fset=5Fstorage?= =?UTF-8?q?=5Frole=5Fparameters=5Fproposal=E2=80=99=20extrinsic?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - add ‘create_set_storage_role_parameters_proposal’ extrinsic - add tests --- Cargo.lock | 4 +- runtime-modules/membership/Cargo.toml | 2 +- runtime-modules/membership/src/role_types.rs | 4 ++ runtime-modules/proposals/codex/src/lib.rs | 32 +++++++++++ .../proposals/codex/src/proposal_types/mod.rs | 22 ++++---- .../codex/src/proposal_types/parameters.rs | 14 +++++ .../proposals/codex/src/tests/mod.rs | 53 +++++++++++++++++++ runtime-modules/roles/Cargo.toml | 2 +- runtime-modules/roles/src/actors.rs | 4 ++ 9 files changed, 124 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f2c844959b..8f24c1d188 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4912,7 +4912,7 @@ dependencies = [ [[package]] name = "substrate-membership-module" -version = "1.0.0" +version = "1.0.1" dependencies = [ "parity-scale-codec", "serde", @@ -5195,7 +5195,7 @@ dependencies = [ [[package]] name = "substrate-roles-module" -version = "1.0.0" +version = "1.0.1" dependencies = [ "parity-scale-codec", "serde", diff --git a/runtime-modules/membership/Cargo.toml b/runtime-modules/membership/Cargo.toml index 8fc8e9adc5..9961e03f1d 100644 --- a/runtime-modules/membership/Cargo.toml +++ b/runtime-modules/membership/Cargo.toml @@ -1,6 +1,6 @@ [package] name = 'substrate-membership-module' -version = '1.0.0' +version = '1.0.1' authors = ['Joystream contributors'] edition = '2018' diff --git a/runtime-modules/membership/src/role_types.rs b/runtime-modules/membership/src/role_types.rs index 803e048b8e..25dd8c9938 100644 --- a/runtime-modules/membership/src/role_types.rs +++ b/runtime-modules/membership/src/role_types.rs @@ -2,6 +2,10 @@ use codec::{Decode, Encode}; use rstd::collections::btree_set::BTreeSet; use rstd::prelude::*; +#[cfg(feature = "std")] +use serde::{Deserialize, Serialize}; + +#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] #[derive(Encode, Decode, Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Debug)] pub enum Role { StorageProvider, diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index ce0b4eb2fb..aba319b2f1 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -22,6 +22,7 @@ //! - [create_set_lead_proposal](./struct.Module.html#method.create_set_lead_proposal) //! - [create_evict_storage_provider_proposal](./struct.Module.html#method.create_evict_storage_provider_proposal) //! - [create_set_validator_count_proposal](./struct.Module.html#method.create_set_validator_count_proposal) +//! - [create_set_storage_role_parameters_proposal](./struct.Module.html#method.create_set_storage_role_parameters_proposal) //! //! ### Proposal implementations of this module //! - execute_text_proposal - prints the proposal to the log @@ -49,6 +50,7 @@ use codec::Encode; use common::origin_validator::ActorOriginValidator; use governance::election_params::ElectionParameters; use proposal_engine::ProposalParameters; +use roles::actors::{Role, RoleParameters}; use rstd::clone::Clone; use rstd::prelude::*; use rstd::str::from_utf8; @@ -451,6 +453,36 @@ decl_module! { )?; } + /// Create 'Set storage roles parameters' proposal type. + /// This proposal uses `set_role_parameters()` extrinsic from the Substrate `roles::actors` module. + pub fn create_set_storage_role_parameters_proposal( + origin, + member_id: MemberId, + title: Vec, + description: Vec, + stake_balance: Option>, + role_parameters: RoleParameters, T::BlockNumber> + ) { + let proposal_code = >::set_role_parameters( + Role::StorageProvider, + role_parameters.clone() + ); + + let proposal_parameters = + proposal_types::parameters::set_storage_role_parameters_proposal::(); + + Self::create_proposal( + origin, + member_id, + title, + description, + stake_balance, + proposal_code.encode(), + proposal_parameters, + ProposalDetails::SetStorageRoleParameters(role_parameters), + )?; + } + // *************** Extrinsic to execute /// Text proposal extrinsic. Should be used as callable object to pass to the `engine` module. diff --git a/runtime-modules/proposals/codex/src/proposal_types/mod.rs b/runtime-modules/proposals/codex/src/proposal_types/mod.rs index cbaa17c1bd..43a7138903 100644 --- a/runtime-modules/proposals/codex/src/proposal_types/mod.rs +++ b/runtime-modules/proposals/codex/src/proposal_types/mod.rs @@ -6,37 +6,41 @@ use rstd::vec::Vec; use serde::{Deserialize, Serialize}; use crate::ElectionParameters; +use roles::actors::RoleParameters; /// Proposal details provide voters the information required for the perceived voting. #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] #[derive(Encode, Decode, Clone, PartialEq, Debug)] pub enum ProposalDetails { - /// The text of the `text proposal` + /// The text of the `text` proposal Text(Vec), - /// The hash of wasm code for the `runtime upgrade proposal` + /// The hash of wasm code for the `runtime upgrade` proposal RuntimeUpgrade(Vec), - /// Election parameters for the `set election parameters proposal` + /// Election parameters for the `set election parameters` proposal SetElectionParameters(ElectionParameters), - /// Balance and destination account for the `spending proposal` + /// Balance and destination account for the `spending` proposal Spending(MintedBalance, AccountId), - /// New leader memberId and account_id for the `set lead proposal` + /// New leader memberId and account_id for the `set lead` proposal SetLead(Option<(MemberId, AccountId)>), - /// Balance for the `set council mint capacity proposal` + /// Balance for the `set council mint capacity` proposal SetCouncilMintCapacity(MintedBalance), - /// Balance for the `set content working group mint capacity proposal` + /// Balance for the `set content working group mint capacity` proposal SetContentWorkingGroupMintCapacity(MintedBalance), - /// AccountId for the `evict storage provider proposal` + /// AccountId for the `evict storage provider` proposal EvictStorageProvider(AccountId), - /// Validator count for the `set validator count proposal` + /// Validator count for the `set validator count` proposal SetValidatorCount(u32), + + /// Role parameters for the `set storage role parameters` proposal + SetStorageRoleParameters(RoleParameters), } impl Default diff --git a/runtime-modules/proposals/codex/src/proposal_types/parameters.rs b/runtime-modules/proposals/codex/src/proposal_types/parameters.rs index f4be5877a9..bcbf9a4e11 100644 --- a/runtime-modules/proposals/codex/src/proposal_types/parameters.rs +++ b/runtime-modules/proposals/codex/src/proposal_types/parameters.rs @@ -124,3 +124,17 @@ pub(crate) fn set_validator_count_proposal( required_stake: Some(>::from(500u32)), } } + +// Proposal parameters for the 'Set storage role parameters' proposal +pub(crate) fn set_storage_role_parameters_proposal( +) -> ProposalParameters> { + ProposalParameters { + voting_period: T::BlockNumber::from(50000u32), + grace_period: T::BlockNumber::from(10000u32), + approval_quorum_percentage: 40, + approval_threshold_percentage: 51, + slashing_quorum_percentage: 82, + slashing_threshold_percentage: 88, + required_stake: Some(>::from(500u32)), + } +} diff --git a/runtime-modules/proposals/codex/src/tests/mod.rs b/runtime-modules/proposals/codex/src/tests/mod.rs index 5a0922f817..95b2e4a459 100644 --- a/runtime-modules/proposals/codex/src/tests/mod.rs +++ b/runtime-modules/proposals/codex/src/tests/mod.rs @@ -8,6 +8,7 @@ use system::RawOrigin; use crate::{BalanceOf, Error, ProposalDetails}; use mock::*; use proposal_engine::ProposalParameters; +use roles::actors::RoleParameters; use runtime_io::blake2_256; use srml_support::dispatch::DispatchResult; @@ -653,3 +654,55 @@ fn create_set_validator_count_proposal_common_checks_succeed() { proposal_fixture.check_all(); }); } + +#[test] +fn create_set_storage_role_parameters_proposal_common_checks_succeed() { + initial_test_ext().execute_with(|| { + let proposal_fixture = ProposalTestFixture { + insufficient_rights_call: || { + ProposalCodex::create_set_storage_role_parameters_proposal( + RawOrigin::None.into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + None, + RoleParameters::default(), + ) + }, + empty_stake_call: || { + ProposalCodex::create_set_storage_role_parameters_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + None, + RoleParameters::default(), + ) + }, + invalid_stake_call: || { + ProposalCodex::create_set_storage_role_parameters_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + Some(>::from(5000u32)), + RoleParameters::default(), + ) + }, + successful_call: || { + ProposalCodex::create_set_storage_role_parameters_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + Some(>::from(500u32)), + RoleParameters::default(), + ) + }, + proposal_parameters: + crate::proposal_types::parameters::set_storage_role_parameters_proposal::(), + proposal_details: ProposalDetails::SetStorageRoleParameters(RoleParameters::default()), + }; + proposal_fixture.check_all(); + }); +} diff --git a/runtime-modules/roles/Cargo.toml b/runtime-modules/roles/Cargo.toml index 78f024c802..4b31781d2d 100644 --- a/runtime-modules/roles/Cargo.toml +++ b/runtime-modules/roles/Cargo.toml @@ -1,6 +1,6 @@ [package] name = 'substrate-roles-module' -version = '1.0.0' +version = '1.0.1' authors = ['Joystream contributors'] edition = '2018' diff --git a/runtime-modules/roles/src/actors.rs b/runtime-modules/roles/src/actors.rs index c702726168..d1771cd135 100644 --- a/runtime-modules/roles/src/actors.rs +++ b/runtime-modules/roles/src/actors.rs @@ -8,10 +8,14 @@ use srml_support::traits::{ use srml_support::{decl_event, decl_module, decl_storage, ensure}; use system::{self, ensure_root, ensure_signed}; +#[cfg(feature = "std")] +use serde::{Deserialize, Serialize}; + pub use membership::members::Role; const STAKING_ID: LockIdentifier = *b"role_stk"; +#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] #[derive(Encode, Decode, Copy, Clone, Eq, PartialEq, Debug)] pub struct RoleParameters { // minium balance required to stake to enter a role From 6c01c09dc549f2bacce4294b1282d046a8cc7a56 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 3 Apr 2020 11:34:23 +0300 Subject: [PATCH 202/286] Fix reset_proposal() in the engine module - fix reset_proposal() in the engine module: clean VoteExistsByProposalByVoter double map - add tests --- runtime-modules/proposals/engine/src/lib.rs | 1 + runtime-modules/proposals/engine/src/tests/mod.rs | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/runtime-modules/proposals/engine/src/lib.rs b/runtime-modules/proposals/engine/src/lib.rs index 19975197f9..e4fae3789e 100644 --- a/runtime-modules/proposals/engine/src/lib.rs +++ b/runtime-modules/proposals/engine/src/lib.rs @@ -469,6 +469,7 @@ impl Module { >::enumerate().for_each(|(proposal_id, _)| { >::mutate(proposal_id, |proposal| { proposal.reset_proposal(); + >::remove_prefix(&proposal_id); }); }); } diff --git a/runtime-modules/proposals/engine/src/tests/mod.rs b/runtime-modules/proposals/engine/src/tests/mod.rs index df2e49a9bf..48fca36675 100644 --- a/runtime-modules/proposals/engine/src/tests/mod.rs +++ b/runtime-modules/proposals/engine/src/tests/mod.rs @@ -6,7 +6,7 @@ use mock::*; use codec::Encode; use rstd::rc::Rc; use sr_primitives::traits::{DispatchResult, OnFinalize, OnInitialize}; -use srml_support::{StorageMap, StorageValue}; +use srml_support::{StorageDoubleMap, StorageMap, StorageValue}; use system::RawOrigin; use system::{EventRecord, Phase}; @@ -1339,6 +1339,10 @@ fn proposal_reset_succeeds() { vote_generator.vote_and_assert_ok(VoteKind::Slash); assert!(>::exists(proposal_id)); + assert_eq!( + >::get(&proposal_id, &2), + VoteKind::Abstain + ); run_to_block_and_finalize(2); @@ -1367,5 +1371,11 @@ fn proposal_reset_succeeds() { slashes: 0, } ); + + // whole double map prefix was removed (should return default value) + assert_eq!( + >::get(&proposal_id, &2), + VoteKind::default() + ); }); } From 020f3c7adc1bbd2e6ae9f9df18df2ed309ba8c1b Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 3 Apr 2020 15:27:16 +0300 Subject: [PATCH 203/286] Change upgrade runtime proposal - change upgrade runtime proposal in the codex module: add allowed proposers whitelist - add tests --- runtime-modules/proposals/codex/src/lib.rs | 11 +++++++++++ .../proposals/codex/src/tests/mock.rs | 2 ++ .../proposals/codex/src/tests/mod.rs | 17 +++++++++++++++++ runtime/src/lib.rs | 2 ++ 4 files changed, 32 insertions(+) diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index aba319b2f1..8f6f1cca34 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -81,6 +81,9 @@ pub trait Trait: /// Defines max wasm code length of the runtime upgrade proposal. type RuntimeUpgradeWasmProposalMaxLength: Get; + /// Defines allowed proposers (by member id list) for the runtime upgrade proposal. + type RuntimeUpgradeProposalAllowedProposers: Get>>; + /// Validates member id and origin combination type MembershipOriginValidator: ActorOriginValidator< Self::Origin, @@ -124,6 +127,9 @@ decl_error! { /// Provided WASM code for the runtime upgrade proposal is empty RuntimeProposalIsEmpty, + /// Runtime upgrade proposal can be created only by hardcoded members + RuntimeProposalProposerNotInTheAllowedProposersList, + /// Invalid balance value for the spending proposal SpendingProposalZeroBalance, @@ -229,6 +235,11 @@ decl_module! { ensure!(wasm.len() as u32 <= T::RuntimeUpgradeWasmProposalMaxLength::get(), Error::RuntimeProposalSizeExceeded); + ensure!( + T::RuntimeUpgradeProposalAllowedProposers::get().contains(&member_id), + Error::RuntimeProposalProposerNotInTheAllowedProposersList + ); + let wasm_hash = blake2_256(&wasm); let proposal_code = diff --git a/runtime-modules/proposals/codex/src/tests/mock.rs b/runtime-modules/proposals/codex/src/tests/mock.rs index c911208c6a..28e5a3da32 100644 --- a/runtime-modules/proposals/codex/src/tests/mock.rs +++ b/runtime-modules/proposals/codex/src/tests/mock.rs @@ -156,6 +156,7 @@ impl VotersParameters for MockVotersParameters { parameter_types! { pub const TextProposalMaxLength: u32 = 20_000; pub const RuntimeUpgradeWasmProposalMaxLength: u32 = 20_000; + pub const RuntimeUpgradeProposalAllowedProposers: Vec = vec![1]; } impl governance::election::Trait for Test { @@ -246,6 +247,7 @@ impl staking::SessionInterface for Test { impl crate::Trait for Test { type TextProposalMaxLength = TextProposalMaxLength; type RuntimeUpgradeWasmProposalMaxLength = RuntimeUpgradeWasmProposalMaxLength; + type RuntimeUpgradeProposalAllowedProposers = RuntimeUpgradeProposalAllowedProposers; type MembershipOriginValidator = (); } diff --git a/runtime-modules/proposals/codex/src/tests/mod.rs b/runtime-modules/proposals/codex/src/tests/mod.rs index 95b2e4a459..d148eaecb8 100644 --- a/runtime-modules/proposals/codex/src/tests/mod.rs +++ b/runtime-modules/proposals/codex/src/tests/mod.rs @@ -241,6 +241,23 @@ fn create_upgrade_runtime_proposal_codex_call_fails_with_incorrect_wasm_size() { }); } +#[test] +fn create_upgrade_runtime_proposal_codex_call_fails_with_not_allowed_member_id() { + initial_test_ext().execute_with(|| { + assert_eq!( + ProposalCodex::create_runtime_upgrade_proposal( + RawOrigin::Signed(1).into(), + 110, + b"title".to_vec(), + b"body".to_vec(), + Some(>::from(50000u32)), + b"wasm".to_vec(), + ), + Err(Error::RuntimeProposalProposerNotInTheAllowedProposersList) + ); + }); +} + #[test] fn create_set_election_parameters_proposal_common_checks_succeed() { initial_test_ext().execute_with(|| { diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 8a9da4e4cc..1d6af4371e 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -860,12 +860,14 @@ impl proposals_discussion::Trait for Runtime { parameter_types! { pub const TextProposalMaxLength: u32 = 60_000; pub const RuntimeUpgradeWasmProposalMaxLength: u32 = 2_000_000; + pub const RuntimeUpgradeProposalAllowedProposers: Vec = Vec::new(); //TODO set allowed members } impl proposals_codex::Trait for Runtime { type MembershipOriginValidator = MembershipOriginValidator; type TextProposalMaxLength = TextProposalMaxLength; type RuntimeUpgradeWasmProposalMaxLength = RuntimeUpgradeWasmProposalMaxLength; + type RuntimeUpgradeProposalAllowedProposers = RuntimeUpgradeProposalAllowedProposers; } construct_runtime!( From ab54a829a40c3dc7810bdec8e383001135ca5f3e Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 3 Apr 2020 19:11:50 +0300 Subject: [PATCH 204/286] Add some comments to proposal modules --- runtime-modules/proposals/codex/src/lib.rs | 6 +- .../proposals/discussion/src/lib.rs | 91 +++++++++++++------ runtime-modules/proposals/engine/src/lib.rs | 1 + 3 files changed, 66 insertions(+), 32 deletions(-) diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index 8f6f1cca34..4aec583bf4 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -222,7 +222,8 @@ decl_module! { )?; } - /// Create 'Runtime upgrade' proposal type. + /// Create 'Runtime upgrade' proposal type. Runtime upgrade can be initiated only by + /// members from the hardcoded list `RuntimeUpgradeProposalAllowedProposers` pub fn create_runtime_upgrade_proposal( origin, member_id: MemberId, @@ -289,7 +290,6 @@ decl_module! { )?; } - /// Create 'Set council mint capacity' proposal type. This proposal uses `set_mint_capacity()` /// extrinsic from the `governance::council` module. pub fn create_set_council_mint_capacity_proposal( @@ -580,7 +580,7 @@ impl Module { stake_balance, )?; - >::ensure_can_create_thread(&title, member_id.clone())?; + >::ensure_can_create_thread(member_id.clone(), &title)?; let discussion_thread_id = >::create_thread(member_id, title.clone())?; diff --git a/runtime-modules/proposals/discussion/src/lib.rs b/runtime-modules/proposals/discussion/src/lib.rs index 7820307efc..904552e70a 100644 --- a/runtime-modules/proposals/discussion/src/lib.rs +++ b/runtime-modules/proposals/discussion/src/lib.rs @@ -1,13 +1,43 @@ -//! Proposals discussion module for the Joystream platform. Version 2. -//! Contains discussion subsystem for the proposals engine. +//! # Proposals discussion module +//! Proposals `discussion` module for the Joystream platform. Version 2. +//! Contains discussion subsystem of the proposals. //! -//! Supported extrinsics: -//! - add_post - adds a post to existing discussion thread -//! - update_post - updates existing post +//! ## Overview //! -//! Public API: -//! - create_discussion - creates a discussion -//! - ensure_can_create_thread - ensures safe thread creation +//! The proposals discussion module is used by the codex module to provide a platform for discussions +//! about different proposals. It allows to create discussion threads and then add and update related +//! posts. +//! +//! ## Supported extrinsics +//! - [add_post](./struct.Module.html#method.add_post) - adds a post to existing discussion thread +//! - [update_post](./struct.Module.html#method.update_post) - updates existing post +//! +//! ## Public API methods +//! - [create_thread](./struct.Module.html#method.create_thread) - creates a discussion thread +//! - [ensure_can_create_thread](./struct.Module.html#method.ensure_can_create_thread) - ensures safe thread creation +//! +//! ## Usage +//! +//! ``` +//! use srml_support::{decl_module, dispatch::Result}; +//! use system::ensure_root; +//! use substrate_proposals_discussion_module::{self as discussions}; +//! +//! pub trait Trait: discussions::Trait + membership::members::Trait {} +//! +//! decl_module! { +//! pub struct Module for enum Call where origin: T::Origin { +//! pub fn create_discussion(origin, title: Vec, author_id : T::MemberId) -> Result { +//! ensure_root(origin)?; +//! >::ensure_can_create_thread(author_id, &title)?; +//! >::create_thread(author_id, title)?; +//! Ok(()) +//! } +//! } +//! } +//! # fn main() { } +//! ``` + //! // Ensure we're `no_std` when compiling for Wasm. @@ -84,6 +114,7 @@ pub trait Trait: system::Trait + membership::members::Trait { } decl_error! { + /// Discussion module predefined errors pub enum Error { /// Author should match the post creator NotAuthor, @@ -242,18 +273,13 @@ decl_module! { } impl Module { - // Wrapper-function over system::block_number() - fn current_block() -> T::BlockNumber { - >::block_number() - } - /// Create the discussion thread. Cannot add more threads than 'predefined limit = MaxThreadInARowNumber' /// times in a row by the same author. pub fn create_thread( thread_author_id: MemberId, title: Vec, ) -> Result { - Self::ensure_can_create_thread(&title, thread_author_id.clone())?; + Self::ensure_can_create_thread(thread_author_id.clone(), &title)?; let next_thread_count_value = Self::thread_count() + 1; let new_thread_id = next_thread_count_value; @@ -278,27 +304,13 @@ impl Module { Ok(thread_id) } - // returns incremented thread counter if last thread author equals with provided parameter - fn get_updated_thread_counter(author_id: MemberId) -> ThreadCounter> { - // if thread counter exists - if let Some(last_thread_author_counter) = Self::last_thread_author_counter() { - // if last(previous) author is the same as current author - if last_thread_author_counter.author_id == author_id { - return last_thread_author_counter.increment(); - } - } - - // else return new counter (set with 1 thread number) - ThreadCounter::new(author_id) - } - /// Ensures thread can be created. /// Checks: /// - title is valid /// - max thread in a row by the same author pub fn ensure_can_create_thread( - title: &[u8], thread_author_id: MemberId, + title: &[u8], ) -> DispatchResult { ensure!(!title.is_empty(), Error::EmptyTitleProvided); ensure!( @@ -317,3 +329,24 @@ impl Module { Ok(()) } } + +impl Module { + // Wrapper-function over system::block_number() + fn current_block() -> T::BlockNumber { + >::block_number() + } + + // returns incremented thread counter if last thread author equals with provided parameter + fn get_updated_thread_counter(author_id: MemberId) -> ThreadCounter> { + // if thread counter exists + if let Some(last_thread_author_counter) = Self::last_thread_author_counter() { + // if last(previous) author is the same as current author + if last_thread_author_counter.author_id == author_id { + return last_thread_author_counter.increment(); + } + } + + // else return new counter (set with 1 thread number) + ThreadCounter::new(author_id) + } +} diff --git a/runtime-modules/proposals/engine/src/lib.rs b/runtime-modules/proposals/engine/src/lib.rs index e4fae3789e..c9ec38f1a0 100644 --- a/runtime-modules/proposals/engine/src/lib.rs +++ b/runtime-modules/proposals/engine/src/lib.rs @@ -128,6 +128,7 @@ decl_event!( ); decl_error! { + /// Engine module predefined errors pub enum Error { /// Proposal cannot have an empty title" EmptyTitleProvided, From c27a869e1268a6f4fb0970ddd17dde1fb3314050 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Mon, 6 Apr 2020 15:32:24 +0300 Subject: [PATCH 205/286] Set min validator count for the proposals --- runtime-modules/proposals/codex/src/lib.rs | 11 ++++++++ .../proposals/codex/src/tests/mock.rs | 2 ++ .../proposals/codex/src/tests/mod.rs | 27 +++++++++++++++---- runtime/src/lib.rs | 2 ++ 4 files changed, 37 insertions(+), 5 deletions(-) diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index 4aec583bf4..e6bd1e4935 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -75,6 +75,9 @@ pub trait Trait: + roles::actors::Trait + staking::Trait { + /// Defines min allowed validator count for the 'Set validator count' proposal. + type SetValidatorCountProposalMinValidators: Get; + /// Defines max allowed text proposal length. type TextProposalMaxLength: Get; @@ -133,6 +136,9 @@ decl_error! { /// Invalid balance value for the spending proposal SpendingProposalZeroBalance, + /// Invalid validator count for the 'set validator count' proposal + LessThanMinValidatorCount, + /// Require root origin in extrinsics RequireRootOrigin, } @@ -446,6 +452,11 @@ decl_module! { stake_balance: Option>, new_validator_count: u32, ) { + ensure!( + new_validator_count >= T::SetValidatorCountProposalMinValidators::get(), + Error::LessThanMinValidatorCount + ); + let proposal_code = >::set_validator_count(new_validator_count); diff --git a/runtime-modules/proposals/codex/src/tests/mock.rs b/runtime-modules/proposals/codex/src/tests/mock.rs index 28e5a3da32..67f7bc16f3 100644 --- a/runtime-modules/proposals/codex/src/tests/mock.rs +++ b/runtime-modules/proposals/codex/src/tests/mock.rs @@ -155,6 +155,7 @@ impl VotersParameters for MockVotersParameters { parameter_types! { pub const TextProposalMaxLength: u32 = 20_000; + pub const SetValidatorCountProposalMinValidators: u32 = 4; pub const RuntimeUpgradeWasmProposalMaxLength: u32 = 20_000; pub const RuntimeUpgradeProposalAllowedProposers: Vec = vec![1]; } @@ -245,6 +246,7 @@ impl staking::SessionInterface for Test { } impl crate::Trait for Test { + type SetValidatorCountProposalMinValidators = SetValidatorCountProposalMinValidators; type TextProposalMaxLength = TextProposalMaxLength; type RuntimeUpgradeWasmProposalMaxLength = RuntimeUpgradeWasmProposalMaxLength; type RuntimeUpgradeProposalAllowedProposers = RuntimeUpgradeProposalAllowedProposers; diff --git a/runtime-modules/proposals/codex/src/tests/mod.rs b/runtime-modules/proposals/codex/src/tests/mod.rs index d148eaecb8..a0ce277cf2 100644 --- a/runtime-modules/proposals/codex/src/tests/mod.rs +++ b/runtime-modules/proposals/codex/src/tests/mod.rs @@ -630,7 +630,7 @@ fn create_set_validator_count_proposal_common_checks_succeed() { b"title".to_vec(), b"body".to_vec(), None, - 1, + 4, ) }, empty_stake_call: || { @@ -640,7 +640,7 @@ fn create_set_validator_count_proposal_common_checks_succeed() { b"title".to_vec(), b"body".to_vec(), None, - 1, + 4, ) }, invalid_stake_call: || { @@ -650,7 +650,7 @@ fn create_set_validator_count_proposal_common_checks_succeed() { b"title".to_vec(), b"body".to_vec(), Some(>::from(5000u32)), - 1, + 4, ) }, successful_call: || { @@ -660,18 +660,35 @@ fn create_set_validator_count_proposal_common_checks_succeed() { b"title".to_vec(), b"body".to_vec(), Some(>::from(500u32)), - 1, + 4, ) }, proposal_parameters: crate::proposal_types::parameters::set_validator_count_proposal::< Test, >(), - proposal_details: ProposalDetails::SetValidatorCount(1), + proposal_details: ProposalDetails::SetValidatorCount(4), }; proposal_fixture.check_all(); }); } +#[test] +fn create_set_validator_count_proposal_failed_with_invalid_validator_count() { + initial_test_ext().execute_with(|| { + assert_eq!( + ProposalCodex::create_set_validator_count_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + Some(>::from(500u32)), + 3, + ), + Err(Error::LessThanMinValidatorCount) + ); + }); +} + #[test] fn create_set_storage_role_parameters_proposal_common_checks_succeed() { initial_test_ext().execute_with(|| { diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 1d6af4371e..e8172f2b16 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -859,6 +859,7 @@ impl proposals_discussion::Trait for Runtime { parameter_types! { pub const TextProposalMaxLength: u32 = 60_000; + pub const SetValidatorCountProposalMinValidators: u32 = 4; pub const RuntimeUpgradeWasmProposalMaxLength: u32 = 2_000_000; pub const RuntimeUpgradeProposalAllowedProposers: Vec = Vec::new(); //TODO set allowed members } @@ -868,6 +869,7 @@ impl proposals_codex::Trait for Runtime { type TextProposalMaxLength = TextProposalMaxLength; type RuntimeUpgradeWasmProposalMaxLength = RuntimeUpgradeWasmProposalMaxLength; type RuntimeUpgradeProposalAllowedProposers = RuntimeUpgradeProposalAllowedProposers; + type SetValidatorCountProposalMinValidators = SetValidatorCountProposalMinValidators; } construct_runtime!( From aa793af1d932e1cee9e289b24113d8ff4ef32ad5 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Mon, 6 Apr 2020 18:48:13 +0300 Subject: [PATCH 206/286] Add ensure_storage_role_parameters_valid() to the codex --- runtime-modules/proposals/codex/src/lib.rs | 68 ++++++++++++++++++ .../proposals/codex/src/tests/mod.rs | 71 +++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index e6bd1e4935..1bd4a26909 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -141,6 +141,30 @@ decl_error! { /// Require root origin in extrinsics RequireRootOrigin, + + /// Invalid storage role parameter - min_actors + InvalidStorageRoleParameterMinActors, + + /// Invalid storage role parameter - max_actors + InvalidStorageRoleParameterMaxActors, + + /// Invalid storage role parameter - reward_period + InvalidStorageRoleParameterRewardPeriod, + + /// Invalid storage role parameter - bonding_period + InvalidStorageRoleParameterBondingPeriod, + + /// Invalid storage role parameter - unbonding_period + InvalidStorageRoleParameterUnbondingPeriod, + + /// Invalid storage role parameter - min_service_period + InvalidStorageRoleParameterMinServicePeriod, + + /// Invalid storage role parameter - min_service_period + InvalidStorageRoleParameterMinServicePeriod, + + /// Invalid storage role parameter - startup_grace_period + InvalidStorageRoleParameterStartupGracePeriod, } } @@ -485,6 +509,8 @@ decl_module! { stake_balance: Option>, role_parameters: RoleParameters, T::BlockNumber> ) { + Self::ensure_storage_role_parameters_valid(&role_parameters)?; + let proposal_code = >::set_role_parameters( Role::StorageProvider, role_parameters.clone() @@ -611,4 +637,46 @@ impl Module { Ok(()) } + + // validates storage role parameters for the 'Set storage role parameters' proposal + fn ensure_storage_role_parameters_valid( + role_parameters: &RoleParameters, T::BlockNumber>, + ) -> Result<(), Error> { + ensure!( + role_parameters.min_actors > 0, + Error::InvalidStorageRoleParameterMinActors + ); + + ensure!( + role_parameters.max_actors > 0, + Error::InvalidStorageRoleParameterMaxActors + ); + + ensure!( + role_parameters.reward_period == T::BlockNumber::from(600), + Error::InvalidStorageRoleParameterRewardPeriod + ); + + ensure!( + role_parameters.bonding_period == T::BlockNumber::from(600), + Error::InvalidStorageRoleParameterBondingPeriod + ); + + ensure!( + role_parameters.unbonding_period == T::BlockNumber::from(600), + Error::InvalidStorageRoleParameterUnbondingPeriod + ); + + ensure!( + role_parameters.min_service_period == T::BlockNumber::from(600), + Error::InvalidStorageRoleParameterMinServicePeriod + ); + + ensure!( + role_parameters.startup_grace_period >= T::BlockNumber::from(600), + Error::InvalidStorageRoleParameterStartupGracePeriod + ); + + Ok(()) + } } diff --git a/runtime-modules/proposals/codex/src/tests/mod.rs b/runtime-modules/proposals/codex/src/tests/mod.rs index a0ce277cf2..c84292ea06 100644 --- a/runtime-modules/proposals/codex/src/tests/mod.rs +++ b/runtime-modules/proposals/codex/src/tests/mod.rs @@ -740,3 +740,74 @@ fn create_set_storage_role_parameters_proposal_common_checks_succeed() { proposal_fixture.check_all(); }); } + +fn assert_failed_set_storage_parameters_call( + role_parameters: RoleParameters, + error: Error, +) { + assert_eq!( + ProposalCodex::create_set_storage_role_parameters_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + Some(>::from(500u32)), + role_parameters, + ), + Err(error) + ); +} + +#[test] +fn create_set_storage_role_parameters_proposal_fails_with_invalid_parameters() { + initial_test_ext().execute_with(|| { + let mut role_parameters = RoleParameters::default(); + role_parameters.min_actors = 0; + assert_failed_set_storage_parameters_call( + role_parameters, + Error::InvalidStorageRoleParameterMinActors, + ); + + role_parameters = RoleParameters::default(); + role_parameters.max_actors = 0; + assert_failed_set_storage_parameters_call( + role_parameters, + Error::InvalidStorageRoleParameterMaxActors, + ); + + role_parameters = RoleParameters::default(); + role_parameters.reward_period = 700; + assert_failed_set_storage_parameters_call( + role_parameters, + Error::InvalidStorageRoleParameterRewardPeriod, + ); + + role_parameters = RoleParameters::default(); + role_parameters.bonding_period = 700; + assert_failed_set_storage_parameters_call( + role_parameters, + Error::InvalidStorageRoleParameterBondingPeriod, + ); + + role_parameters = RoleParameters::default(); + role_parameters.unbonding_period = 700; + assert_failed_set_storage_parameters_call( + role_parameters, + Error::InvalidStorageRoleParameterUnbondingPeriod, + ); + + role_parameters = RoleParameters::default(); + role_parameters.min_service_period = 700; + assert_failed_set_storage_parameters_call( + role_parameters, + Error::InvalidStorageRoleParameterMinServicePeriod, + ); + + role_parameters = RoleParameters::default(); + role_parameters.startup_grace_period = 500; + assert_failed_set_storage_parameters_call( + role_parameters, + Error::InvalidStorageRoleParameterStartupGracePeriod, + ); + }); +} From 96720b4042201c8d8daa2ae025a760e1605bd008 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 7 Apr 2020 12:56:19 +0300 Subject: [PATCH 207/286] Add ensure_council_election_parameters_valid() to the codex --- runtime-modules/proposals/codex/src/lib.rs | 79 ++++++++++- .../proposals/codex/src/tests/mock.rs | 6 +- .../proposals/codex/src/tests/mod.rs | 131 +++++++++++++----- 3 files changed, 177 insertions(+), 39 deletions(-) diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index 1bd4a26909..f7d997b6eb 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -56,7 +56,7 @@ use rstd::prelude::*; use rstd::str::from_utf8; use rstd::vec::Vec; use runtime_io::blake2_256; -use sr_primitives::traits::Zero; +use sr_primitives::traits::{One, Zero}; use srml_support::dispatch::DispatchResult; use srml_support::traits::{Currency, Get}; use srml_support::{decl_error, decl_module, decl_storage, ensure, print}; @@ -160,11 +160,33 @@ decl_error! { /// Invalid storage role parameter - min_service_period InvalidStorageRoleParameterMinServicePeriod, - /// Invalid storage role parameter - min_service_period - InvalidStorageRoleParameterMinServicePeriod, - /// Invalid storage role parameter - startup_grace_period InvalidStorageRoleParameterStartupGracePeriod, + + /// Invalid council election parameter - council_size + InvalidCouncilElectionParameterCouncilSize, + + /// Invalid council election parameter - candidacy-limit + InvalidCouncilElectionParameterCandidacyLimit, + + /// Invalid council election parameter - min-voting_stake + InvalidCouncilElectionParameterMinVotingStake, + + /// Invalid council election parameter - new_term_duration + InvalidCouncilElectionParameterNewTermDuration, + + /// Invalid council election parameter - min_council_stake + InvalidCouncilElectionParameterMinCouncilStake, + + /// Invalid council election parameter - revealing_period + InvalidCouncilElectionParameterRevealingPeriod, + + /// Invalid council election parameter - voting_period + InvalidCouncilElectionParameterVotingPeriod, + + /// Invalid council election parameter - announcing_period + InvalidCouncilElectionParameterAnnouncingPeriod, + } } @@ -300,7 +322,7 @@ decl_module! { stake_balance: Option>, election_parameters: ElectionParameters, T::BlockNumber>, ) { - election_parameters.ensure_valid()?; + Self::ensure_council_election_parameters_valid(&election_parameters)?; let proposal_code = >::set_election_parameters(election_parameters.clone()); @@ -679,4 +701,51 @@ impl Module { Ok(()) } + + // validates council election parameters for the 'Set election parameters' proposal + fn ensure_council_election_parameters_valid( + election_parameters: &ElectionParameters, T::BlockNumber>, + ) -> Result<(), Error> { + ensure!( + election_parameters.council_size >= 3, + Error::InvalidCouncilElectionParameterCouncilSize + ); + + ensure!( + election_parameters.candidacy_limit >= 25, + Error::InvalidCouncilElectionParameterCandidacyLimit + ); + + ensure!( + election_parameters.min_voting_stake >= >::one(), + Error::InvalidCouncilElectionParameterMinVotingStake + ); + + ensure!( + election_parameters.new_term_duration >= T::BlockNumber::from(14400), + Error::InvalidCouncilElectionParameterNewTermDuration + ); + + ensure!( + election_parameters.revealing_period >= T::BlockNumber::from(14400), + Error::InvalidCouncilElectionParameterRevealingPeriod + ); + + ensure!( + election_parameters.voting_period >= T::BlockNumber::from(14400), + Error::InvalidCouncilElectionParameterVotingPeriod + ); + + ensure!( + election_parameters.announcing_period >= T::BlockNumber::from(14400), + Error::InvalidCouncilElectionParameterAnnouncingPeriod + ); + + ensure!( + election_parameters.min_council_stake >= >::one(), + Error::InvalidCouncilElectionParameterMinCouncilStake + ); + + Ok(()) + } } diff --git a/runtime-modules/proposals/codex/src/tests/mock.rs b/runtime-modules/proposals/codex/src/tests/mock.rs index 67f7bc16f3..866e19d918 100644 --- a/runtime-modules/proposals/codex/src/tests/mock.rs +++ b/runtime-modules/proposals/codex/src/tests/mock.rs @@ -123,8 +123,10 @@ impl governance::council::Trait for Test { } impl common::origin_validator::ActorOriginValidator for () { - fn ensure_actor_origin(_: Origin, _: u64) -> Result { - Ok(1) + fn ensure_actor_origin(origin: Origin, _: u64) -> Result { + let account_id = system::ensure_signed(origin)?; + + Ok(account_id) } } diff --git a/runtime-modules/proposals/codex/src/tests/mod.rs b/runtime-modules/proposals/codex/src/tests/mod.rs index c84292ea06..1a54966096 100644 --- a/runtime-modules/proposals/codex/src/tests/mod.rs +++ b/runtime-modules/proposals/codex/src/tests/mod.rs @@ -45,7 +45,10 @@ where } fn check_call_for_insufficient_rights(&self) { - assert!((self.insufficient_rights_call)().is_err()); + assert_eq!( + (self.insufficient_rights_call)(), + Err(Error::Other("RequireSignedOrigin")) + ); } fn check_for_successful_call(&self) { @@ -261,26 +264,15 @@ fn create_upgrade_runtime_proposal_codex_call_fails_with_not_allowed_member_id() #[test] fn create_set_election_parameters_proposal_common_checks_succeed() { initial_test_ext().execute_with(|| { - let election_parameters = ElectionParameters { - announcing_period: 1, - voting_period: 2, - revealing_period: 3, - council_size: 4, - candidacy_limit: 5, - min_voting_stake: 6, - min_council_stake: 7, - new_term_duration: 8, - }; - let proposal_fixture = ProposalTestFixture { insufficient_rights_call: || { ProposalCodex::create_set_election_parameters_proposal( - RawOrigin::Signed(1).into(), + RawOrigin::None.into(), 1, b"title".to_vec(), b"body".to_vec(), - Some(>::from(500u32)), - ElectionParameters::default(), + None, + get_valid_election_parameters(), ) }, empty_stake_call: || { @@ -290,7 +282,7 @@ fn create_set_election_parameters_proposal_common_checks_succeed() { b"title".to_vec(), b"body".to_vec(), None, - election_parameters.clone(), + get_valid_election_parameters(), ) }, invalid_stake_call: || { @@ -300,7 +292,7 @@ fn create_set_election_parameters_proposal_common_checks_succeed() { b"title".to_vec(), b"body".to_vec(), Some(>::from(50000u32)), - election_parameters.clone(), + get_valid_election_parameters(), ) }, successful_call: || { @@ -310,33 +302,108 @@ fn create_set_election_parameters_proposal_common_checks_succeed() { b"title".to_vec(), b"body".to_vec(), Some(>::from(500u32)), - election_parameters.clone(), + get_valid_election_parameters(), ) }, proposal_parameters: crate::proposal_types::parameters::set_election_parameters_proposal::(), - proposal_details: ProposalDetails::SetElectionParameters(election_parameters), + proposal_details: ProposalDetails::SetElectionParameters( + get_valid_election_parameters(), + ), }; proposal_fixture.check_all(); }); } + +fn assert_failed_election_parameters_call( + election_parameters: ElectionParameters, + error: Error, +) { + assert_eq!( + ProposalCodex::create_set_election_parameters_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + Some(>::from(500u32)), + election_parameters, + ), + Err(error) + ); +} + +fn get_valid_election_parameters() -> ElectionParameters { + ElectionParameters { + announcing_period: 14400, + voting_period: 14400, + revealing_period: 14400, + council_size: 3, + candidacy_limit: 25, + new_term_duration: 14400, + min_council_stake: 1, + min_voting_stake: 1, + } +} + #[test] fn create_set_election_parameters_call_fails_with_incorrect_parameters() { initial_test_ext().execute_with(|| { - let account_id = 1; - let required_stake = Some(>::from(500u32)); - let _imbalance = ::Currency::deposit_creating(&account_id, 50000); + let _imbalance = ::Currency::deposit_creating(&1, 50000); - assert_eq!( - ProposalCodex::create_set_election_parameters_proposal( - RawOrigin::Signed(1).into(), - 1, - b"title".to_vec(), - b"body".to_vec(), - required_stake, - ElectionParameters::default(), - ), - Err(Error::Other("PeriodCannotBeZero")) + let mut election_parameters = get_valid_election_parameters(); + election_parameters.council_size = 2; + assert_failed_election_parameters_call( + election_parameters, + Error::InvalidCouncilElectionParameterCouncilSize, + ); + + election_parameters = get_valid_election_parameters(); + election_parameters.candidacy_limit = 22; + assert_failed_election_parameters_call( + election_parameters, + Error::InvalidCouncilElectionParameterCandidacyLimit, + ); + + election_parameters = get_valid_election_parameters(); + election_parameters.min_voting_stake = 0; + assert_failed_election_parameters_call( + election_parameters, + Error::InvalidCouncilElectionParameterMinVotingStake, + ); + + election_parameters = get_valid_election_parameters(); + election_parameters.new_term_duration = 10000; + assert_failed_election_parameters_call( + election_parameters, + Error::InvalidCouncilElectionParameterNewTermDuration, + ); + + election_parameters = get_valid_election_parameters(); + election_parameters.min_council_stake = 0; + assert_failed_election_parameters_call( + election_parameters, + Error::InvalidCouncilElectionParameterMinCouncilStake, + ); + + election_parameters = get_valid_election_parameters(); + election_parameters.voting_period = 10000; + assert_failed_election_parameters_call( + election_parameters, + Error::InvalidCouncilElectionParameterVotingPeriod, + ); + + election_parameters = get_valid_election_parameters(); + election_parameters.revealing_period = 10000; + assert_failed_election_parameters_call( + election_parameters, + Error::InvalidCouncilElectionParameterRevealingPeriod, + ); + + election_parameters = get_valid_election_parameters(); + election_parameters.announcing_period = 10000; + assert_failed_election_parameters_call( + election_parameters, + Error::InvalidCouncilElectionParameterAnnouncingPeriod, ); }); } From e8dbdcb502af4739ccc2503b8a57a3de52702313 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 7 Apr 2020 19:14:09 +0300 Subject: [PATCH 208/286] Change min_validator_count() limit in the codex --- runtime-modules/proposals/codex/src/lib.rs | 5 +---- runtime-modules/proposals/codex/src/tests/mock.rs | 1 - runtime/src/lib.rs | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index f7d997b6eb..1d57d1e0d1 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -75,9 +75,6 @@ pub trait Trait: + roles::actors::Trait + staking::Trait { - /// Defines min allowed validator count for the 'Set validator count' proposal. - type SetValidatorCountProposalMinValidators: Get; - /// Defines max allowed text proposal length. type TextProposalMaxLength: Get; @@ -499,7 +496,7 @@ decl_module! { new_validator_count: u32, ) { ensure!( - new_validator_count >= T::SetValidatorCountProposalMinValidators::get(), + new_validator_count >= >::minimum_validator_count(), Error::LessThanMinValidatorCount ); diff --git a/runtime-modules/proposals/codex/src/tests/mock.rs b/runtime-modules/proposals/codex/src/tests/mock.rs index 866e19d918..38c0b36f9b 100644 --- a/runtime-modules/proposals/codex/src/tests/mock.rs +++ b/runtime-modules/proposals/codex/src/tests/mock.rs @@ -157,7 +157,6 @@ impl VotersParameters for MockVotersParameters { parameter_types! { pub const TextProposalMaxLength: u32 = 20_000; - pub const SetValidatorCountProposalMinValidators: u32 = 4; pub const RuntimeUpgradeWasmProposalMaxLength: u32 = 20_000; pub const RuntimeUpgradeProposalAllowedProposers: Vec = vec![1]; } diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index e8172f2b16..173f21bc52 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -859,7 +859,6 @@ impl proposals_discussion::Trait for Runtime { parameter_types! { pub const TextProposalMaxLength: u32 = 60_000; - pub const SetValidatorCountProposalMinValidators: u32 = 4; pub const RuntimeUpgradeWasmProposalMaxLength: u32 = 2_000_000; pub const RuntimeUpgradeProposalAllowedProposers: Vec = Vec::new(); //TODO set allowed members } From b67925747fe99b7fc471d22d7725a291183a40da Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Wed, 8 Apr 2020 19:17:23 +0300 Subject: [PATCH 209/286] Add veto for the pending execution proposal. --- .../proposals/codex/src/tests/mock.rs | 1 - .../proposals/codex/src/tests/mod.rs | 5 + runtime-modules/proposals/engine/src/lib.rs | 30 ++++- .../proposals/engine/src/tests/mod.rs | 113 ++++++++++++++++++ runtime/src/lib.rs | 1 - 5 files changed, 145 insertions(+), 5 deletions(-) diff --git a/runtime-modules/proposals/codex/src/tests/mock.rs b/runtime-modules/proposals/codex/src/tests/mock.rs index 38c0b36f9b..d3a8de4f29 100644 --- a/runtime-modules/proposals/codex/src/tests/mock.rs +++ b/runtime-modules/proposals/codex/src/tests/mock.rs @@ -247,7 +247,6 @@ impl staking::SessionInterface for Test { } impl crate::Trait for Test { - type SetValidatorCountProposalMinValidators = SetValidatorCountProposalMinValidators; type TextProposalMaxLength = TextProposalMaxLength; type RuntimeUpgradeWasmProposalMaxLength = RuntimeUpgradeWasmProposalMaxLength; type RuntimeUpgradeProposalAllowedProposers = RuntimeUpgradeProposalAllowedProposers; diff --git a/runtime-modules/proposals/codex/src/tests/mod.rs b/runtime-modules/proposals/codex/src/tests/mod.rs index 1a54966096..f6e1381105 100644 --- a/runtime-modules/proposals/codex/src/tests/mod.rs +++ b/runtime-modules/proposals/codex/src/tests/mod.rs @@ -828,6 +828,11 @@ fn assert_failed_set_storage_parameters_call( #[test] fn create_set_storage_role_parameters_proposal_fails_with_invalid_parameters() { initial_test_ext().execute_with(|| { + // { + // let _imbalance = ::Currency::deposit_creating(&44, 50000); + // } + // assert_eq!(Balances::total_issuance(), 0); + let mut role_parameters = RoleParameters::default(); role_parameters.min_actors = 0; assert_failed_set_storage_parameters_call( diff --git a/runtime-modules/proposals/engine/src/lib.rs b/runtime-modules/proposals/engine/src/lib.rs index c9ec38f1a0..66cb908866 100644 --- a/runtime-modules/proposals/engine/src/lib.rs +++ b/runtime-modules/proposals/engine/src/lib.rs @@ -279,11 +279,14 @@ decl_module! { ensure!(>::exists(proposal_id), Error::ProposalNotFound); let proposal = Self::proposals(proposal_id); - ensure!(matches!(proposal.status, ProposalStatus::Active{..}), Error::ProposalFinalized); - // mutation - Self::finalize_proposal(proposal_id, ProposalDecisionStatus::Vetoed); + if >::exists(proposal_id) { + Self::veto_pending_execution_proposal(proposal_id, proposal); + } else { + ensure!(matches!(proposal.status, ProposalStatus::Active{..}), Error::ProposalFinalized); + Self::finalize_proposal(proposal_id, ProposalDecisionStatus::Vetoed); + } } /// Block finalization. Perform voting period check, vote result tally, approved proposals @@ -510,6 +513,27 @@ impl Module { .collect() // compose output vector } + // Veto approved proposal during its grace period. Saves a new proposal status and removes + // proposal id from the 'PendingExecutionProposalIds' + fn veto_pending_execution_proposal(proposal_id: T::ProposalId, proposal: ProposalOf) { + >::remove(proposal_id); + + let vetoed_proposal_status = ProposalStatus::finalized( + ProposalDecisionStatus::Vetoed, + None, + None, + Self::current_block(), + ); + + >::insert( + proposal_id, + Proposal { + status: vetoed_proposal_status, + ..proposal + }, + ); + } + // Executes approved proposal code fn execute_proposal(approved_proposal: ApprovedProposal) { let proposal_code = Self::proposal_codes(approved_proposal.proposal_id); diff --git a/runtime-modules/proposals/engine/src/tests/mod.rs b/runtime-modules/proposals/engine/src/tests/mod.rs index 48fca36675..de6c645943 100644 --- a/runtime-modules/proposals/engine/src/tests/mod.rs +++ b/runtime-modules/proposals/engine/src/tests/mod.rs @@ -819,6 +819,119 @@ fn proposal_execution_postponed_because_of_grace_period() { }); } +/* + +#[test] +fn veto_proposal_succeeds() { + initial_test_ext().execute_with(|| { + // internal active proposal counter check + assert_eq!(::get(), 0); + + let parameters_fixture = ProposalParametersFixture::default(); + let dummy_proposal = + DummyProposalFixture::default().with_parameters(parameters_fixture.params()); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); + + // internal active proposal counter check + assert_eq!(::get(), 1); + + let veto_proposal = VetoProposalFixture::new(proposal_id); + veto_proposal.veto_and_assert(Ok(())); + + let proposal = >::get(proposal_id); + + assert_eq!( + proposal, + Proposal { + parameters: parameters_fixture.params(), + proposer_id: 1, + created_at: 1, + status: ProposalStatus::finalized_successfully(ProposalDecisionStatus::Vetoed, 1), + title: b"title".to_vec(), + description: b"description".to_vec(), + voting_results: VotingResults::default(), + } + ); + + // internal active proposal counter check + assert_eq!(::get(), 0); + }); +} +*/ + +#[test] +fn proposal_execution_vetoed_successfully_during_the_grace_period() { + initial_test_ext().execute_with(|| { + let parameters_fixture = ProposalParametersFixture::default().with_grace_period(2); + let dummy_proposal = + DummyProposalFixture::default().with_parameters(parameters_fixture.params()); + + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); + + let mut vote_generator = VoteGenerator::new(proposal_id); + vote_generator.vote_and_assert_ok(VoteKind::Approve); + vote_generator.vote_and_assert_ok(VoteKind::Approve); + vote_generator.vote_and_assert_ok(VoteKind::Approve); + vote_generator.vote_and_assert_ok(VoteKind::Approve); + + run_to_block_and_finalize(1); + run_to_block_and_finalize(2); + + // check internal cache for proposal_id presense + assert!(>::enumerate() + .find(|(x, _)| *x == proposal_id) + .is_some()); + + let proposal = >::get(proposal_id); + + assert_eq!( + proposal, + Proposal { + parameters: parameters_fixture.params(), + proposer_id: 1, + created_at: 1, + status: ProposalStatus::approved(ApprovedProposalStatus::PendingExecution, 1), + title: b"title".to_vec(), + description: b"description".to_vec(), + voting_results: VotingResults { + abstentions: 0, + approvals: 4, + rejections: 0, + slashes: 0, + }, + } + ); + + let veto_proposal = VetoProposalFixture::new(proposal_id); + veto_proposal.veto_and_assert(Ok(())); + + let proposal = >::get(proposal_id); + + assert_eq!( + proposal, + Proposal { + parameters: parameters_fixture.params(), + proposer_id: 1, + created_at: 1, + status: ProposalStatus::finalized_successfully(ProposalDecisionStatus::Vetoed, 2), + title: b"title".to_vec(), + description: b"description".to_vec(), + voting_results: VotingResults { + abstentions: 0, + approvals: 4, + rejections: 0, + slashes: 0, + }, + } + ); + + // check internal cache for proposal_id presense + assert!(>::enumerate() + .find(|(x, _)| *x == proposal_id) + .is_none()); + }); +} + #[test] fn proposal_execution_succeeds_after_the_grace_period() { initial_test_ext().execute_with(|| { diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 173f21bc52..1d6af4371e 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -868,7 +868,6 @@ impl proposals_codex::Trait for Runtime { type TextProposalMaxLength = TextProposalMaxLength; type RuntimeUpgradeWasmProposalMaxLength = RuntimeUpgradeWasmProposalMaxLength; type RuntimeUpgradeProposalAllowedProposers = RuntimeUpgradeProposalAllowedProposers; - type SetValidatorCountProposalMinValidators = SetValidatorCountProposalMinValidators; } construct_runtime!( From f55dcf6070c619f7f74f861a3fe68b708da68f39 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Thu, 9 Apr 2020 18:26:07 +0300 Subject: [PATCH 210/286] Set general proposal parameters. --- runtime-modules/proposals/codex/src/lib.rs | 3 + .../codex/src/proposal_types/parameters.rs | 197 +++++++++++------- .../proposals/codex/src/tests/mod.rs | 56 +++-- 3 files changed, 166 insertions(+), 90 deletions(-) diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index 1d57d1e0d1..2f49464614 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -96,6 +96,9 @@ pub trait Trait: pub type BalanceOf = <::Currency as Currency<::AccountId>>::Balance; +/// Currency alias for `stake` module +pub type CurrencyOf = ::Currency; + /// Balance alias for GovernanceCurrency from `common` module. TODO: replace with BalanceOf pub type BalanceOfGovernanceCurrency = <::Currency as Currency< diff --git a/runtime-modules/proposals/codex/src/proposal_types/parameters.rs b/runtime-modules/proposals/codex/src/proposal_types/parameters.rs index bcbf9a4e11..e72f956fd3 100644 --- a/runtime-modules/proposals/codex/src/proposal_types/parameters.rs +++ b/runtime-modules/proposals/codex/src/proposal_types/parameters.rs @@ -1,29 +1,62 @@ -use crate::{BalanceOf, ProposalParameters}; +use crate::{BalanceOf, CurrencyOf, ProposalParameters}; +use rstd::convert::TryInto; +use sr_primitives::traits::SaturatedConversion; +pub use sr_primitives::Perbill; +use srml_support::traits::Currency; + +// calculates required stake value using total issuance value and stake percentage. Truncates to +// lowest integer value. +fn get_required_stake_by_fraction( + numerator: u32, + denominator: u32, +) -> BalanceOf { + let total_issuance: u128 = >::total_issuance().try_into().unwrap_or(0) as u128; + let required_stake = + Perbill::from_rational_approximation(numerator, denominator) * total_issuance; + + let balance: BalanceOf = required_stake.saturated_into(); + + balance +} + +// Proposal parameters for the 'Set validator count' proposal +pub(crate) fn set_validator_count_proposal( +) -> ProposalParameters> { + ProposalParameters { + voting_period: T::BlockNumber::from(43200u32), + grace_period: T::BlockNumber::from(0u32), + approval_quorum_percentage: 66, + approval_threshold_percentage: 80, + slashing_quorum_percentage: 60, + slashing_threshold_percentage: 80, + required_stake: Some(get_required_stake_by_fraction::(25, 10000)), + } +} // Proposal parameters for the upgrade runtime proposal pub(crate) fn runtime_upgrade_proposal( ) -> ProposalParameters> { ProposalParameters { - voting_period: T::BlockNumber::from(50000u32), - grace_period: T::BlockNumber::from(10000u32), + voting_period: T::BlockNumber::from(72000u32), + grace_period: T::BlockNumber::from(72000u32), approval_quorum_percentage: 80, - approval_threshold_percentage: 80, - slashing_quorum_percentage: 80, + approval_threshold_percentage: 100, + slashing_quorum_percentage: 60, slashing_threshold_percentage: 80, - required_stake: Some(>::from(50000u32)), + required_stake: Some(get_required_stake_by_fraction::(1, 100)), } } // Proposal parameters for the text proposal pub(crate) fn text_proposal() -> ProposalParameters> { ProposalParameters { - voting_period: T::BlockNumber::from(50000u32), - grace_period: T::BlockNumber::from(10000u32), - approval_quorum_percentage: 40, - approval_threshold_percentage: 51, - slashing_quorum_percentage: 80, - slashing_threshold_percentage: 82, - required_stake: Some(>::from(500u32)), + voting_period: T::BlockNumber::from(72000u32), + grace_period: T::BlockNumber::from(0u32), + approval_quorum_percentage: 66, + approval_threshold_percentage: 80, + slashing_quorum_percentage: 60, + slashing_threshold_percentage: 80, + required_stake: Some(get_required_stake_by_fraction::(25, 10000)), } } @@ -31,13 +64,13 @@ pub(crate) fn text_proposal() -> ProposalParameters( ) -> ProposalParameters> { ProposalParameters { - voting_period: T::BlockNumber::from(50000u32), - grace_period: T::BlockNumber::from(10000u32), - approval_quorum_percentage: 40, - approval_threshold_percentage: 51, - slashing_quorum_percentage: 81, + voting_period: T::BlockNumber::from(72000u32), + grace_period: T::BlockNumber::from(201601u32), + approval_quorum_percentage: 66, + approval_threshold_percentage: 80, + slashing_quorum_percentage: 60, slashing_threshold_percentage: 80, - required_stake: Some(>::from(500u32)), + required_stake: Some(get_required_stake_by_fraction::(75, 10000)), } } @@ -45,13 +78,13 @@ pub(crate) fn set_election_parameters_proposal( pub(crate) fn set_council_mint_capacity_proposal( ) -> ProposalParameters> { ProposalParameters { - voting_period: T::BlockNumber::from(50000u32), - grace_period: T::BlockNumber::from(10000u32), - approval_quorum_percentage: 40, - approval_threshold_percentage: 51, - slashing_quorum_percentage: 81, - slashing_threshold_percentage: 84, - required_stake: Some(>::from(500u32)), + voting_period: T::BlockNumber::from(43200u32), + grace_period: T::BlockNumber::from(0u32), + approval_quorum_percentage: 66, + approval_threshold_percentage: 80, + slashing_quorum_percentage: 50, + slashing_threshold_percentage: 50, + required_stake: Some(get_required_stake_by_fraction::(25, 10000)), } } @@ -59,13 +92,13 @@ pub(crate) fn set_council_mint_capacity_proposal( pub(crate) fn set_content_working_group_mint_capacity_proposal( ) -> ProposalParameters> { ProposalParameters { - voting_period: T::BlockNumber::from(50000u32), - grace_period: T::BlockNumber::from(10000u32), - approval_quorum_percentage: 40, - approval_threshold_percentage: 51, - slashing_quorum_percentage: 81, - slashing_threshold_percentage: 85, - required_stake: Some(>::from(500u32)), + voting_period: T::BlockNumber::from(43200u32), + grace_period: T::BlockNumber::from(0u32), + approval_quorum_percentage: 50, + approval_threshold_percentage: 75, + slashing_quorum_percentage: 60, + slashing_threshold_percentage: 80, + required_stake: Some(get_required_stake_by_fraction::(25, 10000)), } } @@ -73,13 +106,13 @@ pub(crate) fn set_content_working_group_mint_capacity_proposal( pub(crate) fn spending_proposal( ) -> ProposalParameters> { ProposalParameters { - voting_period: T::BlockNumber::from(50000u32), - grace_period: T::BlockNumber::from(10000u32), - approval_quorum_percentage: 40, - approval_threshold_percentage: 51, - slashing_quorum_percentage: 84, - slashing_threshold_percentage: 85, - required_stake: Some(>::from(500u32)), + voting_period: T::BlockNumber::from(43200u32), + grace_period: T::BlockNumber::from(0u32), + approval_quorum_percentage: 66, + approval_threshold_percentage: 80, + slashing_quorum_percentage: 60, + slashing_threshold_percentage: 80, + required_stake: Some(get_required_stake_by_fraction::(25, 10000)), } } @@ -87,13 +120,13 @@ pub(crate) fn spending_proposal( pub(crate) fn set_lead_proposal( ) -> ProposalParameters> { ProposalParameters { - voting_period: T::BlockNumber::from(50000u32), - grace_period: T::BlockNumber::from(10000u32), - approval_quorum_percentage: 40, - approval_threshold_percentage: 51, - slashing_quorum_percentage: 81, - slashing_threshold_percentage: 86, - required_stake: Some(>::from(500u32)), + voting_period: T::BlockNumber::from(43200u32), + grace_period: T::BlockNumber::from(0u32), + approval_quorum_percentage: 66, + approval_threshold_percentage: 80, + slashing_quorum_percentage: 60, + slashing_threshold_percentage: 80, + required_stake: Some(get_required_stake_by_fraction::(25, 10000)), } } @@ -101,40 +134,56 @@ pub(crate) fn set_lead_proposal( pub(crate) fn evict_storage_provider_proposal( ) -> ProposalParameters> { ProposalParameters { - voting_period: T::BlockNumber::from(50000u32), - grace_period: T::BlockNumber::from(10000u32), - approval_quorum_percentage: 40, - approval_threshold_percentage: 51, - slashing_quorum_percentage: 81, - slashing_threshold_percentage: 87, - required_stake: Some(>::from(500u32)), + voting_period: T::BlockNumber::from(43200u32), + grace_period: T::BlockNumber::from(0u32), + approval_quorum_percentage: 50, + approval_threshold_percentage: 75, + slashing_quorum_percentage: 60, + slashing_threshold_percentage: 80, + required_stake: Some(get_required_stake_by_fraction::(1, 1000)), } } -// Proposal parameters for the 'Set validator count' proposal -pub(crate) fn set_validator_count_proposal( +// Proposal parameters for the 'Set storage role parameters' proposal +pub(crate) fn set_storage_role_parameters_proposal( ) -> ProposalParameters> { ProposalParameters { - voting_period: T::BlockNumber::from(50000u32), - grace_period: T::BlockNumber::from(10000u32), - approval_quorum_percentage: 40, - approval_threshold_percentage: 51, - slashing_quorum_percentage: 82, - slashing_threshold_percentage: 87, - required_stake: Some(>::from(500u32)), + voting_period: T::BlockNumber::from(43200u32), + grace_period: T::BlockNumber::from(14400u32), + approval_quorum_percentage: 75, + approval_threshold_percentage: 80, + slashing_quorum_percentage: 60, + slashing_threshold_percentage: 80, + required_stake: Some(get_required_stake_by_fraction::(25, 10000)), } } -// Proposal parameters for the 'Set storage role parameters' proposal -pub(crate) fn set_storage_role_parameters_proposal( -) -> ProposalParameters> { - ProposalParameters { - voting_period: T::BlockNumber::from(50000u32), - grace_period: T::BlockNumber::from(10000u32), - approval_quorum_percentage: 40, - approval_threshold_percentage: 51, - slashing_quorum_percentage: 82, - slashing_threshold_percentage: 88, - required_stake: Some(>::from(500u32)), +#[cfg(test)] +mod test { + use crate::proposal_types::parameters::get_required_stake_by_fraction; + use crate::tests::{increase_total_balance_issuance, initial_test_ext, Test}; + + pub use sr_primitives::Perbill; + + #[test] + fn calculate_get_required_stake_by_fraction_with_zero_issuance() { + initial_test_ext() + .execute_with(|| assert_eq!(get_required_stake_by_fraction::(5, 7), 0)); + } + + #[test] + fn calculate_stake_by_percentage_for_defined_issuance_succeeds() { + initial_test_ext().execute_with(|| { + increase_total_balance_issuance(50000); + assert_eq!(get_required_stake_by_fraction::(1, 1000), 50) + }); + } + + #[test] + fn calculate_stake_by_percentage_for_defined_issuance_with_fraction_loss() { + initial_test_ext().execute_with(|| { + increase_total_balance_issuance(1111); + assert_eq!(get_required_stake_by_fraction::(3, 1000), 3); + }); } } diff --git a/runtime-modules/proposals/codex/src/tests/mod.rs b/runtime-modules/proposals/codex/src/tests/mod.rs index f6e1381105..c6f868c9c5 100644 --- a/runtime-modules/proposals/codex/src/tests/mod.rs +++ b/runtime-modules/proposals/codex/src/tests/mod.rs @@ -6,12 +6,21 @@ use srml_support::StorageMap; use system::RawOrigin; use crate::{BalanceOf, Error, ProposalDetails}; -use mock::*; use proposal_engine::ProposalParameters; use roles::actors::RoleParameters; use runtime_io::blake2_256; use srml_support::dispatch::DispatchResult; +pub use mock::*; + +pub(crate) fn increase_total_balance_issuance(balance: u64) { + let initial_balance = Balances::total_issuance(); + { + let _ = ::Currency::deposit_creating(&999, balance); + } + assert_eq!(Balances::total_issuance(), initial_balance + balance); +} + struct ProposalTestFixture where InsufficientRightsCall: Fn() -> DispatchResult, @@ -81,6 +90,8 @@ where #[test] fn create_text_proposal_common_checks_succeed() { initial_test_ext().execute_with(|| { + increase_total_balance_issuance(500000); + let proposal_fixture = ProposalTestFixture { insufficient_rights_call: || { ProposalCodex::create_text_proposal( @@ -118,7 +129,7 @@ fn create_text_proposal_common_checks_succeed() { 1, b"title".to_vec(), b"body".to_vec(), - Some(>::from(500u32)), + Some(>::from(1250u32)), b"text".to_vec(), ) }, @@ -164,6 +175,8 @@ fn create_text_proposal_codex_call_fails_with_incorrect_text_size() { #[test] fn create_runtime_upgrade_common_checks_succeed() { initial_test_ext().execute_with(|| { + increase_total_balance_issuance(500000); + let proposal_fixture = ProposalTestFixture { insufficient_rights_call: || { ProposalCodex::create_runtime_upgrade_proposal( @@ -201,7 +214,7 @@ fn create_runtime_upgrade_common_checks_succeed() { 1, b"title".to_vec(), b"body".to_vec(), - Some(>::from(50000u32)), + Some(>::from(5000u32)), b"wasm".to_vec(), ) }, @@ -264,6 +277,8 @@ fn create_upgrade_runtime_proposal_codex_call_fails_with_not_allowed_member_id() #[test] fn create_set_election_parameters_proposal_common_checks_succeed() { initial_test_ext().execute_with(|| { + increase_total_balance_issuance(500000); + let proposal_fixture = ProposalTestFixture { insufficient_rights_call: || { ProposalCodex::create_set_election_parameters_proposal( @@ -301,7 +316,7 @@ fn create_set_election_parameters_proposal_common_checks_succeed() { 1, b"title".to_vec(), b"body".to_vec(), - Some(>::from(500u32)), + Some(>::from(3750u32)), get_valid_election_parameters(), ) }, @@ -411,6 +426,8 @@ fn create_set_election_parameters_call_fails_with_incorrect_parameters() { #[test] fn create_set_council_mint_capacity_proposal_common_checks_succeed() { initial_test_ext().execute_with(|| { + increase_total_balance_issuance(500000); + let proposal_fixture = ProposalTestFixture { insufficient_rights_call: || { ProposalCodex::create_set_council_mint_capacity_proposal( @@ -438,7 +455,7 @@ fn create_set_council_mint_capacity_proposal_common_checks_succeed() { 1, b"title".to_vec(), b"body".to_vec(), - Some(>::from(5000u32)), + Some(>::from(150u32)), 0, ) }, @@ -448,7 +465,7 @@ fn create_set_council_mint_capacity_proposal_common_checks_succeed() { 1, b"title".to_vec(), b"body".to_vec(), - Some(>::from(500u32)), + Some(>::from(1250u32)), 10, ) }, @@ -463,6 +480,8 @@ fn create_set_council_mint_capacity_proposal_common_checks_succeed() { #[test] fn create_set_content_working_group_mint_capacity_proposal_common_checks_succeed() { initial_test_ext().execute_with(|| { + increase_total_balance_issuance(500000); + let proposal_fixture = ProposalTestFixture { insufficient_rights_call: || { ProposalCodex::create_set_content_working_group_mint_capacity_proposal( @@ -500,7 +519,7 @@ fn create_set_content_working_group_mint_capacity_proposal_common_checks_succeed 1, b"title".to_vec(), b"body".to_vec(), - Some(>::from(500u32)), + Some(>::from(1250u32)), 10, ) }, @@ -514,6 +533,8 @@ fn create_set_content_working_group_mint_capacity_proposal_common_checks_succeed #[test] fn create_spending_proposal_common_checks_succeed() { initial_test_ext().execute_with(|| { + increase_total_balance_issuance(500000); + let proposal_fixture = ProposalTestFixture { insufficient_rights_call: || { ProposalCodex::create_spending_proposal( @@ -554,7 +575,7 @@ fn create_spending_proposal_common_checks_succeed() { 1, b"title".to_vec(), b"body".to_vec(), - Some(>::from(500u32)), + Some(>::from(1250u32)), 100, 2, ) @@ -587,6 +608,8 @@ fn create_spending_proposal_call_fails_with_incorrect_balance() { #[test] fn create_set_lead_proposal_common_checks_succeed() { initial_test_ext().execute_with(|| { + increase_total_balance_issuance(500000); + let proposal_fixture = ProposalTestFixture { insufficient_rights_call: || { ProposalCodex::create_set_lead_proposal( @@ -624,7 +647,7 @@ fn create_set_lead_proposal_common_checks_succeed() { 1, b"title".to_vec(), b"body".to_vec(), - Some(>::from(500u32)), + Some(>::from(1250u32)), Some((20, 10)), ) }, @@ -638,6 +661,8 @@ fn create_set_lead_proposal_common_checks_succeed() { #[test] fn create_evict_storage_provider_proposal_common_checks_succeed() { initial_test_ext().execute_with(|| { + increase_total_balance_issuance(500000); + let proposal_fixture = ProposalTestFixture { insufficient_rights_call: || { ProposalCodex::create_evict_storage_provider_proposal( @@ -689,6 +714,8 @@ fn create_evict_storage_provider_proposal_common_checks_succeed() { #[test] fn create_set_validator_count_proposal_common_checks_succeed() { initial_test_ext().execute_with(|| { + increase_total_balance_issuance(500000); + let proposal_fixture = ProposalTestFixture { insufficient_rights_call: || { ProposalCodex::create_set_validator_count_proposal( @@ -726,7 +753,7 @@ fn create_set_validator_count_proposal_common_checks_succeed() { 1, b"title".to_vec(), b"body".to_vec(), - Some(>::from(500u32)), + Some(>::from(1250u32)), 4, ) }, @@ -759,6 +786,8 @@ fn create_set_validator_count_proposal_failed_with_invalid_validator_count() { #[test] fn create_set_storage_role_parameters_proposal_common_checks_succeed() { initial_test_ext().execute_with(|| { + increase_total_balance_issuance(500000); + let proposal_fixture = ProposalTestFixture { insufficient_rights_call: || { ProposalCodex::create_set_storage_role_parameters_proposal( @@ -796,7 +825,7 @@ fn create_set_storage_role_parameters_proposal_common_checks_succeed() { 1, b"title".to_vec(), b"body".to_vec(), - Some(>::from(500u32)), + Some(>::from(1250u32)), RoleParameters::default(), ) }, @@ -828,11 +857,6 @@ fn assert_failed_set_storage_parameters_call( #[test] fn create_set_storage_role_parameters_proposal_fails_with_invalid_parameters() { initial_test_ext().execute_with(|| { - // { - // let _imbalance = ::Currency::deposit_creating(&44, 50000); - // } - // assert_eq!(Balances::total_issuance(), 0); - let mut role_parameters = RoleParameters::default(); role_parameters.min_actors = 0; assert_failed_set_storage_parameters_call( From 1884aa0beb73a12b57551b4e8a7d6ff8b403e3f4 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Thu, 9 Apr 2020 18:47:25 +0300 Subject: [PATCH 211/286] Update proposals runtime parameters --- runtime/src/lib.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 1d6af4371e..d9dd2957f6 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -814,9 +814,9 @@ impl discovery::Trait for Runtime { parameter_types! { pub const ProposalCancellationFee: u64 = 5; pub const ProposalRejectionFee: u64 = 3; - pub const ProposalTitleMaxLength: u32 = 100; - pub const ProposalDescriptionMaxLength: u32 = 10000; - pub const ProposalMaxActiveProposalLimit: u32 = 100; + pub const ProposalTitleMaxLength: u32 = 40; + pub const ProposalDescriptionMaxLength: u32 = 3000; + pub const ProposalMaxActiveProposalLimit: u32 = 5; } impl proposals_engine::Trait for Runtime { @@ -840,10 +840,10 @@ impl Default for Call { } parameter_types! { - pub const ProposalMaxPostEditionNumber: u32 = 5; - pub const ProposalMaxThreadInARowNumber: u32 = 3; - pub const ProposalThreadTitleLengthLimit: u32 = 200; - pub const ProposalPostLengthLimit: u32 = 2000; + pub const ProposalMaxPostEditionNumber: u32 = 0; // post update is disabled + pub const ProposalMaxThreadInARowNumber: u32 = 100000; // will not be used + pub const ProposalThreadTitleLengthLimit: u32 = 40; + pub const ProposalPostLengthLimit: u32 = 1000; } impl proposals_discussion::Trait for Runtime { @@ -858,7 +858,7 @@ impl proposals_discussion::Trait for Runtime { } parameter_types! { - pub const TextProposalMaxLength: u32 = 60_000; + pub const TextProposalMaxLength: u32 = 5_000; pub const RuntimeUpgradeWasmProposalMaxLength: u32 = 2_000_000; pub const RuntimeUpgradeProposalAllowedProposers: Vec = Vec::new(); //TODO set allowed members } From dda832e0c5d628d7e33a31d838ff033641fd69e3 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 10 Apr 2020 14:39:13 +0300 Subject: [PATCH 212/286] Set proposal parameters - set proposal limits and introduce errors - update spending proposal parameters - introduce total issuance token percentage --- runtime-modules/proposals/codex/src/lib.rs | 233 +++++++++++++++- .../codex/src/proposal_types/parameters.rs | 25 +- .../proposals/codex/src/tests/mod.rs | 263 +++++++++++++++++- 3 files changed, 473 insertions(+), 48 deletions(-) diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index 2f49464614..6ac6006916 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -52,11 +52,14 @@ use governance::election_params::ElectionParameters; use proposal_engine::ProposalParameters; use roles::actors::{Role, RoleParameters}; use rstd::clone::Clone; +use rstd::convert::TryInto; use rstd::prelude::*; use rstd::str::from_utf8; use rstd::vec::Vec; use runtime_io::blake2_256; +use sr_primitives::traits::SaturatedConversion; use sr_primitives::traits::{One, Zero}; +pub use sr_primitives::Perbill; use srml_support::dispatch::DispatchResult; use srml_support::traits::{Currency, Get}; use srml_support::{decl_error, decl_module, decl_storage, ensure, print}; @@ -64,6 +67,10 @@ use system::{ensure_root, RawOrigin}; pub use proposal_types::ProposalDetails; +// Percentage of the total token issue as max mint balance value. Shared with spending +// proposal max balance percentage. +const COUNCIL_MINT_MAX_BALANCE_PERCENT: u32 = 2; + /// 'Proposals codex' substrate module Trait pub trait Trait: system::Trait @@ -134,10 +141,10 @@ decl_error! { RuntimeProposalProposerNotInTheAllowedProposersList, /// Invalid balance value for the spending proposal - SpendingProposalZeroBalance, + InvalidSpendingProposalBalance, /// Invalid validator count for the 'set validator count' proposal - LessThanMinValidatorCount, + InvalidValidatorCount, /// Require root origin in extrinsics RequireRootOrigin, @@ -187,6 +194,23 @@ decl_error! { /// Invalid council election parameter - announcing_period InvalidCouncilElectionParameterAnnouncingPeriod, + /// Invalid council election parameter - min_stake + InvalidStorageRoleParameterMinStake, + + /// Invalid council election parameter - reward + InvalidStorageRoleParameterReward, + + /// Invalid council election parameter - entry_request_fee + InvalidStorageRoleParameterEntryRequestFee, + + /// Invalid working group mint capacity parameter + InvalidStorageWorkingGroupMintCapacity, + + /// Invalid council mint capacity parameter + InvalidStorageCouncilMintCapacity, + + /// Invalid 'set lead proposal' parameter - proposed lead cannot be a councilor + InvalidSetLeadParameterCannotBeCouncilor } } @@ -322,6 +346,8 @@ decl_module! { stake_balance: Option>, election_parameters: ElectionParameters, T::BlockNumber>, ) { + election_parameters.ensure_valid()?; + Self::ensure_council_election_parameters_valid(&election_parameters)?; let proposal_code = @@ -352,6 +378,19 @@ decl_module! { stake_balance: Option>, mint_balance: BalanceOfMint, ) { + + let max_mint_capacity: u32 = get_required_stake_by_fraction::( + COUNCIL_MINT_MAX_BALANCE_PERCENT, + 100 + ) + .try_into() + .unwrap_or_default() as u32; + + ensure!( + mint_balance < >::from(max_mint_capacity), + Error::InvalidStorageCouncilMintCapacity + ); + let proposal_code = >::set_council_mint_capacity(mint_balance.clone()); @@ -380,6 +419,15 @@ decl_module! { stake_balance: Option>, mint_balance: BalanceOfMint, ) { + + let max_mint_capacity: u32 = get_required_stake_by_fraction::(1, 100) + .try_into() + .unwrap_or_default() as u32; + ensure!( + mint_balance < >::from(max_mint_capacity), + Error::InvalidStorageWorkingGroupMintCapacity + ); + let proposal_code = >::set_mint_capacity(mint_balance.clone()); @@ -409,7 +457,19 @@ decl_module! { balance: BalanceOfMint, destination: T::AccountId, ) { - ensure!(balance != BalanceOfMint::::zero(), Error::SpendingProposalZeroBalance); + ensure!(balance != BalanceOfMint::::zero(), Error::InvalidSpendingProposalBalance); + + let max_balance: u32 = get_required_stake_by_fraction::( + COUNCIL_MINT_MAX_BALANCE_PERCENT, + 100 + ) + .try_into() + .unwrap_or_default() as u32; + + ensure!( + balance < >::from(max_balance), + Error::InvalidSpendingProposalBalance + ); let proposal_code = >::spend_from_council_mint( balance.clone(), @@ -442,6 +502,14 @@ decl_module! { stake_balance: Option>, new_lead: Option<(T::MemberId, T::AccountId)> ) { + if let Some(lead) = new_lead.clone() { + let account_id = lead.1; + ensure!( + !>::is_councilor(&account_id), + Error::InvalidSetLeadParameterCannotBeCouncilor + ); + } + let proposal_code = >::replace_lead(new_lead.clone()); @@ -500,7 +568,12 @@ decl_module! { ) { ensure!( new_validator_count >= >::minimum_validator_count(), - Error::LessThanMinValidatorCount + Error::InvalidValidatorCount + ); + + ensure!( + new_validator_count <= 1000, // max validator count + Error::InvalidValidatorCount ); let proposal_code = @@ -665,32 +738,57 @@ impl Module { role_parameters: &RoleParameters, T::BlockNumber>, ) -> Result<(), Error> { ensure!( - role_parameters.min_actors > 0, + role_parameters.min_actors <= 5, Error::InvalidStorageRoleParameterMinActors ); ensure!( - role_parameters.max_actors > 0, + role_parameters.max_actors >= 5, + Error::InvalidStorageRoleParameterMaxActors + ); + + ensure!( + role_parameters.max_actors < 100, Error::InvalidStorageRoleParameterMaxActors ); ensure!( - role_parameters.reward_period == T::BlockNumber::from(600), + role_parameters.reward_period >= T::BlockNumber::from(600), Error::InvalidStorageRoleParameterRewardPeriod ); ensure!( - role_parameters.bonding_period == T::BlockNumber::from(600), + role_parameters.reward_period <= T::BlockNumber::from(3600), + Error::InvalidStorageRoleParameterRewardPeriod + ); + + ensure!( + role_parameters.bonding_period >= T::BlockNumber::from(600), + Error::InvalidStorageRoleParameterBondingPeriod + ); + + ensure!( + role_parameters.bonding_period <= T::BlockNumber::from(28800), Error::InvalidStorageRoleParameterBondingPeriod ); ensure!( - role_parameters.unbonding_period == T::BlockNumber::from(600), + role_parameters.unbonding_period >= T::BlockNumber::from(600), + Error::InvalidStorageRoleParameterUnbondingPeriod + ); + + ensure!( + role_parameters.unbonding_period <= T::BlockNumber::from(28800), Error::InvalidStorageRoleParameterUnbondingPeriod ); ensure!( - role_parameters.min_service_period == T::BlockNumber::from(600), + role_parameters.min_service_period >= T::BlockNumber::from(600), + Error::InvalidStorageRoleParameterMinServicePeriod + ); + + ensure!( + role_parameters.min_service_period <= T::BlockNumber::from(28800), Error::InvalidStorageRoleParameterMinServicePeriod ); @@ -699,15 +797,74 @@ impl Module { Error::InvalidStorageRoleParameterStartupGracePeriod ); + ensure!( + role_parameters.startup_grace_period <= T::BlockNumber::from(28800), + Error::InvalidStorageRoleParameterStartupGracePeriod + ); + + ensure!( + role_parameters.min_stake > >::from(0u32), + Error::InvalidStorageRoleParameterMinStake + ); + + let max_min_stake: u32 = get_required_stake_by_fraction::(1, 100) + .try_into() + .unwrap_or_default() as u32; + + ensure!( + role_parameters.min_stake < >::from(max_min_stake), + Error::InvalidStorageRoleParameterMinStake + ); + + ensure!( + role_parameters.entry_request_fee > >::from(0u32), + Error::InvalidStorageRoleParameterEntryRequestFee + ); + + let max_entry_request_fee: u32 = get_required_stake_by_fraction::(1, 100) + .try_into() + .unwrap_or_default() as u32; + + ensure!( + role_parameters.entry_request_fee + < >::from(max_entry_request_fee), + Error::InvalidStorageRoleParameterEntryRequestFee + ); + + ensure!( + role_parameters.reward > >::from(0u32), + Error::InvalidStorageRoleParameterReward + ); + + let max_reward: u32 = get_required_stake_by_fraction::(1, 1000) + .try_into() + .unwrap_or_default() as u32; + + ensure!( + role_parameters.reward < >::from(max_reward), + Error::InvalidStorageRoleParameterReward + ); + Ok(()) } + /* + entry_request_fee [tJOY] >0 <1% NA + * Not enforced by runtime. Should not be displayed in the UI, or at least grayed out. + ** Should not be displayed in the UI, or at least grayed out. + */ + // validates council election parameters for the 'Set election parameters' proposal - fn ensure_council_election_parameters_valid( + pub(crate) fn ensure_council_election_parameters_valid( election_parameters: &ElectionParameters, T::BlockNumber>, ) -> Result<(), Error> { ensure!( - election_parameters.council_size >= 3, + election_parameters.council_size >= 4, + Error::InvalidCouncilElectionParameterCouncilSize + ); + + ensure!( + election_parameters.council_size <= 20, Error::InvalidCouncilElectionParameterCouncilSize ); @@ -716,36 +873,88 @@ impl Module { Error::InvalidCouncilElectionParameterCandidacyLimit ); + ensure!( + election_parameters.candidacy_limit <= 100, + Error::InvalidCouncilElectionParameterCandidacyLimit + ); + ensure!( election_parameters.min_voting_stake >= >::one(), Error::InvalidCouncilElectionParameterMinVotingStake ); + ensure!( + election_parameters.min_voting_stake + <= >::from(100000u32), + Error::InvalidCouncilElectionParameterMinVotingStake + ); + ensure!( election_parameters.new_term_duration >= T::BlockNumber::from(14400), Error::InvalidCouncilElectionParameterNewTermDuration ); + ensure!( + election_parameters.new_term_duration <= T::BlockNumber::from(432000), + Error::InvalidCouncilElectionParameterNewTermDuration + ); + ensure!( election_parameters.revealing_period >= T::BlockNumber::from(14400), Error::InvalidCouncilElectionParameterRevealingPeriod ); + ensure!( + election_parameters.revealing_period <= T::BlockNumber::from(43200), + Error::InvalidCouncilElectionParameterRevealingPeriod + ); + ensure!( election_parameters.voting_period >= T::BlockNumber::from(14400), Error::InvalidCouncilElectionParameterVotingPeriod ); + ensure!( + election_parameters.voting_period <= T::BlockNumber::from(43200), + Error::InvalidCouncilElectionParameterVotingPeriod + ); + ensure!( election_parameters.announcing_period >= T::BlockNumber::from(14400), Error::InvalidCouncilElectionParameterAnnouncingPeriod ); + ensure!( + election_parameters.announcing_period <= T::BlockNumber::from(43200), + Error::InvalidCouncilElectionParameterAnnouncingPeriod + ); + ensure!( election_parameters.min_council_stake >= >::one(), Error::InvalidCouncilElectionParameterMinCouncilStake ); + ensure!( + election_parameters.min_council_stake + <= >::from(100000u32), + Error::InvalidCouncilElectionParameterMinCouncilStake + ); + Ok(()) } } + +// calculates required stake value using total issuance value and stake percentage. Truncates to +// lowest integer value. Value fraction is defined by numerator and denominator. +pub(crate) fn get_required_stake_by_fraction( + numerator: u32, + denominator: u32, +) -> BalanceOf { + let total_issuance: u128 = >::total_issuance().try_into().unwrap_or(0) as u128; + let required_stake = + Perbill::from_rational_approximation(numerator, denominator) * total_issuance; + + let balance: BalanceOf = required_stake.saturated_into(); + + balance +} diff --git a/runtime-modules/proposals/codex/src/proposal_types/parameters.rs b/runtime-modules/proposals/codex/src/proposal_types/parameters.rs index e72f956fd3..28dcb35c9c 100644 --- a/runtime-modules/proposals/codex/src/proposal_types/parameters.rs +++ b/runtime-modules/proposals/codex/src/proposal_types/parameters.rs @@ -1,23 +1,4 @@ -use crate::{BalanceOf, CurrencyOf, ProposalParameters}; -use rstd::convert::TryInto; -use sr_primitives::traits::SaturatedConversion; -pub use sr_primitives::Perbill; -use srml_support::traits::Currency; - -// calculates required stake value using total issuance value and stake percentage. Truncates to -// lowest integer value. -fn get_required_stake_by_fraction( - numerator: u32, - denominator: u32, -) -> BalanceOf { - let total_issuance: u128 = >::total_issuance().try_into().unwrap_or(0) as u128; - let required_stake = - Perbill::from_rational_approximation(numerator, denominator) * total_issuance; - - let balance: BalanceOf = required_stake.saturated_into(); - - balance -} +use crate::{get_required_stake_by_fraction, BalanceOf, ProposalParameters}; // Proposal parameters for the 'Set validator count' proposal pub(crate) fn set_validator_count_proposal( @@ -106,8 +87,8 @@ pub(crate) fn set_content_working_group_mint_capacity_proposal( pub(crate) fn spending_proposal( ) -> ProposalParameters> { ProposalParameters { - voting_period: T::BlockNumber::from(43200u32), - grace_period: T::BlockNumber::from(0u32), + voting_period: T::BlockNumber::from(72000u32), + grace_period: T::BlockNumber::from(14400u32), approval_quorum_percentage: 66, approval_threshold_percentage: 80, slashing_quorum_percentage: 60, diff --git a/runtime-modules/proposals/codex/src/tests/mod.rs b/runtime-modules/proposals/codex/src/tests/mod.rs index c6f868c9c5..61ef9ce629 100644 --- a/runtime-modules/proposals/codex/src/tests/mod.rs +++ b/runtime-modules/proposals/codex/src/tests/mod.rs @@ -14,9 +14,13 @@ use srml_support::dispatch::DispatchResult; pub use mock::*; pub(crate) fn increase_total_balance_issuance(balance: u64) { + increase_total_balance_issuance_using_account_id(balance, 999); +} + +pub(crate) fn increase_total_balance_issuance_using_account_id(balance: u64, account_id: u64) { let initial_balance = Balances::total_issuance(); { - let _ = ::Currency::deposit_creating(&999, balance); + let _ = ::Currency::deposit_creating(&account_id, balance); } assert_eq!(Balances::total_issuance(), initial_balance + balance); } @@ -340,7 +344,7 @@ fn assert_failed_election_parameters_call( 1, b"title".to_vec(), b"body".to_vec(), - Some(>::from(500u32)), + Some(>::from(3750u32)), election_parameters, ), Err(error) @@ -352,7 +356,7 @@ fn get_valid_election_parameters() -> ElectionParameters { announcing_period: 14400, voting_period: 14400, revealing_period: 14400, - council_size: 3, + council_size: 4, candidacy_limit: 25, new_term_duration: 14400, min_council_stake: 1, @@ -363,7 +367,7 @@ fn get_valid_election_parameters() -> ElectionParameters { #[test] fn create_set_election_parameters_call_fails_with_incorrect_parameters() { initial_test_ext().execute_with(|| { - let _imbalance = ::Currency::deposit_creating(&1, 50000); + increase_total_balance_issuance_using_account_id(500000, 1); let mut election_parameters = get_valid_election_parameters(); election_parameters.council_size = 2; @@ -372,6 +376,12 @@ fn create_set_election_parameters_call_fails_with_incorrect_parameters() { Error::InvalidCouncilElectionParameterCouncilSize, ); + election_parameters.council_size = 21; + assert_failed_election_parameters_call( + election_parameters, + Error::InvalidCouncilElectionParameterCouncilSize, + ); + election_parameters = get_valid_election_parameters(); election_parameters.candidacy_limit = 22; assert_failed_election_parameters_call( @@ -379,6 +389,13 @@ fn create_set_election_parameters_call_fails_with_incorrect_parameters() { Error::InvalidCouncilElectionParameterCandidacyLimit, ); + election_parameters = get_valid_election_parameters(); + election_parameters.candidacy_limit = 122; + assert_failed_election_parameters_call( + election_parameters, + Error::InvalidCouncilElectionParameterCandidacyLimit, + ); + election_parameters = get_valid_election_parameters(); election_parameters.min_voting_stake = 0; assert_failed_election_parameters_call( @@ -386,6 +403,13 @@ fn create_set_election_parameters_call_fails_with_incorrect_parameters() { Error::InvalidCouncilElectionParameterMinVotingStake, ); + election_parameters = get_valid_election_parameters(); + election_parameters.min_voting_stake = 200000; + assert_failed_election_parameters_call( + election_parameters, + Error::InvalidCouncilElectionParameterMinVotingStake, + ); + election_parameters = get_valid_election_parameters(); election_parameters.new_term_duration = 10000; assert_failed_election_parameters_call( @@ -393,6 +417,13 @@ fn create_set_election_parameters_call_fails_with_incorrect_parameters() { Error::InvalidCouncilElectionParameterNewTermDuration, ); + election_parameters = get_valid_election_parameters(); + election_parameters.new_term_duration = 500000; + assert_failed_election_parameters_call( + election_parameters, + Error::InvalidCouncilElectionParameterNewTermDuration, + ); + election_parameters = get_valid_election_parameters(); election_parameters.min_council_stake = 0; assert_failed_election_parameters_call( @@ -400,6 +431,13 @@ fn create_set_election_parameters_call_fails_with_incorrect_parameters() { Error::InvalidCouncilElectionParameterMinCouncilStake, ); + election_parameters = get_valid_election_parameters(); + election_parameters.min_council_stake = 200000; + assert_failed_election_parameters_call( + election_parameters, + Error::InvalidCouncilElectionParameterMinCouncilStake, + ); + election_parameters = get_valid_election_parameters(); election_parameters.voting_period = 10000; assert_failed_election_parameters_call( @@ -407,6 +445,13 @@ fn create_set_election_parameters_call_fails_with_incorrect_parameters() { Error::InvalidCouncilElectionParameterVotingPeriod, ); + election_parameters = get_valid_election_parameters(); + election_parameters.voting_period = 50000; + assert_failed_election_parameters_call( + election_parameters, + Error::InvalidCouncilElectionParameterVotingPeriod, + ); + election_parameters = get_valid_election_parameters(); election_parameters.revealing_period = 10000; assert_failed_election_parameters_call( @@ -414,12 +459,45 @@ fn create_set_election_parameters_call_fails_with_incorrect_parameters() { Error::InvalidCouncilElectionParameterRevealingPeriod, ); + election_parameters = get_valid_election_parameters(); + election_parameters.revealing_period = 50000; + assert_failed_election_parameters_call( + election_parameters, + Error::InvalidCouncilElectionParameterRevealingPeriod, + ); + election_parameters = get_valid_election_parameters(); election_parameters.announcing_period = 10000; assert_failed_election_parameters_call( election_parameters, Error::InvalidCouncilElectionParameterAnnouncingPeriod, ); + + election_parameters = get_valid_election_parameters(); + election_parameters.announcing_period = 50000; + assert_failed_election_parameters_call( + election_parameters, + Error::InvalidCouncilElectionParameterAnnouncingPeriod, + ); + }); +} + +#[test] +fn create_set_council_mint_capacity_proposal_fails_with_invalid_parameters() { + initial_test_ext().execute_with(|| { + increase_total_balance_issuance(500000); + + assert_eq!( + ProposalCodex::create_set_council_mint_capacity_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + Some(>::from(1250u32)), + 10001, + ), + Err(Error::InvalidStorageCouncilMintCapacity) + ); }); } @@ -477,6 +555,25 @@ fn create_set_council_mint_capacity_proposal_common_checks_succeed() { }); } +#[test] +fn create_working_groupd_mint_capacity_proposal_fails_with_invalid_parameters() { + initial_test_ext().execute_with(|| { + increase_total_balance_issuance(500000); + + assert_eq!( + ProposalCodex::create_set_content_working_group_mint_capacity_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + Some(>::from(1250u32)), + 5001, + ), + Err(Error::InvalidStorageWorkingGroupMintCapacity) + ); + }); +} + #[test] fn create_set_content_working_group_mint_capacity_proposal_common_checks_succeed() { initial_test_ext().execute_with(|| { @@ -590,17 +687,58 @@ fn create_spending_proposal_common_checks_succeed() { #[test] fn create_spending_proposal_call_fails_with_incorrect_balance() { initial_test_ext().execute_with(|| { + increase_total_balance_issuance_using_account_id(1, 500000); + assert_eq!( ProposalCodex::create_spending_proposal( RawOrigin::Signed(1).into(), 1, b"title".to_vec(), b"body".to_vec(), - Some(>::from(500u32)), + Some(>::from(1250u32)), 0, 2, ), - Err(Error::SpendingProposalZeroBalance) + Err(Error::InvalidSpendingProposalBalance) + ); + + assert_eq!( + ProposalCodex::create_spending_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + Some(>::from(1250u32)), + 1001, + 2, + ), + Err(Error::InvalidSpendingProposalBalance) + ); + }); +} + +#[test] +fn create_set_lead_proposal_fails_with_proposed_councilor() { + initial_test_ext().execute_with(|| { + increase_total_balance_issuance_using_account_id(500000, 1); + + let lead_account_id = 20; + >::set_council( + RawOrigin::Root.into(), + vec![lead_account_id], + ) + .unwrap(); + + assert_eq!( + ProposalCodex::create_set_lead_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + Some(>::from(1250u32)), + Some((20, lead_account_id)), + ), + Err(Error::InvalidSetLeadParameterCannotBeCouncilor) ); }); } @@ -778,7 +916,19 @@ fn create_set_validator_count_proposal_failed_with_invalid_validator_count() { Some(>::from(500u32)), 3, ), - Err(Error::LessThanMinValidatorCount) + Err(Error::InvalidValidatorCount) + ); + + assert_eq!( + ProposalCodex::create_set_validator_count_proposal( + RawOrigin::Signed(1).into(), + 1, + b"title".to_vec(), + b"body".to_vec(), + Some(>::from(1001u32)), + 3, + ), + Err(Error::InvalidValidatorCount) ); }); } @@ -857,53 +1007,138 @@ fn assert_failed_set_storage_parameters_call( #[test] fn create_set_storage_role_parameters_proposal_fails_with_invalid_parameters() { initial_test_ext().execute_with(|| { + increase_total_balance_issuance(500000); + let mut role_parameters = RoleParameters::default(); - role_parameters.min_actors = 0; + role_parameters.min_actors = 6; assert_failed_set_storage_parameters_call( role_parameters, Error::InvalidStorageRoleParameterMinActors, ); role_parameters = RoleParameters::default(); - role_parameters.max_actors = 0; + role_parameters.max_actors = 4; assert_failed_set_storage_parameters_call( role_parameters, Error::InvalidStorageRoleParameterMaxActors, ); role_parameters = RoleParameters::default(); - role_parameters.reward_period = 700; + role_parameters.max_actors = 100; + assert_failed_set_storage_parameters_call( + role_parameters, + Error::InvalidStorageRoleParameterMaxActors, + ); + + role_parameters = RoleParameters::default(); + role_parameters.reward_period = 599; + assert_failed_set_storage_parameters_call( + role_parameters, + Error::InvalidStorageRoleParameterRewardPeriod, + ); + + role_parameters.reward_period = 28801; assert_failed_set_storage_parameters_call( role_parameters, Error::InvalidStorageRoleParameterRewardPeriod, ); role_parameters = RoleParameters::default(); - role_parameters.bonding_period = 700; + role_parameters.bonding_period = 599; assert_failed_set_storage_parameters_call( role_parameters, Error::InvalidStorageRoleParameterBondingPeriod, ); role_parameters = RoleParameters::default(); - role_parameters.unbonding_period = 700; + role_parameters.bonding_period = 28801; + assert_failed_set_storage_parameters_call( + role_parameters, + Error::InvalidStorageRoleParameterBondingPeriod, + ); + + role_parameters = RoleParameters::default(); + role_parameters.unbonding_period = 599; + assert_failed_set_storage_parameters_call( + role_parameters, + Error::InvalidStorageRoleParameterUnbondingPeriod, + ); + + role_parameters = RoleParameters::default(); + role_parameters.unbonding_period = 28801; assert_failed_set_storage_parameters_call( role_parameters, Error::InvalidStorageRoleParameterUnbondingPeriod, ); role_parameters = RoleParameters::default(); - role_parameters.min_service_period = 700; + role_parameters.min_service_period = 599; + assert_failed_set_storage_parameters_call( + role_parameters, + Error::InvalidStorageRoleParameterMinServicePeriod, + ); + + role_parameters = RoleParameters::default(); + role_parameters.min_service_period = 28801; assert_failed_set_storage_parameters_call( role_parameters, Error::InvalidStorageRoleParameterMinServicePeriod, ); role_parameters = RoleParameters::default(); - role_parameters.startup_grace_period = 500; + role_parameters.startup_grace_period = 599; assert_failed_set_storage_parameters_call( role_parameters, Error::InvalidStorageRoleParameterStartupGracePeriod, ); + + role_parameters = RoleParameters::default(); + role_parameters.startup_grace_period = 28801; + assert_failed_set_storage_parameters_call( + role_parameters, + Error::InvalidStorageRoleParameterStartupGracePeriod, + ); + + role_parameters = RoleParameters::default(); + role_parameters.min_stake = 0; + assert_failed_set_storage_parameters_call( + role_parameters, + Error::InvalidStorageRoleParameterMinStake, + ); + + role_parameters = RoleParameters::default(); + role_parameters.min_stake = 5001; + assert_failed_set_storage_parameters_call( + role_parameters, + Error::InvalidStorageRoleParameterMinStake, + ); + + role_parameters = RoleParameters::default(); + role_parameters.entry_request_fee = 0; + assert_failed_set_storage_parameters_call( + role_parameters, + Error::InvalidStorageRoleParameterEntryRequestFee, + ); + + role_parameters = RoleParameters::default(); + role_parameters.entry_request_fee = 5001; + assert_failed_set_storage_parameters_call( + role_parameters, + Error::InvalidStorageRoleParameterEntryRequestFee, + ); + + role_parameters = RoleParameters::default(); + role_parameters.reward = 0; + assert_failed_set_storage_parameters_call( + role_parameters, + Error::InvalidStorageRoleParameterReward, + ); + + role_parameters = RoleParameters::default(); + role_parameters.reward = 501; + assert_failed_set_storage_parameters_call( + role_parameters, + Error::InvalidStorageRoleParameterReward, + ); }); } From 61a8127f9c51e66ea21086aba6546a8dadec48fa Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Mon, 13 Apr 2020 10:56:05 +0300 Subject: [PATCH 213/286] Fix clippy comments --- .../proposals/discussion/src/lib.rs | 31 +++++++++---------- runtime-modules/proposals/engine/src/lib.rs | 10 +++--- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/runtime-modules/proposals/discussion/src/lib.rs b/runtime-modules/proposals/discussion/src/lib.rs index 904552e70a..c1ed9a5baf 100644 --- a/runtime-modules/proposals/discussion/src/lib.rs +++ b/runtime-modules/proposals/discussion/src/lib.rs @@ -26,16 +26,15 @@ //! pub trait Trait: discussions::Trait + membership::members::Trait {} //! //! decl_module! { -//! pub struct Module for enum Call where origin: T::Origin { -//! pub fn create_discussion(origin, title: Vec, author_id : T::MemberId) -> Result { -//! ensure_root(origin)?; -//! >::ensure_can_create_thread(author_id, &title)?; -//! >::create_thread(author_id, title)?; -//! Ok(()) -//! } -//! } +//! pub struct Module for enum Call where origin: T::Origin { +//! pub fn create_discussion(origin, title: Vec, author_id : T::MemberId) -> Result { +//! ensure_root(origin)?; +//! >::ensure_can_create_thread(author_id, &title)?; +//! >::create_thread(author_id, title)?; +//! Ok(()) +//! } +//! } //! } -//! # fn main() { } //! ``` //! @@ -199,7 +198,7 @@ decl_module! { ) { T::PostAuthorOriginValidator::ensure_actor_origin( origin, - post_author_id.clone(), + post_author_id, )?; ensure!(>::exists(thread_id), Error::ThreadDoesntExist); @@ -218,7 +217,7 @@ decl_module! { text, created_at: Self::current_block(), updated_at: Self::current_block(), - author_id: post_author_id.clone(), + author_id: post_author_id, edition_number : 0, thread_id, }; @@ -239,7 +238,7 @@ decl_module! { ){ T::PostAuthorOriginValidator::ensure_actor_origin( origin, - post_author_id.clone(), + post_author_id, )?; ensure!(>::exists(thread_id), Error::ThreadDoesntExist); @@ -279,7 +278,7 @@ impl Module { thread_author_id: MemberId, title: Vec, ) -> Result { - Self::ensure_can_create_thread(thread_author_id.clone(), &title)?; + Self::ensure_can_create_thread(thread_author_id, &title)?; let next_thread_count_value = Self::thread_count() + 1; let new_thread_id = next_thread_count_value; @@ -287,11 +286,11 @@ impl Module { let new_thread = Thread { title, created_at: Self::current_block(), - author_id: thread_author_id.clone(), + author_id: thread_author_id, }; // get new 'threads in a row' counter for the author - let current_thread_counter = Self::get_updated_thread_counter(thread_author_id.clone()); + let current_thread_counter = Self::get_updated_thread_counter(thread_author_id); // mutation @@ -319,7 +318,7 @@ impl Module { ); // get new 'threads in a row' counter for the author - let current_thread_counter = Self::get_updated_thread_counter(thread_author_id.clone()); + let current_thread_counter = Self::get_updated_thread_counter(thread_author_id); ensure!( current_thread_counter.counter as u32 <= T::MaxThreadInARowNumber::get(), diff --git a/runtime-modules/proposals/engine/src/lib.rs b/runtime-modules/proposals/engine/src/lib.rs index 66cb908866..25aa18ee7d 100644 --- a/runtime-modules/proposals/engine/src/lib.rs +++ b/runtime-modules/proposals/engine/src/lib.rs @@ -230,7 +230,7 @@ decl_module! { pub fn vote(origin, voter_id: MemberId, proposal_id: T::ProposalId, vote: VoteKind) { T::VoterOriginValidator::ensure_actor_origin( origin, - voter_id.clone(), + voter_id, )?; ensure!(>::exists(proposal_id), Error::ProposalNotFound); @@ -240,7 +240,7 @@ decl_module! { let did_not_vote_before = !>::exists( proposal_id, - voter_id.clone(), + voter_id, ); ensure!(did_not_vote_before, Error::AlreadyVoted); @@ -250,7 +250,7 @@ decl_module! { // mutation >::insert(proposal_id, proposal); - >::insert( proposal_id, voter_id.clone(), vote.clone()); + >::insert( proposal_id, voter_id, vote.clone()); Self::deposit_event(RawEvent::Voted(voter_id, proposal_id, vote)); } @@ -258,7 +258,7 @@ decl_module! { pub fn cancel_proposal(origin, proposer_id: MemberId, proposal_id: T::ProposalId) { T::ProposerOriginValidator::ensure_actor_origin( origin, - proposer_id.clone(), + proposer_id, )?; ensure!(>::exists(proposal_id), Error::ProposalNotFound); @@ -362,7 +362,7 @@ impl Module { parameters, title, description, - proposer_id: proposer_id.clone(), + proposer_id, status: ProposalStatus::Active(stake_data), voting_results: VotingResults::default(), }; From a9bbf47b9f34236e4372af6a9b5174cb9a70670d Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Mon, 13 Apr 2020 14:57:41 +0300 Subject: [PATCH 214/286] Add comments --- .../proposals/discussion/src/lib.rs | 1 + runtime-modules/proposals/engine/src/lib.rs | 98 ++++++++++++++++--- .../proposals/engine/src/types/mod.rs | 2 +- 3 files changed, 87 insertions(+), 14 deletions(-) diff --git a/runtime-modules/proposals/discussion/src/lib.rs b/runtime-modules/proposals/discussion/src/lib.rs index c1ed9a5baf..1726de8c22 100644 --- a/runtime-modules/proposals/discussion/src/lib.rs +++ b/runtime-modules/proposals/discussion/src/lib.rs @@ -35,6 +35,7 @@ //! } //! } //! } +//! # fn main() {} //! ``` //! diff --git a/runtime-modules/proposals/engine/src/lib.rs b/runtime-modules/proposals/engine/src/lib.rs index 25aa18ee7d..77b148837e 100644 --- a/runtime-modules/proposals/engine/src/lib.rs +++ b/runtime-modules/proposals/engine/src/lib.rs @@ -1,18 +1,90 @@ -//! Proposals engine module for the Joystream platform. Version 2. -//! Provides methods and extrinsics to create and vote for proposals, -//! inspired by Parity **Democracy module**. +//! # Proposals engine module +//! Proposals `engine` module for the Joystream platform. Version 2. +//! Main component of the proposals system. Provides methods and extrinsics to create and +//! vote for proposals, inspired by Parity **Democracy module**. //! -//! Supported extrinsics: -//! - vote - registers a vote for the proposal -//! - cancel_proposal - cancels the proposal (can be canceled only by owner) -//! - veto_proposal - vetoes the proposal +//! ## Overview +//! Proposals `engine` module provides abstract mechanism to work with proposals: creation, voting, +//! execution, canceling, etc. Proposal execution demands serialized _Dispatchable_ proposal code. +//! It could be any _Dispatchable_ + _Parameter_ type, but most likely it would be serialized (via +//! Parity _codec_ crate) extrisic call. Proposal stage can be described by its [status](./enum.ProposalStatus.html). //! -//! Public API: -//! - create_proposal - creates proposal using provided parameters -//! - ensure_create_proposal_parameters_are_valid - ensures that we can create the proposal -//! - refund_proposal_stake - a callback for StakingHandlerEvents -//! - reset_active_proposals - resets voting results for active proposals +//! ## Proposal lifecycle +//! When a proposal passes [checks](./struct.Module.html#method.ensure_create_proposal_parameters_are_valid) +//! for its [parameters](./struct.ProposalParameters.html) - it can be [created](./struct.Module.html#method.create_proposal). +//! Newly created proposal has _Active_ status. The proposal can be voted on or canceled during its +//! _voting period_. Votes can be [different](./enum.VoteKind.html). When proposal gets enough votes +//! to be slashed or approved or _voting period_ ends - the proposal becomes _Finalized_. If the proposal +//! got approved and _grace period_ passed - the `engine` module tries to execute the proposal. +//! The final [approved status](./enum.ApprovedProposalStatus.html) of the proposal defines +//! an overall proposal outcome. The proposal can also be [vetoed](./struct.Module.html#method.veto_proposal) +//! anytime before the proposal execution by the _sudo_. //! +//! ### Important abstract types to be implemented +//! Proposals `engine` module has several abstractions to be implemented in order to work correctly. +//! - _VoterOriginValidator_ - ensure valid voter identity. Voters should have permissions to vote: +//! they should be council members. +//! - [VotersParameters](./trait.VotersParameters.html) - defines total voter number, which is +//! the council size +//! - _ProposerOriginValidator_ - ensure valid proposer identity. Proposers should have permissions +//! to create a proposal: they should be members of the Joystream. +//! - [StakeHandlerProvider](./trait.StakeHandlerProvider.html) - defines interface for the staking. +//! +//! Full list of the abstractions can be found [here](./trait.Trait.html). +//! +//! ### Supported extrinsics +//! - [vote](./struct.Module.html#method.vote) - registers a vote for the proposal +//! - [cancel_proposal](./struct.Module.html#method.cancel_proposal) - cancels the proposal (can be canceled only by owner) +//! - [veto_proposal](./struct.Module.html#method.veto_proposal) - vetoes the proposal +//! +//! ### Public API +//! - [create_proposal](./struct.Module.html#method.create_proposal) - creates proposal using provided parameters +//! - [ensure_create_proposal_parameters_are_valid](./struct.Module.html#method.ensure_create_proposal_parameters_are_valid) - ensures that we can create the proposal +//! - [refund_proposal_stake](./struct.Module.html#method.refund_proposal_stake) - a callback for _StakingHandlerEvents_ +//! - [reset_active_proposals](./trait.Module.html#method.reset_active_proposals) - resets voting results for active proposals +//! +//! ## Usage +//! +//! ``` +//! use srml_support::{decl_module, dispatch::Result}; +//! use system::ensure_signed; +//! use substrate_proposals_engine_module::{self as engine, ProposalParameters}; +//! +//! pub trait Trait: engine::Trait + membership::members::Trait {} +//! +//! decl_module! { +//! pub struct Module for enum Call where origin: T::Origin { +//! pub fn create_spending_proposal( +//! origin, +//! proposer_id: T::MemberId, +//! ) -> Result { +//! let account_id = ensure_signed(origin)?; +//! let parameters = ProposalParameters::default(); +//! let title = b"Spending proposal".to_vec(); +//! let description = b"We need to spend some tokens to support the working group lead.".to_vec(); +//! let encoded_proposal_code = Vec::new(); +//! +//! >::ensure_create_proposal_parameters_are_valid( +//! ¶meters, +//! &title, +//! &description, +//! None +//! )?; +//! >::create_proposal( +//! account_id, +//! proposer_id, +//! parameters, +//! title, +//! description, +//! None, +//! encoded_proposal_code +//! )?; +//! Ok(()) +//! } +//! } +//! } +//! # fn main() {} +//! ``` // Ensure we're `no_std` when compiling for Wasm. #![cfg_attr(not(feature = "std"), no_std)] @@ -468,7 +540,7 @@ impl Module { } /// Resets voting results for active proposals. - /// Possible application - after the new council elections. + /// Possible application includes new council elections. pub fn reset_active_proposals() { >::enumerate().for_each(|(proposal_id, _)| { >::mutate(proposal_id, |proposal| { diff --git a/runtime-modules/proposals/engine/src/types/mod.rs b/runtime-modules/proposals/engine/src/types/mod.rs index 4ced301e21..a496fec53e 100644 --- a/runtime-modules/proposals/engine/src/types/mod.rs +++ b/runtime-modules/proposals/engine/src/types/mod.rs @@ -222,7 +222,7 @@ where } } -/// Provides data for voting. +/// Provides data for the voting. pub trait VotersParameters { /// Defines maximum voters count for the proposal fn total_voters_count() -> u32; From 74e1fe2edb84c26087239ce89439c1e53d5d8e30 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Mon, 13 Apr 2020 18:00:22 +0300 Subject: [PATCH 215/286] Update comments --- runtime-modules/proposals/codex/src/lib.rs | 6 +-- .../proposals/discussion/src/lib.rs | 4 +- runtime-modules/proposals/engine/src/lib.rs | 41 +++++++++++++------ 3 files changed, 34 insertions(+), 17 deletions(-) diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index 6ac6006916..de61e5ce59 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -1,12 +1,12 @@ //! # Proposals codex module //! Proposals `codex` module for the Joystream platform. Version 2. -//! Component of the proposals system. Contains preset proposal types. +//! Component of the proposals system. It contains preset proposal types. //! //! ## Overview //! -//! The proposals codex module serves as facade and entry point of the proposals system. It uses +//! The proposals codex module serves as a facade and entry point of the proposals system. It uses //! proposals `engine` module to maintain a lifecycle of the proposal and to execute proposals. -//! During the proposal creation `codex` also create a discussion thread using the `discussion` +//! During the proposal creation, `codex` also create a discussion thread using the `discussion` //! proposals module. `Codex` uses predefined parameters (eg.:`voting_period`) for each proposal and //! encodes extrinsic calls from dependency modules in order to create proposals inside the `engine` //! module. For each proposal, [its crucial details](./enum.ProposalDetails.html) are saved to the diff --git a/runtime-modules/proposals/discussion/src/lib.rs b/runtime-modules/proposals/discussion/src/lib.rs index 1726de8c22..19ff49ba0d 100644 --- a/runtime-modules/proposals/discussion/src/lib.rs +++ b/runtime-modules/proposals/discussion/src/lib.rs @@ -1,6 +1,6 @@ //! # Proposals discussion module //! Proposals `discussion` module for the Joystream platform. Version 2. -//! Contains discussion subsystem of the proposals. +//! It contains discussion subsystem of the proposals. //! //! ## Overview //! @@ -9,7 +9,7 @@ //! posts. //! //! ## Supported extrinsics -//! - [add_post](./struct.Module.html#method.add_post) - adds a post to existing discussion thread +//! - [add_post](./struct.Module.html#method.add_post) - adds a post to an existing discussion thread //! - [update_post](./struct.Module.html#method.update_post) - updates existing post //! //! ## Public API methods diff --git a/runtime-modules/proposals/engine/src/lib.rs b/runtime-modules/proposals/engine/src/lib.rs index 77b148837e..28e4badd53 100644 --- a/runtime-modules/proposals/engine/src/lib.rs +++ b/runtime-modules/proposals/engine/src/lib.rs @@ -1,24 +1,35 @@ //! # Proposals engine module //! Proposals `engine` module for the Joystream platform. Version 2. -//! Main component of the proposals system. Provides methods and extrinsics to create and +//! The main component of the proposals system. Provides methods and extrinsics to create and //! vote for proposals, inspired by Parity **Democracy module**. //! //! ## Overview -//! Proposals `engine` module provides abstract mechanism to work with proposals: creation, voting, +//! Proposals `engine` module provides an abstract mechanism to work with proposals: creation, voting, //! execution, canceling, etc. Proposal execution demands serialized _Dispatchable_ proposal code. -//! It could be any _Dispatchable_ + _Parameter_ type, but most likely it would be serialized (via -//! Parity _codec_ crate) extrisic call. Proposal stage can be described by its [status](./enum.ProposalStatus.html). +//! It could be any _Dispatchable_ + _Parameter_ type, but most likely, it would be serialized (via +//! Parity _codec_ crate) extrisic call. A proposal stage can be described by its [status](./enum.ProposalStatus.html). //! //! ## Proposal lifecycle //! When a proposal passes [checks](./struct.Module.html#method.ensure_create_proposal_parameters_are_valid) //! for its [parameters](./struct.ProposalParameters.html) - it can be [created](./struct.Module.html#method.create_proposal). -//! Newly created proposal has _Active_ status. The proposal can be voted on or canceled during its -//! _voting period_. Votes can be [different](./enum.VoteKind.html). When proposal gets enough votes +//! The newly created proposal has _Active_ status. The proposal can be voted on or canceled during its +//! _voting period_. Votes can be [different](./enum.VoteKind.html). When the proposal gets enough votes //! to be slashed or approved or _voting period_ ends - the proposal becomes _Finalized_. If the proposal //! got approved and _grace period_ passed - the `engine` module tries to execute the proposal. //! The final [approved status](./enum.ApprovedProposalStatus.html) of the proposal defines -//! an overall proposal outcome. The proposal can also be [vetoed](./struct.Module.html#method.veto_proposal) +//! an overall proposal outcome. +//! +//! ### Notes +//! +//! - The proposal can be [vetoed](./struct.Module.html#method.veto_proposal) //! anytime before the proposal execution by the _sudo_. +//! - When the proposal is created with some stake - refunding on proposal finalization with +//! different statuses should be accomplished from the external handler from the _stake module_ +//! (_StakingEventsHandler_). Such a handler should call +//! [refund_proposal_stake](./struct.Module.html#method.refund_proposal_stake) callback function. +//! - If the _council_ got reelected during the proposal _voting period_ the external handler calls +//! [reset_active_proposals](./trait.Module.html#method.reset_active_proposals) function and +//! all voting results get cleared. //! //! ### Important abstract types to be implemented //! Proposals `engine` module has several abstractions to be implemented in order to work correctly. @@ -28,9 +39,9 @@ //! the council size //! - _ProposerOriginValidator_ - ensure valid proposer identity. Proposers should have permissions //! to create a proposal: they should be members of the Joystream. -//! - [StakeHandlerProvider](./trait.StakeHandlerProvider.html) - defines interface for the staking. +//! - [StakeHandlerProvider](./trait.StakeHandlerProvider.html) - defines an interface for the staking. //! -//! Full list of the abstractions can be found [here](./trait.Trait.html). +//! A full list of the abstractions can be found [here](./trait.Trait.html). //! //! ### Supported extrinsics //! - [vote](./struct.Module.html#method.vote) - registers a vote for the proposal @@ -46,14 +57,19 @@ //! ## Usage //! //! ``` -//! use srml_support::{decl_module, dispatch::Result}; +//! use srml_support::{decl_module, dispatch::Result, print}; //! use system::ensure_signed; +//! use codec::Encode; //! use substrate_proposals_engine_module::{self as engine, ProposalParameters}; //! //! pub trait Trait: engine::Trait + membership::members::Trait {} //! //! decl_module! { //! pub struct Module for enum Call where origin: T::Origin { +//! fn executable_proposal(origin) { +//! print("executed!"); +//! } +//! //! pub fn create_spending_proposal( //! origin, //! proposer_id: T::MemberId, @@ -61,8 +77,9 @@ //! let account_id = ensure_signed(origin)?; //! let parameters = ProposalParameters::default(); //! let title = b"Spending proposal".to_vec(); -//! let description = b"We need to spend some tokens to support the working group lead.".to_vec(); -//! let encoded_proposal_code = Vec::new(); +//! let description = b"We need to spend some tokens to support the working group lead." +//! .to_vec(); +//! let encoded_proposal_code = >::executable_proposal().encode(); //! //! >::ensure_create_proposal_parameters_are_valid( //! ¶meters, From 00872d6bd16d7663535697cd2c82142489bd752e Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Wed, 15 Apr 2020 11:49:49 +0300 Subject: [PATCH 216/286] Add missing tests --- .../proposals/codex/src/tests/mod.rs | 10 +- .../proposals/discussion/src/tests/mod.rs | 20 ++- .../proposals/discussion/src/types.rs | 29 +++ runtime-modules/proposals/engine/src/lib.rs | 5 +- .../proposals/engine/src/tests/mod.rs | 167 +++++++++++++----- .../engine/src/types/proposal_statuses.rs | 47 +++++ 6 files changed, 230 insertions(+), 48 deletions(-) diff --git a/runtime-modules/proposals/codex/src/tests/mod.rs b/runtime-modules/proposals/codex/src/tests/mod.rs index 61ef9ce629..6912c029fc 100644 --- a/runtime-modules/proposals/codex/src/tests/mod.rs +++ b/runtime-modules/proposals/codex/src/tests/mod.rs @@ -14,10 +14,10 @@ use srml_support::dispatch::DispatchResult; pub use mock::*; pub(crate) fn increase_total_balance_issuance(balance: u64) { - increase_total_balance_issuance_using_account_id(balance, 999); + increase_total_balance_issuance_using_account_id(999, balance); } -pub(crate) fn increase_total_balance_issuance_using_account_id(balance: u64, account_id: u64) { +pub(crate) fn increase_total_balance_issuance_using_account_id(account_id: u64, balance: u64) { let initial_balance = Balances::total_issuance(); { let _ = ::Currency::deposit_creating(&account_id, balance); @@ -367,7 +367,7 @@ fn get_valid_election_parameters() -> ElectionParameters { #[test] fn create_set_election_parameters_call_fails_with_incorrect_parameters() { initial_test_ext().execute_with(|| { - increase_total_balance_issuance_using_account_id(500000, 1); + increase_total_balance_issuance_using_account_id(1, 500000); let mut election_parameters = get_valid_election_parameters(); election_parameters.council_size = 2; @@ -687,7 +687,7 @@ fn create_spending_proposal_common_checks_succeed() { #[test] fn create_spending_proposal_call_fails_with_incorrect_balance() { initial_test_ext().execute_with(|| { - increase_total_balance_issuance_using_account_id(1, 500000); + increase_total_balance_issuance_using_account_id(500000, 1); assert_eq!( ProposalCodex::create_spending_proposal( @@ -720,7 +720,7 @@ fn create_spending_proposal_call_fails_with_incorrect_balance() { #[test] fn create_set_lead_proposal_fails_with_proposed_councilor() { initial_test_ext().execute_with(|| { - increase_total_balance_issuance_using_account_id(500000, 1); + increase_total_balance_issuance_using_account_id(1, 500000); let lead_account_id = 20; >::set_council( diff --git a/runtime-modules/proposals/discussion/src/tests/mod.rs b/runtime-modules/proposals/discussion/src/tests/mod.rs index a2f51c458a..ab5edeb7f8 100644 --- a/runtime-modules/proposals/discussion/src/tests/mod.rs +++ b/runtime-modules/proposals/discussion/src/tests/mod.rs @@ -214,7 +214,7 @@ fn update_post_call_succeeds() { } #[test] -fn update_post_call_failes_because_of_post_edition_limit() { +fn update_post_call_fails_because_of_post_edition_limit() { initial_test_ext().execute_with(|| { let discussion_fixture = DiscussionFixture::default(); @@ -235,7 +235,7 @@ fn update_post_call_failes_because_of_post_edition_limit() { } #[test] -fn update_post_call_failes_because_of_the_wrong_author() { +fn update_post_call_fails_because_of_the_wrong_author() { initial_test_ext().execute_with(|| { let discussion_fixture = DiscussionFixture::default(); @@ -399,3 +399,19 @@ fn add_discussion_thread_fails_because_of_max_thread_by_same_author_in_a_row_lim discussion_fixture.create_discussion_and_assert(Err(Error::MaxThreadInARowLimitExceeded)); }); } + +#[test] +fn discussion_thread_and_post_counters_are_valid() { + initial_test_ext().execute_with(|| { + let discussion_fixture = DiscussionFixture::default(); + let thread_id = discussion_fixture + .create_discussion_and_assert(Ok(1)) + .unwrap(); + + let mut post_fixture1 = PostFixture::default_for_thread(thread_id); + let _ = post_fixture1.add_post_and_assert(Ok(())).unwrap(); + + assert_eq!(Discussions::thread_count(), 1); + assert_eq!(Discussions::post_count(), 1); + }); +} diff --git a/runtime-modules/proposals/discussion/src/types.rs b/runtime-modules/proposals/discussion/src/types.rs index 18bd8a86fb..5b8add6e5c 100644 --- a/runtime-modules/proposals/discussion/src/types.rs +++ b/runtime-modules/proposals/discussion/src/types.rs @@ -71,3 +71,32 @@ impl ThreadCounter { } } } + +#[cfg(test)] +mod tests { + use crate::types::ThreadCounter; + + #[test] + fn thread_counter_increment_works() { + let test = ThreadCounter { + author_id: 56, + counter: 56, + }; + let expected = ThreadCounter { + author_id: 56, + counter: 57, + }; + + assert_eq!(expected, test.increment()); + } + + #[test] + fn thread_counter_new_works() { + let expected = ThreadCounter { + author_id: 56, + counter: 1, + }; + + assert_eq!(expected, ThreadCounter::new(56)); + } +} diff --git a/runtime-modules/proposals/engine/src/lib.rs b/runtime-modules/proposals/engine/src/lib.rs index 28e4badd53..733f83dd3e 100644 --- a/runtime-modules/proposals/engine/src/lib.rs +++ b/runtime-modules/proposals/engine/src/lib.rs @@ -663,7 +663,9 @@ impl Module { // - update proposal status fields (status, finalized_at) // - add to pending execution proposal cache if approved // - slash and unstake proposal stake if stake exists + // - decrease active proposal counter // - fire an event + // It prints an error message in case of an attempt to finalize the non-active proposal. fn finalize_proposal(proposal_id: T::ProposalId, decision_status: ProposalDecisionStatus) { Self::decrease_active_proposal_counter(); >::remove(&proposal_id.clone()); @@ -719,7 +721,8 @@ impl Module { } // Calculates required slash based on finalization ProposalDecisionStatus and proposal parameters. - fn calculate_slash_balance( + // Method visibility allows testing. + pub(crate) fn calculate_slash_balance( decision_status: &ProposalDecisionStatus, proposal_parameters: &ProposalParameters>, ) -> types::BalanceOf { diff --git a/runtime-modules/proposals/engine/src/tests/mod.rs b/runtime-modules/proposals/engine/src/tests/mod.rs index de6c645943..5cdc3ec0e0 100644 --- a/runtime-modules/proposals/engine/src/tests/mod.rs +++ b/runtime-modules/proposals/engine/src/tests/mod.rs @@ -12,6 +12,14 @@ use system::{EventRecord, Phase}; use srml_support::traits::Currency; +pub(crate) fn increase_total_balance_issuance_using_account_id(account_id: u64, balance: u64) { + let initial_balance = Balances::total_issuance(); + { + let _ = ::Currency::deposit_creating(&account_id, balance); + } + assert_eq!(Balances::total_issuance(), initial_balance + balance); +} + struct ProposalParametersFixture { parameters: ProposalParameters, } @@ -437,6 +445,9 @@ fn voting_results_calculation_succeeds() { #[test] fn rejected_voting_results_and_remove_proposal_id_from_active_succeeds() { initial_test_ext().execute_with(|| { + // internal active proposal counter check + assert_eq!(::get(), 0); + let dummy_proposal = DummyProposalFixture::default(); let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); @@ -448,6 +459,9 @@ fn rejected_voting_results_and_remove_proposal_id_from_active_succeeds() { assert!(>::exists(proposal_id)); + // internal active proposal counter check + assert_eq!(::get(), 1); + run_to_block_and_finalize(2); let proposal = >::get(proposal_id); @@ -467,6 +481,9 @@ fn rejected_voting_results_and_remove_proposal_id_from_active_succeeds() { ProposalStatus::finalized_successfully(ProposalDecisionStatus::Rejected, 1), ); assert!(!>::exists(proposal_id)); + + // internal active proposal counter check + assert_eq!(::get(), 0); }); } @@ -555,9 +572,15 @@ fn cancel_proposal_succeeds() { DummyProposalFixture::default().with_parameters(parameters_fixture.params()); let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); + // internal active proposal counter check + assert_eq!(::get(), 1); + let cancel_proposal = CancelProposalFixture::new(proposal_id); cancel_proposal.cancel_and_assert(Ok(())); + // internal active proposal counter check + assert_eq!(::get(), 0); + let proposal = >::get(proposal_id); assert_eq!( @@ -819,46 +842,6 @@ fn proposal_execution_postponed_because_of_grace_period() { }); } -/* - -#[test] -fn veto_proposal_succeeds() { - initial_test_ext().execute_with(|| { - // internal active proposal counter check - assert_eq!(::get(), 0); - - let parameters_fixture = ProposalParametersFixture::default(); - let dummy_proposal = - DummyProposalFixture::default().with_parameters(parameters_fixture.params()); - let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); - - // internal active proposal counter check - assert_eq!(::get(), 1); - - let veto_proposal = VetoProposalFixture::new(proposal_id); - veto_proposal.veto_and_assert(Ok(())); - - let proposal = >::get(proposal_id); - - assert_eq!( - proposal, - Proposal { - parameters: parameters_fixture.params(), - proposer_id: 1, - created_at: 1, - status: ProposalStatus::finalized_successfully(ProposalDecisionStatus::Vetoed, 1), - title: b"title".to_vec(), - description: b"description".to_vec(), - voting_results: VotingResults::default(), - } - ); - - // internal active proposal counter check - assert_eq!(::get(), 0); - }); -} -*/ - #[test] fn proposal_execution_vetoed_successfully_during_the_grace_period() { initial_test_ext().execute_with(|| { @@ -1492,3 +1475,107 @@ fn proposal_reset_succeeds() { ); }); } + +#[test] +fn proposal_counters_are_valid() { + initial_test_ext().execute_with(|| { + let mut dummy_proposal = DummyProposalFixture::default(); + let _ = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); + + dummy_proposal = DummyProposalFixture::default(); + let _ = dummy_proposal.create_proposal_and_assert(Ok(2)).unwrap(); + + dummy_proposal = DummyProposalFixture::default(); + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(3)).unwrap(); + + assert_eq!(ActiveProposalCount::get(), 3); + assert_eq!(ProposalCount::get(), 3); + + let cancel_proposal_fixture = CancelProposalFixture::new(proposal_id); + cancel_proposal_fixture.cancel_and_assert(Ok(())); + + assert_eq!(ActiveProposalCount::get(), 2); + assert_eq!(ProposalCount::get(), 3); + }); +} + +#[test] +fn proposal_stake_cache_is_valid() { + initial_test_ext().execute_with(|| { + increase_total_balance_issuance_using_account_id(1, 50000); + + let stake = 250u32; + let parameters = ProposalParametersFixture::default().with_required_stake(stake.into()); + let dummy_proposal = DummyProposalFixture::default() + .with_parameters(parameters.params()) + .with_stake(stake as u64); + + let proposal_id = dummy_proposal.create_proposal_and_assert(Ok(1)).unwrap(); + let expected_stake_id = 0; + assert_eq!( + >::get(&expected_stake_id), + proposal_id + ); + }); +} + +#[test] +fn slash_balance_is_calculated_correctly() { + initial_test_ext().execute_with(|| { + let vetoed_slash_balance = ProposalsEngine::calculate_slash_balance( + &ProposalDecisionStatus::Vetoed, + &ProposalParametersFixture::default().params(), + ); + + assert_eq!(vetoed_slash_balance, 0); + + let approved_slash_balance = ProposalsEngine::calculate_slash_balance( + &ProposalDecisionStatus::Approved(ApprovedProposalStatus::Executed), + &ProposalParametersFixture::default().params(), + ); + + assert_eq!(approved_slash_balance, 0); + + let rejection_fee = ::RejectionFee::get(); + + let rejected_slash_balance = ProposalsEngine::calculate_slash_balance( + &ProposalDecisionStatus::Rejected, + &ProposalParametersFixture::default().params(), + ); + + assert_eq!(rejected_slash_balance, rejection_fee); + + let expired_slash_balance = ProposalsEngine::calculate_slash_balance( + &ProposalDecisionStatus::Expired, + &ProposalParametersFixture::default().params(), + ); + + assert_eq!(expired_slash_balance, rejection_fee); + + let cancellation_fee = ::CancellationFee::get(); + + let cancellation_slash_balance = ProposalsEngine::calculate_slash_balance( + &ProposalDecisionStatus::Canceled, + &ProposalParametersFixture::default().params(), + ); + + assert_eq!(cancellation_slash_balance, cancellation_fee); + + let slash_balance_with_no_stake = ProposalsEngine::calculate_slash_balance( + &ProposalDecisionStatus::Slashed, + &ProposalParametersFixture::default().params(), + ); + + assert_eq!(slash_balance_with_no_stake, 0); + + let stake = 256; + let slash_balance_with_stake = ProposalsEngine::calculate_slash_balance( + &ProposalDecisionStatus::Slashed, + &ProposalParametersFixture::default() + .with_required_stake(stake) + .params(), + ); + + assert_eq!(slash_balance_with_stake, stake); + }); +} diff --git a/runtime-modules/proposals/engine/src/types/proposal_statuses.rs b/runtime-modules/proposals/engine/src/types/proposal_statuses.rs index 77ebf17926..4deb8b647d 100644 --- a/runtime-modules/proposals/engine/src/types/proposal_statuses.rs +++ b/runtime-modules/proposals/engine/src/types/proposal_statuses.rs @@ -148,3 +148,50 @@ pub enum ProposalDecisionStatus { /// must be no less than the quorum value for the given proposal type. Approved(ApprovedProposalStatus), } + +#[cfg(test)] +mod tests { + use crate::{ + ActiveStake, ApprovedProposalStatus, FinalizationData, ProposalDecisionStatus, + ProposalStatus, + }; + + #[test] + fn approved_proposal_status_helper_succeeds() { + let msg = "error"; + + assert_eq!( + ApprovedProposalStatus::failed_execution(&msg), + ApprovedProposalStatus::ExecutionFailed { + error: msg.as_bytes().to_vec() + } + ); + } + + #[test] + fn finalized_proposal_status_helper_succeeds() { + let msg = "error"; + let block_number = 20; + let stake = ActiveStake { + stake_id: 50, + source_account_id: 2, + }; + + let proposal_status = ProposalStatus::finalized( + ProposalDecisionStatus::Slashed, + Some(msg), + Some(stake), + block_number, + ); + + assert_eq!( + ProposalStatus::Finalized(FinalizationData { + proposal_status: ProposalDecisionStatus::Slashed, + finalized_at: block_number, + encoded_unstaking_error_due_to_broken_runtime: Some(msg.as_bytes().to_vec()), + stake_data_after_unstaking_error: Some(stake) + }), + proposal_status + ); + } +} From 1683ac460eac7811e1dc9a4da6c46c268b24a6e1 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Wed, 15 Apr 2020 12:25:03 +0300 Subject: [PATCH 217/286] Add tests for proposal status resolution --- .../proposals/engine/src/types/mod.rs | 113 ++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/runtime-modules/proposals/engine/src/types/mod.rs b/runtime-modules/proposals/engine/src/types/mod.rs index a496fec53e..d023f494a1 100644 --- a/runtime-modules/proposals/engine/src/types/mod.rs +++ b/runtime-modules/proposals/engine/src/types/mod.rs @@ -369,6 +369,7 @@ pub(crate) struct ApprovedProposalData< #[cfg(test)] mod tests { + use crate::types::ProposalStatusResolution; use crate::*; // Alias introduced for simplicity of changing Proposal exact types. @@ -672,4 +673,116 @@ mod tests { Some(ProposalDecisionStatus::Slashed) ); } + + #[test] + fn proposal_status_resolution_approval_quorum_works_correctly() { + let no_approval_quorum_proposal: Proposal = Proposal { + parameters: ProposalParameters { + approval_quorum_percentage: 63, + ..ProposalParameters::default() + }, + ..Proposal::default() + }; + let no_approval_proposal_status_resolution = ProposalStatusResolution { + proposal: &no_approval_quorum_proposal, + now: 20, + votes_count: 314, + total_voters_count: 500, + approvals: 3, + slashes: 3, + }; + + assert!(!no_approval_proposal_status_resolution.is_approval_quorum_reached()); + + let approval_quorum_proposal_status_resolution = ProposalStatusResolution { + votes_count: 315, + ..no_approval_proposal_status_resolution + }; + + assert!(approval_quorum_proposal_status_resolution.is_approval_quorum_reached()); + } + + #[test] + fn proposal_status_resolution_slashing_quorum_works_correctly() { + let no_slashing_quorum_proposal: Proposal = Proposal { + parameters: ProposalParameters { + slashing_quorum_percentage: 63, + ..ProposalParameters::default() + }, + ..Proposal::default() + }; + let no_slashing_proposal_status_resolution = ProposalStatusResolution { + proposal: &no_slashing_quorum_proposal, + now: 20, + votes_count: 314, + total_voters_count: 500, + approvals: 3, + slashes: 3, + }; + + assert!(!no_slashing_proposal_status_resolution.is_slashing_quorum_reached()); + + let slashing_quorum_proposal_status_resolution = ProposalStatusResolution { + votes_count: 315, + ..no_slashing_proposal_status_resolution + }; + + assert!(slashing_quorum_proposal_status_resolution.is_slashing_quorum_reached()); + } + + #[test] + fn proposal_status_resolution_approval_threshold_works_correctly() { + let no_approval_threshold_proposal: Proposal = Proposal { + parameters: ProposalParameters { + approval_threshold_percentage: 63, + ..ProposalParameters::default() + }, + ..Proposal::default() + }; + let no_approval_proposal_status_resolution = ProposalStatusResolution { + proposal: &no_approval_threshold_proposal, + now: 20, + votes_count: 500, + total_voters_count: 600, + approvals: 314, + slashes: 3, + }; + + assert!(!no_approval_proposal_status_resolution.is_approval_threshold_reached()); + + let approval_threshold_proposal_status_resolution = ProposalStatusResolution { + approvals: 315, + ..no_approval_proposal_status_resolution + }; + + assert!(approval_threshold_proposal_status_resolution.is_approval_threshold_reached()); + } + + #[test] + fn proposal_status_resolution_slashing_threshold_works_correctly() { + let no_slashing_threshold_proposal: Proposal = Proposal { + parameters: ProposalParameters { + slashing_threshold_percentage: 63, + ..ProposalParameters::default() + }, + ..Proposal::default() + }; + let no_slashing_proposal_status_resolution = ProposalStatusResolution { + proposal: &no_slashing_threshold_proposal, + now: 20, + votes_count: 500, + total_voters_count: 600, + approvals: 3, + slashes: 314, + }; + + assert!(!no_slashing_proposal_status_resolution.is_slashing_threshold_reached()); + + let slashing_threshold_proposal_status_resolution = ProposalStatusResolution { + slashes: 315, + ..no_slashing_proposal_status_resolution + }; + + assert!(slashing_threshold_proposal_status_resolution.is_slashing_threshold_reached()); + } } From cb80ece0d7c66ece64dc5dba7529e6a1815f5998 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Wed, 15 Apr 2020 13:44:55 +0300 Subject: [PATCH 218/286] Migrate proposal votes calculations to Perbill - migrate engine module quorum & threshold calculations from float division to Substrate Perbill type - add tests --- runtime-modules/proposals/codex/src/lib.rs | 2 +- .../proposals/engine/src/types/mod.rs | 37 +++++++++++-------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index de61e5ce59..a1fd3656d7 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -59,7 +59,7 @@ use rstd::vec::Vec; use runtime_io::blake2_256; use sr_primitives::traits::SaturatedConversion; use sr_primitives::traits::{One, Zero}; -pub use sr_primitives::Perbill; +use sr_primitives::Perbill; use srml_support::dispatch::DispatchResult; use srml_support::traits::{Currency, Get}; use srml_support::{decl_error, decl_module, decl_storage, ensure, print}; diff --git a/runtime-modules/proposals/engine/src/types/mod.rs b/runtime-modules/proposals/engine/src/types/mod.rs index d023f494a1..d6ad1a8c73 100644 --- a/runtime-modules/proposals/engine/src/types/mod.rs +++ b/runtime-modules/proposals/engine/src/types/mod.rs @@ -10,6 +10,7 @@ use rstd::prelude::*; #[cfg(feature = "std")] use serde::{Deserialize, Serialize}; +use sr_primitives::Perbill; use srml_support::dispatch; use srml_support::traits::Currency; @@ -253,45 +254,45 @@ where // Approval quorum reached for the proposal. Compares predefined parameter with actual // votes sum divided by total possible votes count. pub fn is_approval_quorum_reached(&self) -> bool { - let actual_votes_fraction: f32 = self.votes_count as f32 / self.total_voters_count as f32; - + let actual_votes_fraction = + Perbill::from_rational_approximation(self.votes_count, self.total_voters_count); let approval_quorum_fraction = - self.proposal.parameters.approval_quorum_percentage as f32 / 100.0; + Perbill::from_percent(self.proposal.parameters.approval_quorum_percentage); - actual_votes_fraction >= approval_quorum_fraction + actual_votes_fraction.deconstruct() >= approval_quorum_fraction.deconstruct() } // Slashing quorum reached for the proposal. Compares predefined parameter with actual // votes sum divided by total possible votes count. pub fn is_slashing_quorum_reached(&self) -> bool { - let actual_votes_fraction: f32 = self.votes_count as f32 / self.total_voters_count as f32; - + let actual_votes_fraction = + Perbill::from_rational_approximation(self.votes_count, self.total_voters_count); let slashing_quorum_fraction = - self.proposal.parameters.slashing_quorum_percentage as f32 / 100.0; + Perbill::from_percent(self.proposal.parameters.slashing_quorum_percentage); - actual_votes_fraction >= slashing_quorum_fraction + actual_votes_fraction.deconstruct() >= slashing_quorum_fraction.deconstruct() } // Approval threshold reached for the proposal. Compares predefined parameter with 'approve' // votes sum divided by actual votes count. pub fn is_approval_threshold_reached(&self) -> bool { - let approval_votes_fraction: f32 = self.approvals as f32 / self.votes_count as f32; - + let approval_votes_fraction = + Perbill::from_rational_approximation(self.approvals, self.votes_count); let required_threshold_fraction = - self.proposal.parameters.approval_threshold_percentage as f32 / 100.0; + Perbill::from_percent(self.proposal.parameters.approval_threshold_percentage); - approval_votes_fraction >= required_threshold_fraction + approval_votes_fraction.deconstruct() >= required_threshold_fraction.deconstruct() } // Slashing threshold reached for the proposal. Compares predefined parameter with 'approve' // votes sum divided by actual votes count. pub fn is_slashing_threshold_reached(&self) -> bool { - let slashing_votes_fraction: f32 = self.slashes as f32 / self.votes_count as f32; - + let slashing_votes_fraction = + Perbill::from_rational_approximation(self.slashes, self.votes_count); let required_threshold_fraction = - self.proposal.parameters.slashing_threshold_percentage as f32 / 100.0; + Perbill::from_percent(self.proposal.parameters.slashing_threshold_percentage); - slashing_votes_fraction >= required_threshold_fraction + slashing_votes_fraction.deconstruct() >= required_threshold_fraction.deconstruct() } // All voters had voted @@ -679,6 +680,7 @@ mod tests { let no_approval_quorum_proposal: Proposal = Proposal { parameters: ProposalParameters { approval_quorum_percentage: 63, + slashing_threshold_percentage: 63, ..ProposalParameters::default() }, ..Proposal::default() @@ -706,6 +708,7 @@ mod tests { fn proposal_status_resolution_slashing_quorum_works_correctly() { let no_slashing_quorum_proposal: Proposal = Proposal { parameters: ProposalParameters { + approval_quorum_percentage: 63, slashing_quorum_percentage: 63, ..ProposalParameters::default() }, @@ -734,6 +737,7 @@ mod tests { fn proposal_status_resolution_approval_threshold_works_correctly() { let no_approval_threshold_proposal: Proposal = Proposal { parameters: ProposalParameters { + slashing_threshold_percentage: 63, approval_threshold_percentage: 63, ..ProposalParameters::default() }, @@ -763,6 +767,7 @@ mod tests { let no_slashing_threshold_proposal: Proposal = Proposal { parameters: ProposalParameters { slashing_threshold_percentage: 63, + approval_threshold_percentage: 63, ..ProposalParameters::default() }, ..Proposal::default() From ad3705b48c9a5896036b7ec72b12cebc442afb62 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Wed, 15 Apr 2020 17:35:09 +0300 Subject: [PATCH 219/286] Remove allowd member_id list for runtime upgrade proposal --- runtime-modules/proposals/codex/src/lib.rs | 11 ----------- .../proposals/codex/src/tests/mock.rs | 2 -- .../proposals/codex/src/tests/mod.rs | 17 ----------------- runtime/src/lib.rs | 2 -- 4 files changed, 32 deletions(-) diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index a1fd3656d7..5d3f59d98b 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -88,9 +88,6 @@ pub trait Trait: /// Defines max wasm code length of the runtime upgrade proposal. type RuntimeUpgradeWasmProposalMaxLength: Get; - /// Defines allowed proposers (by member id list) for the runtime upgrade proposal. - type RuntimeUpgradeProposalAllowedProposers: Get>>; - /// Validates member id and origin combination type MembershipOriginValidator: ActorOriginValidator< Self::Origin, @@ -137,9 +134,6 @@ decl_error! { /// Provided WASM code for the runtime upgrade proposal is empty RuntimeProposalIsEmpty, - /// Runtime upgrade proposal can be created only by hardcoded members - RuntimeProposalProposerNotInTheAllowedProposersList, - /// Invalid balance value for the spending proposal InvalidSpendingProposalBalance, @@ -312,11 +306,6 @@ decl_module! { ensure!(wasm.len() as u32 <= T::RuntimeUpgradeWasmProposalMaxLength::get(), Error::RuntimeProposalSizeExceeded); - ensure!( - T::RuntimeUpgradeProposalAllowedProposers::get().contains(&member_id), - Error::RuntimeProposalProposerNotInTheAllowedProposersList - ); - let wasm_hash = blake2_256(&wasm); let proposal_code = diff --git a/runtime-modules/proposals/codex/src/tests/mock.rs b/runtime-modules/proposals/codex/src/tests/mock.rs index d3a8de4f29..7b80011871 100644 --- a/runtime-modules/proposals/codex/src/tests/mock.rs +++ b/runtime-modules/proposals/codex/src/tests/mock.rs @@ -158,7 +158,6 @@ impl VotersParameters for MockVotersParameters { parameter_types! { pub const TextProposalMaxLength: u32 = 20_000; pub const RuntimeUpgradeWasmProposalMaxLength: u32 = 20_000; - pub const RuntimeUpgradeProposalAllowedProposers: Vec = vec![1]; } impl governance::election::Trait for Test { @@ -249,7 +248,6 @@ impl staking::SessionInterface for Test { impl crate::Trait for Test { type TextProposalMaxLength = TextProposalMaxLength; type RuntimeUpgradeWasmProposalMaxLength = RuntimeUpgradeWasmProposalMaxLength; - type RuntimeUpgradeProposalAllowedProposers = RuntimeUpgradeProposalAllowedProposers; type MembershipOriginValidator = (); } diff --git a/runtime-modules/proposals/codex/src/tests/mod.rs b/runtime-modules/proposals/codex/src/tests/mod.rs index 6912c029fc..29a3d67075 100644 --- a/runtime-modules/proposals/codex/src/tests/mod.rs +++ b/runtime-modules/proposals/codex/src/tests/mod.rs @@ -261,23 +261,6 @@ fn create_upgrade_runtime_proposal_codex_call_fails_with_incorrect_wasm_size() { }); } -#[test] -fn create_upgrade_runtime_proposal_codex_call_fails_with_not_allowed_member_id() { - initial_test_ext().execute_with(|| { - assert_eq!( - ProposalCodex::create_runtime_upgrade_proposal( - RawOrigin::Signed(1).into(), - 110, - b"title".to_vec(), - b"body".to_vec(), - Some(>::from(50000u32)), - b"wasm".to_vec(), - ), - Err(Error::RuntimeProposalProposerNotInTheAllowedProposersList) - ); - }); -} - #[test] fn create_set_election_parameters_proposal_common_checks_succeed() { initial_test_ext().execute_with(|| { diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index d9dd2957f6..2eea0aca46 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -860,14 +860,12 @@ impl proposals_discussion::Trait for Runtime { parameter_types! { pub const TextProposalMaxLength: u32 = 5_000; pub const RuntimeUpgradeWasmProposalMaxLength: u32 = 2_000_000; - pub const RuntimeUpgradeProposalAllowedProposers: Vec = Vec::new(); //TODO set allowed members } impl proposals_codex::Trait for Runtime { type MembershipOriginValidator = MembershipOriginValidator; type TextProposalMaxLength = TextProposalMaxLength; type RuntimeUpgradeWasmProposalMaxLength = RuntimeUpgradeWasmProposalMaxLength; - type RuntimeUpgradeProposalAllowedProposers = RuntimeUpgradeProposalAllowedProposers; } construct_runtime!( From c2c9cb39a603e394d8ebedc79d60b6de8eeb60ef Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Mon, 20 Apr 2020 12:41:41 +0300 Subject: [PATCH 220/286] =?UTF-8?q?Remove=20=E2=80=98set=20council=20mint?= =?UTF-8?q?=20capacity=E2=80=99=20proposal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - remove proposal from the codex - remove tests - remove parameters and proposal details --- runtime-modules/proposals/codex/src/lib.rs | 45 ----------- .../proposals/codex/src/proposal_types/mod.rs | 3 - .../codex/src/proposal_types/parameters.rs | 14 ---- .../proposals/codex/src/tests/mod.rs | 75 +------------------ 4 files changed, 1 insertion(+), 136 deletions(-) diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index 5d3f59d98b..d56c47466d 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -16,7 +16,6 @@ //! - [create_text_proposal](./struct.Module.html#method.create_text_proposal) //! - [create_runtime_upgrade_proposal](./struct.Module.html#method.create_runtime_upgrade_proposal) //! - [create_set_election_parameters_proposal](./struct.Module.html#method.create_set_election_parameters_proposal) -//! - [create_set_council_mint_capacity_proposal](./struct.Module.html#method.create_set_council_mint_capacity_proposal) //! - [create_set_content_working_group_mint_capacity_proposal](./struct.Module.html#method.create_set_content_working_group_mint_capacity_proposal) //! - [create_spending_proposal](./struct.Module.html#method.create_spending_proposal) //! - [create_set_lead_proposal](./struct.Module.html#method.create_set_lead_proposal) @@ -200,9 +199,6 @@ decl_error! { /// Invalid working group mint capacity parameter InvalidStorageWorkingGroupMintCapacity, - /// Invalid council mint capacity parameter - InvalidStorageCouncilMintCapacity, - /// Invalid 'set lead proposal' parameter - proposed lead cannot be a councilor InvalidSetLeadParameterCannotBeCouncilor } @@ -357,47 +353,6 @@ decl_module! { )?; } - /// Create 'Set council mint capacity' proposal type. This proposal uses `set_mint_capacity()` - /// extrinsic from the `governance::council` module. - pub fn create_set_council_mint_capacity_proposal( - origin, - member_id: MemberId, - title: Vec, - description: Vec, - stake_balance: Option>, - mint_balance: BalanceOfMint, - ) { - - let max_mint_capacity: u32 = get_required_stake_by_fraction::( - COUNCIL_MINT_MAX_BALANCE_PERCENT, - 100 - ) - .try_into() - .unwrap_or_default() as u32; - - ensure!( - mint_balance < >::from(max_mint_capacity), - Error::InvalidStorageCouncilMintCapacity - ); - - let proposal_code = - >::set_council_mint_capacity(mint_balance.clone()); - - let proposal_parameters = - proposal_types::parameters::set_council_mint_capacity_proposal::(); - - Self::create_proposal( - origin, - member_id, - title, - description, - stake_balance, - proposal_code.encode(), - proposal_parameters, - ProposalDetails::SetCouncilMintCapacity(mint_balance), - )?; - } - /// Create 'Set content working group mint capacity' proposal type. /// This proposal uses `set_mint_capacity()` extrinsic from the `content-working-group` module. pub fn create_set_content_working_group_mint_capacity_proposal( diff --git a/runtime-modules/proposals/codex/src/proposal_types/mod.rs b/runtime-modules/proposals/codex/src/proposal_types/mod.rs index 43a7138903..e9e7bc93dc 100644 --- a/runtime-modules/proposals/codex/src/proposal_types/mod.rs +++ b/runtime-modules/proposals/codex/src/proposal_types/mod.rs @@ -27,9 +27,6 @@ pub enum ProposalDetails), - /// Balance for the `set council mint capacity` proposal - SetCouncilMintCapacity(MintedBalance), - /// Balance for the `set content working group mint capacity` proposal SetContentWorkingGroupMintCapacity(MintedBalance), diff --git a/runtime-modules/proposals/codex/src/proposal_types/parameters.rs b/runtime-modules/proposals/codex/src/proposal_types/parameters.rs index 28dcb35c9c..031c17de09 100644 --- a/runtime-modules/proposals/codex/src/proposal_types/parameters.rs +++ b/runtime-modules/proposals/codex/src/proposal_types/parameters.rs @@ -55,20 +55,6 @@ pub(crate) fn set_election_parameters_proposal( } } -// Proposal parameters for the 'Set council mint capacity' proposal -pub(crate) fn set_council_mint_capacity_proposal( -) -> ProposalParameters> { - ProposalParameters { - voting_period: T::BlockNumber::from(43200u32), - grace_period: T::BlockNumber::from(0u32), - approval_quorum_percentage: 66, - approval_threshold_percentage: 80, - slashing_quorum_percentage: 50, - slashing_threshold_percentage: 50, - required_stake: Some(get_required_stake_by_fraction::(25, 10000)), - } -} - // Proposal parameters for the 'Set content working group mint capacity' proposal pub(crate) fn set_content_working_group_mint_capacity_proposal( ) -> ProposalParameters> { diff --git a/runtime-modules/proposals/codex/src/tests/mod.rs b/runtime-modules/proposals/codex/src/tests/mod.rs index 29a3d67075..d66127363f 100644 --- a/runtime-modules/proposals/codex/src/tests/mod.rs +++ b/runtime-modules/proposals/codex/src/tests/mod.rs @@ -466,80 +466,7 @@ fn create_set_election_parameters_call_fails_with_incorrect_parameters() { } #[test] -fn create_set_council_mint_capacity_proposal_fails_with_invalid_parameters() { - initial_test_ext().execute_with(|| { - increase_total_balance_issuance(500000); - - assert_eq!( - ProposalCodex::create_set_council_mint_capacity_proposal( - RawOrigin::Signed(1).into(), - 1, - b"title".to_vec(), - b"body".to_vec(), - Some(>::from(1250u32)), - 10001, - ), - Err(Error::InvalidStorageCouncilMintCapacity) - ); - }); -} - -#[test] -fn create_set_council_mint_capacity_proposal_common_checks_succeed() { - initial_test_ext().execute_with(|| { - increase_total_balance_issuance(500000); - - let proposal_fixture = ProposalTestFixture { - insufficient_rights_call: || { - ProposalCodex::create_set_council_mint_capacity_proposal( - RawOrigin::None.into(), - 1, - b"title".to_vec(), - b"body".to_vec(), - None, - 0, - ) - }, - empty_stake_call: || { - ProposalCodex::create_set_council_mint_capacity_proposal( - RawOrigin::Signed(1).into(), - 1, - b"title".to_vec(), - b"body".to_vec(), - None, - 0, - ) - }, - invalid_stake_call: || { - ProposalCodex::create_set_council_mint_capacity_proposal( - RawOrigin::Signed(1).into(), - 1, - b"title".to_vec(), - b"body".to_vec(), - Some(>::from(150u32)), - 0, - ) - }, - successful_call: || { - ProposalCodex::create_set_council_mint_capacity_proposal( - RawOrigin::Signed(1).into(), - 1, - b"title".to_vec(), - b"body".to_vec(), - Some(>::from(1250u32)), - 10, - ) - }, - proposal_parameters: - crate::proposal_types::parameters::set_council_mint_capacity_proposal::(), - proposal_details: ProposalDetails::SetCouncilMintCapacity(10), - }; - proposal_fixture.check_all(); - }); -} - -#[test] -fn create_working_groupd_mint_capacity_proposal_fails_with_invalid_parameters() { +fn create_working_group_mint_capacity_proposal_fails_with_invalid_parameters() { initial_test_ext().execute_with(|| { increase_total_balance_issuance(500000); From 5ba03831474442c100650fbc579b0300414b5968 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 21 Apr 2020 12:51:35 +0300 Subject: [PATCH 221/286] Move proposal parameters to the config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move ‘Set validator count’ proposal parameters (grace_period and voting_period) to the config --- node/src/chain_spec.rs | 6 +++++- runtime-modules/proposals/codex/src/lib.rs | 8 ++++++++ .../proposals/codex/src/proposal_types/parameters.rs | 6 +++--- runtime/src/lib.rs | 2 +- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/node/src/chain_spec.rs b/node/src/chain_spec.rs index c11a033d4c..ca70c6e1a9 100644 --- a/node/src/chain_spec.rs +++ b/node/src/chain_spec.rs @@ -20,7 +20,7 @@ use node_runtime::{ CouncilConfig, CouncilElectionConfig, DataObjectStorageRegistryConfig, DataObjectTypeRegistryConfig, ElectionParameters, GrandpaConfig, ImOnlineConfig, IndicesConfig, MembersConfig, Perbill, SessionConfig, SessionKeys, Signature, StakerStatus, StakingConfig, - SudoConfig, SystemConfig, VersionedStoreConfig, DAYS, WASM_BINARY, + SudoConfig, SystemConfig, VersionedStoreConfig, DAYS, WASM_BINARY, ProposalsCodexConfig }; pub use node_runtime::{AccountId, GenesisConfig}; use primitives::{sr25519, Pair, Public}; @@ -297,5 +297,9 @@ pub fn testnet_genesis( channel_banner_constraint: crate::forum_config::new_validation(5, 1024), channel_title_constraint: crate::forum_config::new_validation(5, 1024), }), + proposals_codex : Some(ProposalsCodexConfig { + set_validator_count_proposal_voting_period : 43200u32, + set_validator_count_proposal_grace_period : 0u32, + }) } } diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index d56c47466d..52df3a4da6 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -250,6 +250,14 @@ decl_storage! { T::AccountId, T::MemberId >; + + /// Voting period for the 'set validator count' proposal + pub SetValidatorCountProposalVotingPeriod get(set_validator_count_proposal_voting_period) + config(): T::BlockNumber; + + /// Grate period for the 'set validator count' proposal + pub SetValidatorCountProposalGracePeriod get(set_validator_count_proposal_grace_period) + config(): T::BlockNumber; } } diff --git a/runtime-modules/proposals/codex/src/proposal_types/parameters.rs b/runtime-modules/proposals/codex/src/proposal_types/parameters.rs index 031c17de09..666dda1cbc 100644 --- a/runtime-modules/proposals/codex/src/proposal_types/parameters.rs +++ b/runtime-modules/proposals/codex/src/proposal_types/parameters.rs @@ -1,11 +1,11 @@ -use crate::{get_required_stake_by_fraction, BalanceOf, ProposalParameters}; +use crate::{get_required_stake_by_fraction, BalanceOf, ProposalParameters, Module}; // Proposal parameters for the 'Set validator count' proposal pub(crate) fn set_validator_count_proposal( ) -> ProposalParameters> { ProposalParameters { - voting_period: T::BlockNumber::from(43200u32), - grace_period: T::BlockNumber::from(0u32), + voting_period: >::set_validator_count_proposal_voting_period(), + grace_period: >::set_validator_count_proposal_grace_period(), approval_quorum_percentage: 66, approval_threshold_percentage: 80, slashing_quorum_percentage: 60, diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 2eea0aca46..e4afe8eb12 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -913,7 +913,7 @@ construct_runtime!( // --- Proposals ProposalsEngine: proposals_engine::{Module, Call, Storage, Event}, ProposalsDiscussion: proposals_discussion::{Module, Call, Storage, Event}, - ProposalsCodex: proposals_codex::{Module, Call, Storage, Error}, + ProposalsCodex: proposals_codex::{Module, Call, Storage, Error, Config}, // --- } ); From 055cfd66f3936435dca63dfc4408aa9230767261 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 21 Apr 2020 13:50:55 +0300 Subject: [PATCH 222/286] Move proposals voting_period and grace_period to the config --- node/src/chain_spec.rs | 16 +++++ runtime-modules/proposals/codex/src/lib.rs | 62 ++++++++++++++++++- .../codex/src/proposal_types/parameters.rs | 32 +++++----- 3 files changed, 93 insertions(+), 17 deletions(-) diff --git a/node/src/chain_spec.rs b/node/src/chain_spec.rs index ca70c6e1a9..c1027d4482 100644 --- a/node/src/chain_spec.rs +++ b/node/src/chain_spec.rs @@ -300,6 +300,22 @@ pub fn testnet_genesis( proposals_codex : Some(ProposalsCodexConfig { set_validator_count_proposal_voting_period : 43200u32, set_validator_count_proposal_grace_period : 0u32, + runtime_upgrade_proposal_voting_period : 72000u32, + runtime_upgrade_proposal_grace_period : 72000u32, + text_proposal_voting_period : 72000u32, + text_proposal_grace_period : 0u32, + set_election_parameters_proposal_voting_period : 72000u32, + set_election_parameters_proposal_grace_period : 201601u32, + set_content_working_group_mint_capacity_proposal_voting_period : 43200u32, + set_content_working_group_mint_capacity_proposal_grace_period : 0u32, + set_lead_proposal_voting_period : 43200u32, + set_lead_proposal_grace_period : 0u32, + spending_proposal_voting_period : 72000u32, + spending_proposal_grace_period : 14400u32, + evict_storage_provider_proposal_voting_period : 43200u32, + evict_storage_provider_proposal_grace_period : 0u32, + set_storage_role_parameters_proposal_voting_period : 43200u32, + set_storage_role_parameters_proposal_grace_period : 14400u32, }) } } diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index 52df3a4da6..d2e6edab4a 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -255,9 +255,69 @@ decl_storage! { pub SetValidatorCountProposalVotingPeriod get(set_validator_count_proposal_voting_period) config(): T::BlockNumber; - /// Grate period for the 'set validator count' proposal + /// Grace period for the 'set validator count' proposal pub SetValidatorCountProposalGracePeriod get(set_validator_count_proposal_grace_period) config(): T::BlockNumber; + + /// Voting period for the 'runtime upgrade' proposal + pub RuntimeUpgradeProposalVotingPeriod get(runtime_upgrade_proposal_voting_period) + config(): T::BlockNumber; + + /// Grace period for the 'runtime upgrade' proposal + pub RuntimeUpgradeProposalGracePeriod get(runtime_upgrade_proposal_grace_period) + config(): T::BlockNumber; + + /// Voting period for the 'set election parameters' proposal + pub SetElectionParametersProposalVotingPeriod get(set_election_parameters_proposal_voting_period) + config(): T::BlockNumber; + + /// Grace period for the 'set election parameters' proposal + pub SetElectionParametersProposalGracePeriod get(set_election_parameters_proposal_grace_period) + config(): T::BlockNumber; + + /// Voting period for the 'text' proposal + pub TextProposalVotingPeriod get(text_proposal_voting_period) config(): T::BlockNumber; + + /// Grace period for the 'text' proposal + pub TextProposalGracePeriod get(text_proposal_grace_period) config(): T::BlockNumber; + + /// Voting period for the 'set content working group mint capacity' proposal + pub SetContentWorkingGroupMintCapacityProposalVotingPeriod get(set_content_working_group_mint_capacity_proposal_voting_period) + config(): T::BlockNumber; + + /// Grace period for the 'set content working group mint capacity' proposal + pub SetContentWorkingGroupMintCapacityProposalGracePeriod get(set_content_working_group_mint_capacity_proposal_grace_period) + config(): T::BlockNumber; + + /// Voting period for the 'set lead' proposal + pub SetLeadProposalVotingPeriod get(set_lead_proposal_voting_period) + config(): T::BlockNumber; + + /// Grace period for the 'set lead' proposal + pub SetLeadProposalGracePeriod get(set_lead_proposal_grace_period) + config(): T::BlockNumber; + + /// Voting period for the 'spending' proposal + pub SpendingProposalVotingPeriod get(spending_proposal_voting_period) config(): T::BlockNumber; + + /// Grace period for the 'spending' proposal + pub SpendingProposalGracePeriod get(spending_proposal_grace_period) config(): T::BlockNumber; + + /// Voting period for the 'evict storage provider' proposal + pub EvictStorageProviderProposalVotingPeriod get(evict_storage_provider_proposal_voting_period) + config(): T::BlockNumber; + + /// Grace period for the 'evict storage provider' proposal + pub EvictStorageProviderProposalGracePeriod get(evict_storage_provider_proposal_grace_period) + config(): T::BlockNumber; + + /// Voting period for the 'set storage role parameters' proposal + pub SetStorageRoleParametersProposalVotingPeriod get(set_storage_role_parameters_proposal_voting_period) + config(): T::BlockNumber; + + /// Grace period for the 'set storage role parameters' proposal + pub SetStorageRoleParametersProposalGracePeriod get(set_storage_role_parameters_proposal_grace_period) + config(): T::BlockNumber; } } diff --git a/runtime-modules/proposals/codex/src/proposal_types/parameters.rs b/runtime-modules/proposals/codex/src/proposal_types/parameters.rs index 666dda1cbc..d79fdbb2de 100644 --- a/runtime-modules/proposals/codex/src/proposal_types/parameters.rs +++ b/runtime-modules/proposals/codex/src/proposal_types/parameters.rs @@ -18,8 +18,8 @@ pub(crate) fn set_validator_count_proposal( pub(crate) fn runtime_upgrade_proposal( ) -> ProposalParameters> { ProposalParameters { - voting_period: T::BlockNumber::from(72000u32), - grace_period: T::BlockNumber::from(72000u32), + voting_period: >::runtime_upgrade_proposal_voting_period(), + grace_period: >::runtime_upgrade_proposal_grace_period(), approval_quorum_percentage: 80, approval_threshold_percentage: 100, slashing_quorum_percentage: 60, @@ -31,8 +31,8 @@ pub(crate) fn runtime_upgrade_proposal( // Proposal parameters for the text proposal pub(crate) fn text_proposal() -> ProposalParameters> { ProposalParameters { - voting_period: T::BlockNumber::from(72000u32), - grace_period: T::BlockNumber::from(0u32), + voting_period: >::text_proposal_voting_period(), + grace_period: >::text_proposal_grace_period(), approval_quorum_percentage: 66, approval_threshold_percentage: 80, slashing_quorum_percentage: 60, @@ -45,8 +45,8 @@ pub(crate) fn text_proposal() -> ProposalParameters( ) -> ProposalParameters> { ProposalParameters { - voting_period: T::BlockNumber::from(72000u32), - grace_period: T::BlockNumber::from(201601u32), + voting_period: >::set_election_parameters_proposal_voting_period(), + grace_period: >::set_election_parameters_proposal_grace_period(), approval_quorum_percentage: 66, approval_threshold_percentage: 80, slashing_quorum_percentage: 60, @@ -59,8 +59,8 @@ pub(crate) fn set_election_parameters_proposal( pub(crate) fn set_content_working_group_mint_capacity_proposal( ) -> ProposalParameters> { ProposalParameters { - voting_period: T::BlockNumber::from(43200u32), - grace_period: T::BlockNumber::from(0u32), + voting_period: >::set_content_working_group_mint_capacity_proposal_voting_period(), + grace_period: >::set_content_working_group_mint_capacity_proposal_grace_period(), approval_quorum_percentage: 50, approval_threshold_percentage: 75, slashing_quorum_percentage: 60, @@ -73,8 +73,8 @@ pub(crate) fn set_content_working_group_mint_capacity_proposal( pub(crate) fn spending_proposal( ) -> ProposalParameters> { ProposalParameters { - voting_period: T::BlockNumber::from(72000u32), - grace_period: T::BlockNumber::from(14400u32), + voting_period: >::spending_proposal_voting_period(), + grace_period: >::spending_proposal_grace_period(), approval_quorum_percentage: 66, approval_threshold_percentage: 80, slashing_quorum_percentage: 60, @@ -87,8 +87,8 @@ pub(crate) fn spending_proposal( pub(crate) fn set_lead_proposal( ) -> ProposalParameters> { ProposalParameters { - voting_period: T::BlockNumber::from(43200u32), - grace_period: T::BlockNumber::from(0u32), + voting_period: >::set_lead_proposal_voting_period(), + grace_period: >::set_lead_proposal_grace_period(), approval_quorum_percentage: 66, approval_threshold_percentage: 80, slashing_quorum_percentage: 60, @@ -101,8 +101,8 @@ pub(crate) fn set_lead_proposal( pub(crate) fn evict_storage_provider_proposal( ) -> ProposalParameters> { ProposalParameters { - voting_period: T::BlockNumber::from(43200u32), - grace_period: T::BlockNumber::from(0u32), + voting_period: >::evict_storage_provider_proposal_voting_period(), + grace_period: >::evict_storage_provider_proposal_grace_period(), approval_quorum_percentage: 50, approval_threshold_percentage: 75, slashing_quorum_percentage: 60, @@ -115,8 +115,8 @@ pub(crate) fn evict_storage_provider_proposal( pub(crate) fn set_storage_role_parameters_proposal( ) -> ProposalParameters> { ProposalParameters { - voting_period: T::BlockNumber::from(43200u32), - grace_period: T::BlockNumber::from(14400u32), + voting_period: >::set_storage_role_parameters_proposal_voting_period(), + grace_period: >::set_storage_role_parameters_proposal_grace_period(), approval_quorum_percentage: 75, approval_threshold_percentage: 80, slashing_quorum_percentage: 60, From d813046301fa881c9cab1256baa3961410664607 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 21 Apr 2020 13:58:09 +0300 Subject: [PATCH 223/286] Apply cargo fmt --- node/src/chain_spec.rs | 44 +++++++++---------- .../codex/src/proposal_types/parameters.rs | 15 ++++--- 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/node/src/chain_spec.rs b/node/src/chain_spec.rs index c1027d4482..9fb1b8e160 100644 --- a/node/src/chain_spec.rs +++ b/node/src/chain_spec.rs @@ -19,8 +19,8 @@ use node_runtime::{ AuthorityDiscoveryConfig, BabeConfig, Balance, BalancesConfig, ContentWorkingGroupConfig, CouncilConfig, CouncilElectionConfig, DataObjectStorageRegistryConfig, DataObjectTypeRegistryConfig, ElectionParameters, GrandpaConfig, ImOnlineConfig, IndicesConfig, - MembersConfig, Perbill, SessionConfig, SessionKeys, Signature, StakerStatus, StakingConfig, - SudoConfig, SystemConfig, VersionedStoreConfig, DAYS, WASM_BINARY, ProposalsCodexConfig + MembersConfig, Perbill, ProposalsCodexConfig, SessionConfig, SessionKeys, Signature, + StakerStatus, StakingConfig, SudoConfig, SystemConfig, VersionedStoreConfig, DAYS, WASM_BINARY, }; pub use node_runtime::{AccountId, GenesisConfig}; use primitives::{sr25519, Pair, Public}; @@ -297,25 +297,25 @@ pub fn testnet_genesis( channel_banner_constraint: crate::forum_config::new_validation(5, 1024), channel_title_constraint: crate::forum_config::new_validation(5, 1024), }), - proposals_codex : Some(ProposalsCodexConfig { - set_validator_count_proposal_voting_period : 43200u32, - set_validator_count_proposal_grace_period : 0u32, - runtime_upgrade_proposal_voting_period : 72000u32, - runtime_upgrade_proposal_grace_period : 72000u32, - text_proposal_voting_period : 72000u32, - text_proposal_grace_period : 0u32, - set_election_parameters_proposal_voting_period : 72000u32, - set_election_parameters_proposal_grace_period : 201601u32, - set_content_working_group_mint_capacity_proposal_voting_period : 43200u32, - set_content_working_group_mint_capacity_proposal_grace_period : 0u32, - set_lead_proposal_voting_period : 43200u32, - set_lead_proposal_grace_period : 0u32, - spending_proposal_voting_period : 72000u32, - spending_proposal_grace_period : 14400u32, - evict_storage_provider_proposal_voting_period : 43200u32, - evict_storage_provider_proposal_grace_period : 0u32, - set_storage_role_parameters_proposal_voting_period : 43200u32, - set_storage_role_parameters_proposal_grace_period : 14400u32, - }) + proposals_codex: Some(ProposalsCodexConfig { + set_validator_count_proposal_voting_period: 43200u32, + set_validator_count_proposal_grace_period: 0u32, + runtime_upgrade_proposal_voting_period: 72000u32, + runtime_upgrade_proposal_grace_period: 72000u32, + text_proposal_voting_period: 72000u32, + text_proposal_grace_period: 0u32, + set_election_parameters_proposal_voting_period: 72000u32, + set_election_parameters_proposal_grace_period: 201601u32, + set_content_working_group_mint_capacity_proposal_voting_period: 43200u32, + set_content_working_group_mint_capacity_proposal_grace_period: 0u32, + set_lead_proposal_voting_period: 43200u32, + set_lead_proposal_grace_period: 0u32, + spending_proposal_voting_period: 72000u32, + spending_proposal_grace_period: 14400u32, + evict_storage_provider_proposal_voting_period: 43200u32, + evict_storage_provider_proposal_grace_period: 0u32, + set_storage_role_parameters_proposal_voting_period: 43200u32, + set_storage_role_parameters_proposal_grace_period: 14400u32, + }), } } diff --git a/runtime-modules/proposals/codex/src/proposal_types/parameters.rs b/runtime-modules/proposals/codex/src/proposal_types/parameters.rs index d79fdbb2de..72b07169c7 100644 --- a/runtime-modules/proposals/codex/src/proposal_types/parameters.rs +++ b/runtime-modules/proposals/codex/src/proposal_types/parameters.rs @@ -1,4 +1,4 @@ -use crate::{get_required_stake_by_fraction, BalanceOf, ProposalParameters, Module}; +use crate::{get_required_stake_by_fraction, BalanceOf, Module, ProposalParameters}; // Proposal parameters for the 'Set validator count' proposal pub(crate) fn set_validator_count_proposal( @@ -45,7 +45,7 @@ pub(crate) fn text_proposal() -> ProposalParameters( ) -> ProposalParameters> { ProposalParameters { - voting_period: >::set_election_parameters_proposal_voting_period(), + voting_period: >::set_election_parameters_proposal_voting_period(), grace_period: >::set_election_parameters_proposal_grace_period(), approval_quorum_percentage: 66, approval_threshold_percentage: 80, @@ -59,7 +59,8 @@ pub(crate) fn set_election_parameters_proposal( pub(crate) fn set_content_working_group_mint_capacity_proposal( ) -> ProposalParameters> { ProposalParameters { - voting_period: >::set_content_working_group_mint_capacity_proposal_voting_period(), + voting_period: >::set_content_working_group_mint_capacity_proposal_voting_period( + ), grace_period: >::set_content_working_group_mint_capacity_proposal_grace_period(), approval_quorum_percentage: 50, approval_threshold_percentage: 75, @@ -73,7 +74,7 @@ pub(crate) fn set_content_working_group_mint_capacity_proposal( pub(crate) fn spending_proposal( ) -> ProposalParameters> { ProposalParameters { - voting_period: >::spending_proposal_voting_period(), + voting_period: >::spending_proposal_voting_period(), grace_period: >::spending_proposal_grace_period(), approval_quorum_percentage: 66, approval_threshold_percentage: 80, @@ -87,7 +88,7 @@ pub(crate) fn spending_proposal( pub(crate) fn set_lead_proposal( ) -> ProposalParameters> { ProposalParameters { - voting_period: >::set_lead_proposal_voting_period(), + voting_period: >::set_lead_proposal_voting_period(), grace_period: >::set_lead_proposal_grace_period(), approval_quorum_percentage: 66, approval_threshold_percentage: 80, @@ -101,7 +102,7 @@ pub(crate) fn set_lead_proposal( pub(crate) fn evict_storage_provider_proposal( ) -> ProposalParameters> { ProposalParameters { - voting_period: >::evict_storage_provider_proposal_voting_period(), + voting_period: >::evict_storage_provider_proposal_voting_period(), grace_period: >::evict_storage_provider_proposal_grace_period(), approval_quorum_percentage: 50, approval_threshold_percentage: 75, @@ -115,7 +116,7 @@ pub(crate) fn evict_storage_provider_proposal( pub(crate) fn set_storage_role_parameters_proposal( ) -> ProposalParameters> { ProposalParameters { - voting_period: >::set_storage_role_parameters_proposal_voting_period(), + voting_period: >::set_storage_role_parameters_proposal_voting_period(), grace_period: >::set_storage_role_parameters_proposal_grace_period(), approval_quorum_percentage: 75, approval_threshold_percentage: 80, From 83314de6cc1a17575d39f92f2b0d8f52b1c6c245 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 21 Apr 2020 11:36:52 +0300 Subject: [PATCH 224/286] Add clippy linter fixes --- Cargo.lock | 2 +- .../content-working-group/src/lib.rs | 92 +++--- runtime-modules/forum/src/lib.rs | 266 ++---------------- runtime-modules/forum/src/mock.rs | 8 +- runtime-modules/governance/src/election.rs | 12 +- runtime-modules/membership/src/members.rs | 28 +- runtime-modules/membership/src/role_types.rs | 2 + runtime-modules/roles/src/actors.rs | 15 +- .../service-discovery/src/discovery.rs | 2 +- runtime-modules/stake/src/lib.rs | 21 +- runtime-modules/stake/src/tests.rs | 14 +- runtime-modules/storage/src/data_directory.rs | 10 +- .../src/data_object_storage_registry.rs | 10 +- .../storage/src/data_object_type_registry.rs | 2 +- runtime-modules/token-minting/src/lib.rs | 15 +- runtime-modules/token-minting/src/mint.rs | 2 +- .../versioned-store/src/example.rs | 2 +- runtime-modules/versioned-store/src/lib.rs | 14 +- runtime-modules/versioned-store/src/mock.rs | 2 +- runtime/Cargo.toml | 2 +- 20 files changed, 160 insertions(+), 361 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8f24c1d188..33a8d26101 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1614,7 +1614,7 @@ dependencies = [ [[package]] name = "joystream-node-runtime" -version = "6.12.0" +version = "6.12.1" dependencies = [ "parity-scale-codec", "safe-mix", diff --git a/runtime-modules/content-working-group/src/lib.rs b/runtime-modules/content-working-group/src/lib.rs index 61d17d04de..903bd612ed 100755 --- a/runtime-modules/content-working-group/src/lib.rs +++ b/runtime-modules/content-working-group/src/lib.rs @@ -1308,14 +1308,14 @@ decl_module! { Self::update_channel( &channel_id, - &None, // verified + None, // verified &new_handle, &new_title, &new_description, &new_avatar, &new_banner, - &new_publication_status, - &None // curation_status + new_publication_status, + None // curation_status ); } @@ -1337,14 +1337,14 @@ decl_module! { Self::update_channel( &channel_id, - &new_verified, + new_verified, &None, // handle &None, // title &None, // description, &None, // avatar &None, // banner - &None, // publication_status - &new_curation_status + None, // publication_status + new_curation_status ); } @@ -1464,7 +1464,7 @@ decl_module! { let successful_iter = successful_curator_application_ids .iter() // recover curator application from id - .map(|curator_application_id| { Self::ensure_curator_application_exists(curator_application_id) }) + .map(|curator_application_id| { Self::ensure_curator_application_exists(curator_application_id)}) // remove Err cases, i.e. non-existing applications .filter_map(|result| result.ok()); @@ -1474,8 +1474,7 @@ decl_module! { // Ensure all curator applications exist let number_of_successful_applications = successful_iter .clone() - .collect::>() - .len(); + .count(); ensure!( number_of_successful_applications == num_provided_successful_curator_application_ids, @@ -1493,7 +1492,7 @@ decl_module! { .clone() .map(|(successful_curator_application, _, _)| successful_curator_application.member_id) .filter_map(|successful_member_id| Self::ensure_can_register_curator_role_on_member(&successful_member_id).ok() ) - .collect::>().len(); + .count(); ensure!( num_successful_applications_that_can_register_as_curator == num_provided_successful_curator_application_ids, @@ -2064,7 +2063,7 @@ impl Module { // Construct lead let new_lead = Lead { - role_account: role_account.clone(), + role_account, reward_relationship: None, inducted: >::block_number(), stage: LeadRoleState::Active, @@ -2256,7 +2255,7 @@ impl Module { } } - fn ensure_curator_application_text_is_valid(text: &Vec) -> dispatch::Result { + fn ensure_curator_application_text_is_valid(text: &[u8]) -> dispatch::Result { CuratorApplicationHumanReadableText::get().ensure_valid( text.len(), MSG_CURATOR_APPLICATION_TEXT_TOO_SHORT, @@ -2264,7 +2263,7 @@ impl Module { ) } - fn ensure_curator_exit_rationale_text_is_valid(text: &Vec) -> dispatch::Result { + fn ensure_curator_exit_rationale_text_is_valid(text: &[u8]) -> dispatch::Result { CuratorExitRationaleText::get().ensure_valid( text.len(), MSG_CURATOR_EXIT_RATIONALE_TEXT_TOO_SHORT, @@ -2272,7 +2271,7 @@ impl Module { ) } - fn ensure_opening_human_readable_text_is_valid(text: &Vec) -> dispatch::Result { + fn ensure_opening_human_readable_text_is_valid(text: &[u8]) -> dispatch::Result { OpeningHumanReadableText::get().ensure_valid( text.len(), MSG_CHANNEL_DESCRIPTION_TOO_SHORT, @@ -2540,7 +2539,7 @@ impl Module { Ok(( curator_application, - curator_application_id.clone(), + *curator_application_id, curator_opening, )) } @@ -2647,14 +2646,14 @@ impl Module { { // Attempt to deactivate recurringrewards::Module::::try_to_deactivate_relationship(*reward_relationship_id) - .expect("Relatioship must exist") + .expect("Relationship must exist") } else { // Did not deactivate, there was no reward relationship! false }; - // When the curator is staked, unstaking must first be initated, - // otherwise they can be terminted right away. + // When the curator is staked, unstaking must first be initaated, + // otherwise they can be terminated right away. // Create exit summary for this termination let current_block = >::block_number(); @@ -2663,34 +2662,31 @@ impl Module { CuratorExitSummary::new(exit_initiation_origin, ¤t_block, rationale_text); // Determine new curator stage and event to emit - let (new_curator_stage, unstake_directions, event) = - if let Some(ref stake_profile) = curator.role_stake_profile { - // Determine unstaknig period based on who initiated deactivation - let unstaking_period = match curator_exit_summary.origin { - CuratorExitInitiationOrigin::Lead => stake_profile.termination_unstaking_period, - CuratorExitInitiationOrigin::Curator => stake_profile.exit_unstaking_period, - }; - - ( - CuratorRoleStage::Unstaking(curator_exit_summary), - Some((stake_profile.stake_id.clone(), unstaking_period)), - RawEvent::CuratorUnstaking(curator_id.clone()), - ) - } else { - ( - CuratorRoleStage::Exited(curator_exit_summary.clone()), - None, - match curator_exit_summary.origin { - CuratorExitInitiationOrigin::Lead => { - RawEvent::TerminatedCurator(curator_id.clone()) - } - CuratorExitInitiationOrigin::Curator => { - RawEvent::CuratorExited(curator_id.clone()) - } - }, - ) + let (new_curator_stage, unstake_directions, event) = if let Some(ref stake_profile) = + curator.role_stake_profile + { + // Determine unstaknig period based on who initiated deactivation + let unstaking_period = match curator_exit_summary.origin { + CuratorExitInitiationOrigin::Lead => stake_profile.termination_unstaking_period, + CuratorExitInitiationOrigin::Curator => stake_profile.exit_unstaking_period, }; + ( + CuratorRoleStage::Unstaking(curator_exit_summary), + Some((stake_profile.stake_id, unstaking_period)), + RawEvent::CuratorUnstaking(*curator_id), + ) + } else { + ( + CuratorRoleStage::Exited(curator_exit_summary.clone()), + None, + match curator_exit_summary.origin { + CuratorExitInitiationOrigin::Lead => RawEvent::TerminatedCurator(*curator_id), + CuratorExitInitiationOrigin::Curator => RawEvent::CuratorExited(*curator_id), + }, + ) + }; + // Update curator let new_curator = Curator { stage: new_curator_stage, @@ -2702,7 +2698,7 @@ impl Module { // Unstake if directions provided if let Some(directions) = unstake_directions { // Keep track of curator unstaking - let unstaker = WorkingGroupUnstaker::Curator(curator_id.clone()); + let unstaker = WorkingGroupUnstaker::Curator(*curator_id); UnstakerByStakeId::::insert(directions.0, unstaker); // Unstake @@ -2731,14 +2727,14 @@ impl Module { fn update_channel( channel_id: &ChannelId, - new_verified: &Option, + new_verified: Option, new_handle: &Option>, new_title: &Option, new_description: &Option, new_avatar: &Option, new_banner: &Option, - new_publication_status: &Option, - new_curation_status: &Option, + new_publication_status: Option, + new_curation_status: Option, ) { // Update channel id to handle mapping, if there is a new handle. if let Some(ref handle) = new_handle { diff --git a/runtime-modules/forum/src/lib.rs b/runtime-modules/forum/src/lib.rs index dde4c88f17..d379d1c86d 100755 --- a/runtime-modules/forum/src/lib.rs +++ b/runtime-modules/forum/src/lib.rs @@ -1,216 +1,10 @@ -// Copyright 2017-2019 Parity Technologies (UK) Ltd. - -// This is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License -// along with Substrate. If not, see . - -// Copyright 2019 Joystream Contributors - -//! # Runtime Example Module -//! -//! -//! The Example: A simple example of a runtime module demonstrating -//! concepts, APIs and structures common to most runtime modules. -//! -//! Run `cargo doc --package runtime-example-module --open` to view this module's documentation. -//! -//! ### Documentation Template:
-//! Add heading with custom module name -//! -//! # Module -//! -//! Add simple description -//! -//! Include the following links that shows what trait needs to be implemented to use the module -//! and the supported dispatchables that are documented in the Call enum. -//! -//! - [`::Trait`](./trait.Trait.html) -//! - [`Call`](./enum.Call.html) -//! - [`Module`](./struct.Module.html) -//! -//! ## Overview -//! -//! -//! Short description of module purpose. -//! Links to Traits that should be implemented. -//! What this module is for. -//! What functionality the module provides. -//! When to use the module (use case examples). -//! How it is used. -//! Inputs it uses and the source of each input. -//! Outputs it produces. -//! -//! -//! -//! -//! ## Terminology -//! -//! Add terminology used in the custom module. Include concepts, storage items, or actions that you think -//! deserve to be noted to give context to the rest of the documentation or module usage. The author needs to -//! use some judgment about what is included. We don't want a list of every storage item nor types - the user -//! can go to the code for that. For example, "transfer fee" is obvious and should not be included, but -//! "free balance" and "reserved balance" should be noted to give context to the module. -//! Please do not link to outside resources. The reference docs should be the ultimate source of truth. -//! -//! -//! -//! ## Goals -//! -//! Add goals that the custom module is designed to achieve. -//! -//! -//! -//! ### Scenarios -//! -//! -//! -//! #### -//! -//! Describe requirements prior to interacting with the custom module. -//! Describe the process of interacting with the custom module for this scenario and public API functions used. -//! -//! ## Interface -//! -//! ### Supported Origins -//! -//! What origins are used and supported in this module (root, signed, inherent) -//! i.e. root when `ensure_root` used -//! i.e. inherent when `ensure_inherent` used -//! i.e. signed when `ensure_signed` used -//! -//! `inherent` -//! -//! -//! -//! -//! ### Types -//! -//! Type aliases. Include any associated types and where the user would typically define them. -//! -//! `ExampleType` -//! -//! -//! -//! -//! ### Dispatchable Functions -//! -//! -//! -//! // A brief description of dispatchable functions and a link to the rustdoc with their actual documentation. -//! -//! MUST have link to Call enum -//! MUST have origin information included in function doc -//! CAN have more info up to the user -//! -//! ### Public Functions -//! -//! -//! -//! A link to the rustdoc and any notes about usage in the module, not for specific functions. -//! For example, in the balances module: "Note that when using the publicly exposed functions, -//! you (the runtime developer) are responsible for implementing any necessary checks -//! (e.g. that the sender is the signer) before calling a function that will affect storage." -//! -//! -//! -//! It is up to the writer of the respective module (with respect to how much information to provide). -//! -//! #### Public Inspection functions - Immutable (getters) -//! -//! Insert a subheading for each getter function signature -//! -//! ##### `example_getter_name()` -//! -//! What it returns -//! Why, when, and how often to call it -//! When it could panic or error -//! When safety issues to consider -//! -//! #### Public Mutable functions (changing state) -//! -//! Insert a subheading for each setter function signature -//! -//! ##### `example_setter_name(origin, parameter_name: T::ExampleType)` -//! -//! What state it changes -//! Why, when, and how often to call it -//! When it could panic or error -//! When safety issues to consider -//! What parameter values are valid and why -//! -//! ### Storage Items -//! -//! Explain any storage items included in this module -//! -//! ### Digest Items -//! -//! Explain any digest items included in this module -//! -//! ### Inherent Data -//! -//! Explain what inherent data (if any) is defined in the module and any other related types -//! -//! ### Events: -//! -//! Insert events for this module if any -//! -//! ### Errors: -//! -//! Explain what generates errors -//! -//! ## Usage -//! -//! Insert 2-3 examples of usage and code snippets that show how to use module in a custom module. -//! -//! ### Prerequisites -//! -//! Show how to include necessary imports for and derive -//! your module configuration trait with the `INSERT_CUSTOM_MODULE_NAME` trait. -//! -//! ```rust -//! // use ; -//! -//! // pub trait Trait: ::Trait { } -//! ``` -//! -//! ### Simple Code Snippet -//! -//! Show a simple example (e.g. how to query a public getter function of ) -//! -//! ## Genesis Config -//! -//! -//! -//! ## Dependencies -//! -//! Dependencies on other SRML modules and the genesis config should be mentioned, -//! but not the Rust Standard Library. -//! Genesis configuration modifications that may be made to incorporate this module -//! Interaction with other modules -//! -//! -//! -//! ## Related Modules -//! -//! Interaction with other modules in the form of a bullet point list -//! -//! ## References -//! -//! -//! -//! Links to reference material, if applicable. For example, Phragmen, W3F research, etc. -//! that the implementation is based on. - // Ensure we're `no_std` when compiling for Wasm. #![cfg_attr(not(feature = "std"), no_std)] #[cfg(feature = "std")] use serde_derive::{Deserialize, Serialize}; +use rstd::borrow::ToOwned; use rstd::prelude::*; use codec::{Decode, Encode}; @@ -633,7 +427,7 @@ decl_module! { */ // Hold on to old value - let old_forum_sudo = >::get().clone(); + let old_forum_sudo = >::get(); // Update forum sudo match new_forum_sudo.clone() { @@ -703,8 +497,8 @@ decl_module! { // Create new category let new_category = Category { id : next_category_id, - title : title.clone(), - description: description.clone(), + title, + description, created_at : Self::current_block_and_time(), deleted: false, archived: false, @@ -753,7 +547,7 @@ decl_module! { // We must skip checking category itself. // NB: This is kind of hacky way to avoid last element, // something clearn can be done later. - let mut path_to_check = category_tree_path.clone(); + let mut path_to_check = category_tree_path; path_to_check.remove(0); Self::ensure_can_mutate_in_path_leaf(&path_to_check)?; @@ -843,7 +637,7 @@ decl_module! { Self::ensure_is_forum_sudo(&who)?; // Get thread - let mut thread = Self::ensure_thread_exists(&thread_id)?; + let mut thread = Self::ensure_thread_exists(thread_id)?; // Thread is not already moderated ensure!(thread.moderation.is_none(), ERROR_THREAD_ALREADY_MODERATED); @@ -867,7 +661,7 @@ decl_module! { thread.moderation = Some(ModerationAction { moderated_at: Self::current_block_and_time(), moderator_id: who, - rationale: rationale.clone() + rationale }); >::insert(thread_id, thread.clone()); @@ -901,7 +695,7 @@ decl_module! { Self::ensure_post_text_is_valid(&text)?; // Make sure thread exists and is mutable - let thread = Self::ensure_thread_is_mutable(&thread_id)?; + let thread = Self::ensure_thread_is_mutable(thread_id)?; // Get path from parent to root of category tree. let category_tree_path = Self::ensure_valid_category_and_build_category_tree_path(thread.category_id)?; @@ -939,7 +733,7 @@ decl_module! { Self::ensure_post_text_is_valid(&new_text)?; // Make sure there exists a mutable post with post id `post_id` - let post = Self::ensure_post_is_mutable(&post_id)?; + let post = Self::ensure_post_is_mutable(post_id)?; // Signer does not match creator of post with identifier postId ensure!(post.author_id == who, ERROR_ACCOUNT_DOES_NOT_MATCH_POST_AUTHOR); @@ -978,7 +772,7 @@ decl_module! { Self::ensure_is_forum_sudo(&who)?; // Make sure post exists and is mutable - let post = Self::ensure_post_is_mutable(&post_id)?; + let post = Self::ensure_post_is_mutable(post_id)?; Self::ensure_post_moderation_rationale_is_valid(&rationale)?; @@ -990,7 +784,7 @@ decl_module! { let moderation_action = ModerationAction{ moderated_at: Self::current_block_and_time(), moderator_id: who, - rationale: rationale.clone() + rationale }; >::mutate(post_id, |p| { @@ -1013,7 +807,7 @@ decl_module! { } impl Module { - fn ensure_category_title_is_valid(title: &Vec) -> dispatch::Result { + fn ensure_category_title_is_valid(title: &[u8]) -> dispatch::Result { CategoryTitleConstraint::get().ensure_valid( title.len(), ERROR_CATEGORY_TITLE_TOO_SHORT, @@ -1021,7 +815,7 @@ impl Module { ) } - fn ensure_category_description_is_valid(description: &Vec) -> dispatch::Result { + fn ensure_category_description_is_valid(description: &[u8]) -> dispatch::Result { CategoryDescriptionConstraint::get().ensure_valid( description.len(), ERROR_CATEGORY_DESCRIPTION_TOO_SHORT, @@ -1029,7 +823,7 @@ impl Module { ) } - fn ensure_thread_moderation_rationale_is_valid(rationale: &Vec) -> dispatch::Result { + fn ensure_thread_moderation_rationale_is_valid(rationale: &[u8]) -> dispatch::Result { ThreadModerationRationaleConstraint::get().ensure_valid( rationale.len(), ERROR_THREAD_MODERATION_RATIONALE_TOO_SHORT, @@ -1037,7 +831,7 @@ impl Module { ) } - fn ensure_thread_title_is_valid(title: &Vec) -> dispatch::Result { + fn ensure_thread_title_is_valid(title: &[u8]) -> dispatch::Result { ThreadTitleConstraint::get().ensure_valid( title.len(), ERROR_THREAD_TITLE_TOO_SHORT, @@ -1045,7 +839,7 @@ impl Module { ) } - fn ensure_post_text_is_valid(text: &Vec) -> dispatch::Result { + fn ensure_post_text_is_valid(text: &[u8]) -> dispatch::Result { PostTextConstraint::get().ensure_valid( text.len(), ERROR_POST_TEXT_TOO_SHORT, @@ -1053,7 +847,7 @@ impl Module { ) } - fn ensure_post_moderation_rationale_is_valid(rationale: &Vec) -> dispatch::Result { + fn ensure_post_moderation_rationale_is_valid(rationale: &[u8]) -> dispatch::Result { PostModerationRationaleConstraint::get().ensure_valid( rationale.len(), ERROR_POST_MODERATION_RATIONALE_TOO_SHORT, @@ -1069,7 +863,7 @@ impl Module { } fn ensure_post_is_mutable( - post_id: &PostId, + post_id: PostId, ) -> Result, &'static str> { // Make sure post exists let post = Self::ensure_post_exists(post_id)?; @@ -1078,13 +872,13 @@ impl Module { ensure!(post.moderation.is_none(), ERROR_POST_MODERATED); // and make sure thread is mutable - Self::ensure_thread_is_mutable(&post.thread_id)?; + Self::ensure_thread_is_mutable(post.thread_id)?; Ok(post) } fn ensure_post_exists( - post_id: &PostId, + post_id: PostId, ) -> Result, &'static str> { if >::exists(post_id) { Ok(>::get(post_id)) @@ -1094,10 +888,10 @@ impl Module { } fn ensure_thread_is_mutable( - thread_id: &ThreadId, + thread_id: ThreadId, ) -> Result, &'static str> { // Make sure thread exists - let thread = Self::ensure_thread_exists(&thread_id)?; + let thread = Self::ensure_thread_exists(thread_id)?; // and is unmoderated ensure!(thread.moderation.is_none(), ERROR_THREAD_MODERATED); @@ -1109,7 +903,7 @@ impl Module { } fn ensure_thread_exists( - thread_id: &ThreadId, + thread_id: ThreadId, ) -> Result, &'static str> { if >::exists(thread_id) { Ok(>::get(thread_id)) @@ -1194,7 +988,7 @@ impl Module { // Get path from parent to root of category tree. let category_tree_path = Self::build_category_tree_path(category_id); - assert!(category_tree_path.len() > 0); + assert!(!category_tree_path.is_empty()); Ok(category_tree_path) } @@ -1239,7 +1033,7 @@ impl Module { fn add_new_thread( category_id: CategoryId, - title: &Vec, + title: &[u8], author_id: &T::AccountId, ) -> Thread { // Get category @@ -1250,8 +1044,8 @@ impl Module { let new_thread = Thread { id: new_thread_id, - title: title.clone(), - category_id: category_id, + title: title.to_owned(), + category_id, nr_in_category: category.num_threads_created() + 1, moderation: None, num_unmoderated_posts: 0, @@ -1280,7 +1074,7 @@ impl Module { /// `thread_id` must be valid fn add_new_post( thread_id: ThreadId, - text: &Vec, + text: &[u8], author_id: &T::AccountId, ) -> Post { // Get thread @@ -1291,9 +1085,9 @@ impl Module { let new_post = Post { id: new_post_id, - thread_id: thread_id, + thread_id, nr_in_thread: thread.num_posts_ever_created() + 1, - current_text: text.clone(), + current_text: text.to_owned(), moderation: None, text_change_history: vec![], created_at: Self::current_block_and_time(), diff --git a/runtime-modules/forum/src/mock.rs b/runtime-modules/forum/src/mock.rs index 3c0144191d..38a5416ad6 100644 --- a/runtime-modules/forum/src/mock.rs +++ b/runtime-modules/forum/src/mock.rs @@ -484,12 +484,12 @@ pub fn genesis_config( ) -> GenesisConfig { GenesisConfig:: { category_by_id: category_by_id.clone(), - next_category_id: next_category_id, + next_category_id, thread_by_id: thread_by_id.clone(), - next_thread_id: next_thread_id, + next_thread_id, post_by_id: post_by_id.clone(), - next_post_id: next_post_id, - forum_sudo: forum_sudo, + next_post_id, + forum_sudo, category_title_constraint: category_title_constraint.clone(), category_description_constraint: category_description_constraint.clone(), thread_title_constraint: thread_title_constraint.clone(), diff --git a/runtime-modules/governance/src/election.rs b/runtime-modules/governance/src/election.rs index c8de43c912..248ba2c8f6 100644 --- a/runtime-modules/governance/src/election.rs +++ b/runtime-modules/governance/src/election.rs @@ -235,11 +235,11 @@ impl Module { fn start_election(current_council: Seats>) -> Result { ensure!(!Self::is_election_running(), "election already in progress"); ensure!( - Self::existing_stake_holders().len() == 0, + Self::existing_stake_holders().is_empty(), "stake holders must be empty" ); - ensure!(Self::applicants().len() == 0, "applicants must be empty"); - ensure!(Self::commitments().len() == 0, "commitments must be empty"); + ensure!(Self::applicants().is_empty(), "applicants must be empty"); + ensure!(Self::commitments().is_empty(), "commitments must be empty"); // Take snapshot of seat and backing stakes of an existing council // Its important to note that the election system takes ownership of these stakes, and is responsible @@ -663,7 +663,7 @@ impl Module { *transferable }; - *transferable = *transferable - transferred; + *transferable -= transferred; Stake { new: new_stake - transferred, @@ -699,7 +699,7 @@ impl Module { >::mutate(|applicants| applicants.insert(0, applicant.clone())); } - >::insert(applicant.clone(), total_stake); + >::insert(applicant, total_stake); Ok(()) } @@ -754,7 +754,7 @@ impl Module { "vote for non-applicant not allowed" ); - let mut salt = salt.clone(); + let mut salt = salt; // Tries to unseal, if salt is invalid will return error sealed_vote.unseal(vote_for, &mut salt, ::Hashing::hash)?; diff --git a/runtime-modules/membership/src/members.rs b/runtime-modules/membership/src/members.rs index bda32cac2a..f3a5d78cc6 100644 --- a/runtime-modules/membership/src/members.rs +++ b/runtime-modules/membership/src/members.rs @@ -1,7 +1,12 @@ +// Clippy linter requirement +#![allow(clippy::redundant_closure_call)] // disable it because of the substrate lib design +// example: pub PaidMembershipTermsById get(paid_membership_terms_by_id) build(|config: &GenesisConfig| {} + use codec::{Codec, Decode, Encode}; use common::currency::{BalanceOf, GovernanceCurrency}; use rstd::prelude::*; +use rstd::borrow::ToOwned; use sr_primitives::traits::{MaybeSerialize, Member, One, SimpleArithmetic}; use srml_support::traits::{Currency, Get}; use srml_support::{decl_event, decl_module, decl_storage, dispatch, ensure, Parameter}; @@ -252,7 +257,7 @@ decl_module! { let _ = T::Currency::slash(&who, terms.fee); let member_id = Self::insert_member(&who, &user_info, EntryMethod::Paid(paid_terms_id)); - Self::deposit_event(RawEvent::MemberRegistered(member_id, who.clone())); + Self::deposit_event(RawEvent::MemberRegistered(member_id, who)); } /// Change member's about text @@ -448,12 +453,13 @@ impl Module { Ok(terms) } + #[allow(clippy::ptr_arg)] // cannot change to the "&[u8]" suggested by clippy fn ensure_unique_handle(handle: &Vec) -> dispatch::Result { ensure!(!>::exists(handle), "handle already registered"); Ok(()) } - fn validate_handle(handle: &Vec) -> dispatch::Result { + fn validate_handle(handle: &[u8]) -> dispatch::Result { ensure!( handle.len() >= Self::min_handle_length() as usize, "handle too short" @@ -465,13 +471,13 @@ impl Module { Ok(()) } - fn validate_text(text: &Vec) -> Vec { - let mut text = text.clone(); + fn validate_text(text: &[u8]) -> Vec { + let mut text = text.to_owned(); text.truncate(Self::max_about_text_length() as usize); text } - fn validate_avatar(uri: &Vec) -> dispatch::Result { + fn validate_avatar(uri: &[u8]) -> dispatch::Result { ensure!( uri.len() <= Self::max_avatar_uri_length() as usize, "avatar uri too long" @@ -533,7 +539,7 @@ impl Module { new_member_id } - fn _change_member_about_text(id: T::MemberId, text: &Vec) -> dispatch::Result { + fn _change_member_about_text(id: T::MemberId, text: &[u8]) -> dispatch::Result { let mut profile = Self::ensure_profile(id)?; let text = Self::validate_text(text); profile.about = text; @@ -542,10 +548,10 @@ impl Module { Ok(()) } - fn _change_member_avatar(id: T::MemberId, uri: &Vec) -> dispatch::Result { + fn _change_member_avatar(id: T::MemberId, uri: &[u8]) -> dispatch::Result { let mut profile = Self::ensure_profile(id)?; Self::validate_avatar(uri)?; - profile.avatar_uri = uri.clone(); + profile.avatar_uri = uri.to_owned(); Self::deposit_event(RawEvent::MemberUpdatedAvatar(id)); >::insert(id, profile); Ok(()) @@ -593,7 +599,7 @@ impl Module { ensure_signed(origin).map_err(|_| MemberControllerAccountDidNotSign::UnsignedOrigin)?; // Ensure member exists - let profile = Self::ensure_profile(member_id.clone()) + let profile = Self::ensure_profile(*member_id) .map_err(|_| MemberControllerAccountDidNotSign::MemberIdInvalid)?; ensure!( @@ -609,7 +615,7 @@ impl Module { member_id: &T::MemberId, ) -> Result<(), MemberControllerAccountMismatch> { // Ensure member exists - let profile = Self::ensure_profile(member_id.clone()) + let profile = Self::ensure_profile(*member_id) .map_err(|_| MemberControllerAccountMismatch::MemberIdInvalid)?; ensure!( @@ -625,7 +631,7 @@ impl Module { member_id: &T::MemberId, ) -> Result<(), MemberRootAccountMismatch> { // Ensure member exists - let profile = Self::ensure_profile(member_id.clone()) + let profile = Self::ensure_profile(*member_id) .map_err(|_| MemberRootAccountMismatch::MemberIdInvalid)?; ensure!( diff --git a/runtime-modules/membership/src/role_types.rs b/runtime-modules/membership/src/role_types.rs index 25dd8c9938..01446006f7 100644 --- a/runtime-modules/membership/src/role_types.rs +++ b/runtime-modules/membership/src/role_types.rs @@ -1,3 +1,5 @@ +#![allow(clippy::new_without_default)] // disable because Default for enums doesn't make sense + use codec::{Decode, Encode}; use rstd::collections::btree_set::BTreeSet; use rstd::prelude::*; diff --git a/runtime-modules/roles/src/actors.rs b/runtime-modules/roles/src/actors.rs index d1771cd135..412d99773c 100644 --- a/runtime-modules/roles/src/actors.rs +++ b/runtime-modules/roles/src/actors.rs @@ -1,3 +1,7 @@ +// Clippy linter requirement +#![allow(clippy::redundant_closure_call)] // disable it because of the substrate lib design +// example: pub Parameters get(parameters) build(|config: &GenesisConfig| {..} + use codec::{Decode, Encode}; use common::currency::{BalanceOf, GovernanceCurrency}; use rstd::prelude::*; @@ -13,6 +17,7 @@ use serde::{Deserialize, Serialize}; pub use membership::members::Role; + const STAKING_ID: LockIdentifier = *b"role_stk"; #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] @@ -180,19 +185,19 @@ impl Module { fn remove_actor_from_service(actor_account: T::AccountId, role: Role, member_id: MemberId) { let accounts: Vec = Self::account_ids_by_role(role) .into_iter() - .filter(|account| !(*account == actor_account)) + .filter(|account| *account != actor_account) .collect(); >::insert(role, accounts); let accounts: Vec = Self::account_ids_by_member_id(&member_id) .into_iter() - .filter(|account| !(*account == actor_account)) + .filter(|account| *account != actor_account) .collect(); >::insert(&member_id, accounts); let accounts: Vec = Self::actor_account_ids() .into_iter() - .filter(|account| !(*account == actor_account)) + .filter(|account| *account != actor_account) .collect(); >::put(accounts); @@ -262,7 +267,7 @@ decl_module! { if let Some(params) = Self::parameters(role) { if !(now % params.reward_period == T::BlockNumber::zero()) { continue } let accounts = Self::account_ids_by_role(role); - for actor in accounts.into_iter().map(|account| Self::actor_by_account_id(account)) { + for actor in accounts.into_iter().map(Self::actor_by_account_id) { if let Some(actor) = actor { if now > actor.joined_at + params.reward_period { // reward can top up balance if it is below minimum stake requirement @@ -381,7 +386,7 @@ decl_module! { pub fn set_role_parameters(origin, role: Role, params: RoleParameters, T::BlockNumber>) { ensure_root(origin)?; - let new_stake = params.min_stake.clone(); + let new_stake = params.min_stake; >::insert(role, params); // Update locks for all actors in the role. The lock for each account is already until max_value // It doesn't affect actors which are unbonding, they should have already been removed from AccountIdsByRole diff --git a/runtime-modules/service-discovery/src/discovery.rs b/runtime-modules/service-discovery/src/discovery.rs index 9c662e782f..7a4a86f9cd 100644 --- a/runtime-modules/service-discovery/src/discovery.rs +++ b/runtime-modules/service-discovery/src/discovery.rs @@ -100,7 +100,7 @@ decl_module! { expires_at: >::block_number() + ttl, }); - Self::deposit_event(RawEvent::AccountInfoUpdated(sender.clone(), id.clone())); + Self::deposit_event(RawEvent::AccountInfoUpdated(sender, id)); } pub fn unset_ipns_id(origin) { diff --git a/runtime-modules/stake/src/lib.rs b/runtime-modules/stake/src/lib.rs index 4c3e38f6dd..4345b2342e 100755 --- a/runtime-modules/stake/src/lib.rs +++ b/runtime-modules/stake/src/lib.rs @@ -378,9 +378,9 @@ where Ok((stake_to_reduce, staked_state.staked_amount)) } - _ => return Err(DecreasingStakeError::CannotDecreaseStakeWhileUnstaking), + _ => Err(DecreasingStakeError::CannotDecreaseStakeWhileUnstaking), }, - _ => return Err(DecreasingStakeError::NotStaked), + _ => Err(DecreasingStakeError::NotStaked), } } @@ -463,11 +463,9 @@ where ); // pause Unstaking if unstaking is active - match staked_state.staked_status { - StakedStatus::Unstaking(ref mut unstaking_state) => { - unstaking_state.is_active = false; - } - _ => (), + if let StakedStatus::Unstaking(ref mut unstaking_state) = staked_state.staked_status + { + unstaking_state.is_active = false; } Ok(slash_id) @@ -523,11 +521,10 @@ where // unpause unstaking on last ongoing slash cancelled if staked_state.ongoing_slashes.is_empty() { - match staked_state.staked_status { - StakedStatus::Unstaking(ref mut unstaking_state) => { - unstaking_state.is_active = true; - } - _ => (), + if let StakedStatus::Unstaking(ref mut unstaking_state) = + staked_state.staked_status + { + unstaking_state.is_active = true; } } diff --git a/runtime-modules/stake/src/tests.rs b/runtime-modules/stake/src/tests.rs index aba815e838..daf23d7c49 100644 --- a/runtime-modules/stake/src/tests.rs +++ b/runtime-modules/stake/src/tests.rs @@ -321,7 +321,7 @@ fn decreasing_stake() { Stake { created: 0, staking_status: StakingStatus::Staked(StakedState { - staked_amount: staked_amount, + staked_amount, ongoing_slashes: BTreeMap::new(), next_slash_id: 0, staked_status: StakedStatus::Normal, @@ -379,7 +379,7 @@ fn initiating_pausing_resuming_cancelling_slashes() { Stake { created: System::block_number(), staking_status: StakingStatus::Staked(StakedState { - staked_amount: staked_amount, + staked_amount, ongoing_slashes: BTreeMap::new(), next_slash_id: 0, staked_status: StakedStatus::Unstaking(UnstakingState { @@ -413,7 +413,7 @@ fn initiating_pausing_resuming_cancelling_slashes() { Stake { created: System::block_number(), staking_status: StakingStatus::Staked(StakedState { - staked_amount: staked_amount, + staked_amount, ongoing_slashes: expected_ongoing_slashes.clone(), next_slash_id: slash_id + 1, staked_status: StakedStatus::Unstaking(UnstakingState { @@ -449,7 +449,7 @@ fn initiating_pausing_resuming_cancelling_slashes() { Stake { created: System::block_number(), staking_status: StakingStatus::Staked(StakedState { - staked_amount: staked_amount, + staked_amount, ongoing_slashes: expected_ongoing_slashes.clone(), next_slash_id: slash_id + 1, staked_status: StakedStatus::Unstaking(UnstakingState { @@ -485,7 +485,7 @@ fn initiating_pausing_resuming_cancelling_slashes() { Stake { created: System::block_number(), staking_status: StakingStatus::Staked(StakedState { - staked_amount: staked_amount, + staked_amount, ongoing_slashes: expected_ongoing_slashes.clone(), next_slash_id: slash_id + 1, staked_status: StakedStatus::Unstaking(UnstakingState { @@ -512,7 +512,7 @@ fn initiating_pausing_resuming_cancelling_slashes() { Stake { created: System::block_number(), staking_status: StakingStatus::Staked(StakedState { - staked_amount: staked_amount, + staked_amount, ongoing_slashes: BTreeMap::new(), next_slash_id: slash_id + 1, staked_status: StakedStatus::Unstaking(UnstakingState { @@ -545,7 +545,7 @@ fn initiating_pausing_resuming_cancelling_slashes() { Stake { created: System::block_number(), staking_status: StakingStatus::Staked(StakedState { - staked_amount: staked_amount, + staked_amount, ongoing_slashes: expected_ongoing_slashes.clone(), next_slash_id: slash_id + 1, staked_status: StakedStatus::Unstaking(UnstakingState { diff --git a/runtime-modules/storage/src/data_directory.rs b/runtime-modules/storage/src/data_directory.rs index a015eb2c55..536fe95280 100644 --- a/runtime-modules/storage/src/data_directory.rs +++ b/runtime-modules/storage/src/data_directory.rs @@ -145,9 +145,9 @@ decl_module! { size, added_at: Self::current_block_and_time(), owner: who.clone(), - liaison: liaison, + liaison, liaison_judgement: LiaisonJudgement::Pending, - ipfs_content_id: ipfs_content_id.clone(), + ipfs_content_id, }; >::insert(&content_id, data); @@ -157,7 +157,7 @@ decl_module! { // The LiaisonJudgement can be updated, but only by the liaison. fn accept_content(origin, content_id: T::ContentId) { let who = ensure_signed(origin)?; - Self::update_content_judgement(&who, content_id.clone(), LiaisonJudgement::Accepted)?; + Self::update_content_judgement(&who, content_id, LiaisonJudgement::Accepted)?; >::mutate(|ids| ids.push(content_id)); Self::deposit_event(RawEvent::ContentAccepted(content_id, who)); } @@ -198,11 +198,11 @@ decl_module! { impl ContentIdExists for Module { fn has_content(content_id: &T::ContentId) -> bool { - Self::data_object_by_content_id(content_id.clone()).is_some() + Self::data_object_by_content_id(*content_id).is_some() } fn get_data_object(content_id: &T::ContentId) -> Result, &'static str> { - match Self::data_object_by_content_id(content_id.clone()) { + match Self::data_object_by_content_id(*content_id) { Some(data) => Ok(data), None => Err(MSG_CID_NOT_FOUND), } diff --git a/runtime-modules/storage/src/data_object_storage_registry.rs b/runtime-modules/storage/src/data_object_storage_registry.rs index 18593478a6..b1ea0f5555 100644 --- a/runtime-modules/storage/src/data_object_storage_registry.rs +++ b/runtime-modules/storage/src/data_object_storage_registry.rs @@ -110,14 +110,14 @@ impl ContentHasStorage for Module { // TODO deprecated fn is_ready_at_storage_provider(which: &T::ContentId, provider: &T::AccountId) -> bool { let dosr_list = Self::relationships_by_content_id(which); - return dosr_list.iter().any(|&dosr_id| { + dosr_list.iter().any(|&dosr_id| { let res = Self::relationships(dosr_id); if res.is_none() { return false; } let dosr = res.unwrap(); dosr.storage_provider == *provider && dosr.ready - }); + }) } } @@ -138,7 +138,7 @@ decl_module! { // Create new ID, data. let new_id = Self::next_relationship_id(); let dosr: DataObjectStorageRelationship = DataObjectStorageRelationship { - content_id: cid.clone(), + content_id: cid, storage_provider: who.clone(), ready: false, }; @@ -148,9 +148,9 @@ decl_module! { // Also add the DOSR to the list of DOSRs for the CID. Uniqueness is guaranteed // by the map, so we can just append the new_id to the list. - let mut dosr_list = Self::relationships_by_content_id(cid.clone()); + let mut dosr_list = Self::relationships_by_content_id(cid); dosr_list.push(new_id); - >::insert(cid.clone(), dosr_list); + >::insert(cid, dosr_list); // Emit event Self::deposit_event(RawEvent::DataObjectStorageRelationshipAdded(new_id, cid, who)); diff --git a/runtime-modules/storage/src/data_object_type_registry.rs b/runtime-modules/storage/src/data_object_type_registry.rs index 498d968e6e..6fcc751a05 100644 --- a/runtime-modules/storage/src/data_object_type_registry.rs +++ b/runtime-modules/storage/src/data_object_type_registry.rs @@ -150,7 +150,7 @@ decl_module! { impl Module { fn ensure_data_object_type(id: T::DataObjectTypeId) -> Result { - return Self::data_object_types(&id).ok_or(MSG_DO_TYPE_NOT_FOUND); + Self::data_object_types(&id).ok_or(MSG_DO_TYPE_NOT_FOUND) } } diff --git a/runtime-modules/token-minting/src/lib.rs b/runtime-modules/token-minting/src/lib.rs index 20388f2fda..961bcfd53b 100755 --- a/runtime-modules/token-minting/src/lib.rs +++ b/runtime-modules/token-minting/src/lib.rs @@ -138,14 +138,13 @@ impl Module { // Ensure the next adjustment if set, is in the future if let Some(adjustment) = adjustment { - match adjustment { - Adjustment::IntervalAfterFirstAdjustmentAbsolute(_, first_adjustment_in) => { - ensure!( - first_adjustment_in > now, - GeneralError::NextAdjustmentInPast - ); - } - _ => (), + if let Adjustment::IntervalAfterFirstAdjustmentAbsolute(_, first_adjustment_in) = + adjustment + { + ensure!( + first_adjustment_in > now, + GeneralError::NextAdjustmentInPast + ); } } diff --git a/runtime-modules/token-minting/src/mint.rs b/runtime-modules/token-minting/src/mint.rs index 9e9443a512..9ec438a1bd 100644 --- a/runtime-modules/token-minting/src/mint.rs +++ b/runtime-modules/token-minting/src/mint.rs @@ -63,7 +63,7 @@ where capacity: initial_capacity, created_at: now, total_minted: Zero::zero(), - next_adjustment: next_adjustment, + next_adjustment, } } diff --git a/runtime-modules/versioned-store/src/example.rs b/runtime-modules/versioned-store/src/example.rs index a488213886..032d5ff4ab 100644 --- a/runtime-modules/versioned-store/src/example.rs +++ b/runtime-modules/versioned-store/src/example.rs @@ -516,7 +516,7 @@ impl PropHelper { fn next_value(&mut self, value: PropertyValue) -> ClassPropertyValue { let value = ClassPropertyValue { in_class_index: self.prop_idx, - value: value, + value, }; self.prop_idx += 1; value diff --git a/runtime-modules/versioned-store/src/lib.rs b/runtime-modules/versioned-store/src/lib.rs index 0b660d3fe3..44ba76242c 100755 --- a/runtime-modules/versioned-store/src/lib.rs +++ b/runtime-modules/versioned-store/src/lib.rs @@ -645,7 +645,7 @@ impl Module { Self::ensure_prop_value_matches_its_type(value.clone(), prop.clone())?; Self::ensure_valid_internal_prop(value.clone(), prop.clone())?; Self::validate_max_len_if_text_prop(value.clone(), prop.clone())?; - Self::validate_max_len_if_vec_prop(value.clone(), prop.clone())?; + Self::validate_max_len_if_vec_prop(value, prop)?; Ok(()) } @@ -674,7 +674,7 @@ impl Module { vec.len() <= max_len as usize } - fn validate_vec_len_ref(vec: &Vec, max_len: u16) -> bool { + fn validate_vec_len_ref(vec: &[T], max_len: u16) -> bool { vec.len() <= max_len as usize } @@ -702,7 +702,7 @@ impl Module { Self::ensure_known_class_id(class_id)?; if validate_vec_len_ref(&vec, vec_max_len) { for entity_id in vec.iter() { - Self::ensure_known_entity_id(entity_id.clone())?; + Self::ensure_known_entity_id(*entity_id)?; let entity = Self::entity_by_id(entity_id); ensure!(entity.class_id == class_id, ERROR_INTERNAL_RPOP_DOES_NOT_MATCH_ITS_CLASS); } @@ -775,7 +775,7 @@ impl Module { } } - pub fn ensure_property_name_is_valid(text: &Vec) -> dispatch::Result { + pub fn ensure_property_name_is_valid(text: &[u8]) -> dispatch::Result { PropertyNameConstraint::get().ensure_valid( text.len(), ERROR_PROPERTY_NAME_TOO_SHORT, @@ -783,7 +783,7 @@ impl Module { ) } - pub fn ensure_property_description_is_valid(text: &Vec) -> dispatch::Result { + pub fn ensure_property_description_is_valid(text: &[u8]) -> dispatch::Result { PropertyDescriptionConstraint::get().ensure_valid( text.len(), ERROR_PROPERTY_DESCRIPTION_TOO_SHORT, @@ -791,7 +791,7 @@ impl Module { ) } - pub fn ensure_class_name_is_valid(text: &Vec) -> dispatch::Result { + pub fn ensure_class_name_is_valid(text: &[u8]) -> dispatch::Result { ClassNameConstraint::get().ensure_valid( text.len(), ERROR_CLASS_NAME_TOO_SHORT, @@ -799,7 +799,7 @@ impl Module { ) } - pub fn ensure_class_description_is_valid(text: &Vec) -> dispatch::Result { + pub fn ensure_class_description_is_valid(text: &[u8]) -> dispatch::Result { ClassDescriptionConstraint::get().ensure_valid( text.len(), ERROR_CLASS_DESCRIPTION_TOO_SHORT, diff --git a/runtime-modules/versioned-store/src/mock.rs b/runtime-modules/versioned-store/src/mock.rs index b749453a0a..5bd79e3691 100644 --- a/runtime-modules/versioned-store/src/mock.rs +++ b/runtime-modules/versioned-store/src/mock.rs @@ -148,7 +148,7 @@ pub fn bool_prop_value() -> ClassPropertyValue { pub fn prop_value(index: u16, value: PropertyValue) -> ClassPropertyValue { ClassPropertyValue { in_class_index: index, - value: value, + value, } } diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 90d74ed9a1..53ddb45dff 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -5,7 +5,7 @@ edition = '2018' name = 'joystream-node-runtime' # Follow convention: https://github.com/Joystream/substrate-runtime-joystream/issues/1 # {Authoring}.{Spec}.{Impl} of the RuntimeVersion -version = '6.12.0' +version = '6.12.1' [features] default = ['std'] From 407a925a06920d328ff48ed084a9225504e5f332 Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Tue, 21 Apr 2020 17:40:35 +0400 Subject: [PATCH 225/286] migration: remainting steps --- .../content-working-group/src/lib.rs | 35 ++++- runtime-modules/governance/src/council.rs | 2 +- runtime-modules/governance/src/election.rs | 24 ++++ runtime/src/migration.rs | 121 ++++++++++++++++-- 4 files changed, 167 insertions(+), 15 deletions(-) diff --git a/runtime-modules/content-working-group/src/lib.rs b/runtime-modules/content-working-group/src/lib.rs index 9972ef0b55..eeabcabde3 100755 --- a/runtime-modules/content-working-group/src/lib.rs +++ b/runtime-modules/content-working-group/src/lib.rs @@ -290,6 +290,9 @@ pub enum CuratorExitInitiationOrigin { /// The curator exiting is the origin. Curator, + + /// The system is initiating exit of a curator + Root, } /// The exit stage of a curators involvement in the working group. @@ -1887,7 +1890,7 @@ decl_module! { origin, curator_id: CuratorId, rationale_text: Vec - ) { + ) { // Ensure lead is set and is origin signer Self::ensure_origin_is_set_lead(origin)?; @@ -1910,6 +1913,31 @@ decl_module! { ); } + /// Lead can terminate and active curator + pub fn terminate_curator_role_as_root( + origin, + curator_id: CuratorId, + rationale_text: Vec + ) { + + // Ensure origin is root + ensure_root(origin)?; + + // Ensuring curator actually exists and is active + let curator = Self::ensure_active_curator_exists(&curator_id)?; + + // + // == MUTATION SAFE == + // + + Self::deactivate_curator( + &curator_id, + &curator, + &CuratorExitInitiationOrigin::Root, + &rationale_text + ); + } + /// Replace the current lead. First unsets the active lead if there is one. /// If a value is provided for new_lead it will then set that new lead. /// It is responsibility of the caller to ensure the new lead can be set @@ -2669,6 +2697,7 @@ impl Module { let unstaking_period = match curator_exit_summary.origin { CuratorExitInitiationOrigin::Lead => stake_profile.termination_unstaking_period, CuratorExitInitiationOrigin::Curator => stake_profile.exit_unstaking_period, + CuratorExitInitiationOrigin::Root => stake_profile.termination_unstaking_period, }; ( @@ -2687,6 +2716,9 @@ impl Module { CuratorExitInitiationOrigin::Curator => { RawEvent::CuratorExited(curator_id.clone()) } + CuratorExitInitiationOrigin::Root => { + RawEvent::TerminatedCurator(curator_id.clone()) + } }, ) }; @@ -2837,6 +2869,7 @@ impl Module { let event = match curator_exit_summary.origin { CuratorExitInitiationOrigin::Lead => RawEvent::TerminatedCurator(curator_id), CuratorExitInitiationOrigin::Curator => RawEvent::CuratorExited(curator_id), + CuratorExitInitiationOrigin::Root => RawEvent::TerminatedCurator(curator_id), }; Self::deposit_event(event); diff --git a/runtime-modules/governance/src/council.rs b/runtime-modules/governance/src/council.rs index 21b84c60ed..e419d3ebdd 100644 --- a/runtime-modules/governance/src/council.rs +++ b/runtime-modules/governance/src/council.rs @@ -91,7 +91,7 @@ decl_module! { // Privileged methods /// Force set a zero staked council. Stakes in existing council will vanish into thin air! - fn set_council(origin, accounts: Vec) { + pub fn set_council(origin, accounts: Vec) { ensure_root(origin)?; let new_council: Seats> = accounts.into_iter().map(|account| { Seat { diff --git a/runtime-modules/governance/src/election.rs b/runtime-modules/governance/src/election.rs index ff3345b93a..9abfadf40b 100644 --- a/runtime-modules/governance/src/election.rs +++ b/runtime-modules/governance/src/election.rs @@ -215,6 +215,30 @@ impl Module { } } + pub fn stop_election_and_dissolve_council() -> Result { + // Stop running election + if Self::is_election_running() { + // cannot fail since we checked that election is running and we are using root + // origin. + Self::force_stop_election(system::RawOrigin::Root.into())?; + } + + // Return stakes from the council seat to their stake holders + Self::initialize_transferable_stakes(>::active_council()); + Self::unlock_transferable_stakes(); + Self::clear_transferable_stakes(); + + // Clear the council seats + // Cannot fail when passing root origin + council::Module::::set_council(system::RawOrigin::Root.into(), vec![])?; + council::TermEndsAt::::put(system::Module::::block_number()); + + // Start a new election after clearing the council + Self::start_election(vec![])?; + + Ok(()) + } + // PRIVATE MUTABLES /// Starts an election. Will fail if an election is already running diff --git a/runtime/src/migration.rs b/runtime/src/migration.rs index e3688e10d5..bc59f4794a 100644 --- a/runtime/src/migration.rs +++ b/runtime/src/migration.rs @@ -1,7 +1,8 @@ use crate::VERSION; +use common::currency::BalanceOf; +use rstd::prelude::*; use sr_primitives::{print, traits::Zero}; use srml_support::{debug, decl_event, decl_module, decl_storage}; -use sudo; use system; impl Module { @@ -20,26 +21,120 @@ impl Module { // Runtime Upgrade Code for going from Rome to Constantinople // Create the Council mint. If it fails, we can't do anything about it here. - let mint_creation_result = governance::council::Module::::create_new_council_mint( - minting::BalanceOf::::zero(), - ); + governance::council::Module::::create_new_council_mint(minting::BalanceOf::::zero()) + .err() + .map(|err| { + debug::warn!( + "Failed to create a mint for council during migration: {:?}", + err + ); + }); + + // Reset Council + governance::election::Module::::stop_election_and_dissolve_council() + .err() + .map(|err| { + debug::warn!("Failed to dissolve council during migration: {:?}", err); + }); - if mint_creation_result.is_err() { + // Reset working group mint capacity + content_working_group::Module::::set_mint_capacity( + system::RawOrigin::Root.into(), + minting::BalanceOf::::zero(), + ) + .err() + .map(|err| { debug::warn!( - "Failed to create a mint for council during migration: {:?}", - mint_creation_result + "Failed to reset mint for working group during migration: {:?}", + err ); + }); + + // Deactivate active curators + let termination_reason = "resetting curators".as_bytes().to_vec(); + + for (curator_id, ref curator) in content_working_group::CuratorById::::enumerate() { + // Skip non-active curators + if curator.stage != content_working_group::CuratorRoleStage::Active { + continue; + } + + content_working_group::Module::::terminate_curator_role_as_root( + system::RawOrigin::Root.into(), + curator_id, + termination_reason.clone(), + ) + .err() + .map(|err| { + debug::warn!( + "Failed to terminate curator {:?} during migration: {:?}", + curator_id, + err + ); + }); + } + + // Deactivate all storage providers, except Joystream providers (member id 0 in Rome runtime) + let joystream_providers = + roles::actors::AccountIdsByMemberId::::get(T::MemberId::from(0)); + + // Is there an intersect() like call to check if vector contains some elements from + // another vector?.. below implementation just seems + // silly to have to do in a filter predicate. + let storage_providers_to_remove: Vec = + roles::actors::Module::::actor_account_ids() + .into_iter() + .filter(|account| { + for provider in joystream_providers.as_slice() { + if *account == *provider { + return false; + } + } + return true; + }) + .collect(); + + for provider in storage_providers_to_remove { + roles::actors::Module::::remove_actor(system::RawOrigin::Root.into(), provider) + .err() + .map(|err| { + debug::warn!( + "Failed to remove storage provider during migration: {:?}", + err + ); + }); + } + + // Remove any pending storage entry requests, no stake is lost because only a fee is paid + // to make a request. + let no_requests: roles::actors::Requests = vec![]; + roles::actors::RoleEntryRequests::::put(no_requests); + + // Set Storage Role reward to zero + if let Some(parameters) = + roles::actors::Parameters::::get(roles::actors::Role::StorageProvider) + { + roles::actors::Module::::set_role_parameters( + system::RawOrigin::Root.into(), + roles::actors::Role::StorageProvider, + roles::actors::RoleParameters { + reward: BalanceOf::::zero(), + ..parameters + }, + ) + .err() + .map(|err| { + debug::warn!( + "Failed to set zero reward for storage role during migration: {:?}", + err + ); + }); } } } pub trait Trait: - system::Trait - + storage::data_directory::Trait - + storage::data_object_storage_registry::Trait - + forum::Trait - + sudo::Trait - + governance::council::Trait + system::Trait + governance::election::Trait + content_working_group::Trait + roles::actors::Trait { type Event: From> + Into<::Event>; } From cda9f4e1f168b3dd0aeec92a7739803824c1f6e6 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Wed, 22 Apr 2020 16:38:17 +0300 Subject: [PATCH 226/286] Add successful proposal execution test for the runtime --- runtime/src/test/proposals_integration.rs | 97 ++++++++++++++++++++--- 1 file changed, 88 insertions(+), 9 deletions(-) diff --git a/runtime/src/test/proposals_integration.rs b/runtime/src/test/proposals_integration.rs index 1e5939f56a..0854a0dc5c 100644 --- a/runtime/src/test/proposals_integration.rs +++ b/runtime/src/test/proposals_integration.rs @@ -2,15 +2,16 @@ #![cfg(test)] -use crate::{ProposalCancellationFee, Runtime}; +use crate::{BlockNumber, ProposalCancellationFee, Runtime}; use codec::Encode; use governance::election::CouncilElected; use membership::members; use proposals_engine::{ - ActiveStake, BalanceOf, Error, FinalizationData, Proposal, ProposalDecisionStatus, - ProposalParameters, ProposalStatus, VoteKind, VotersParameters, VotingResults, + ActiveStake, ApprovedProposalStatus, BalanceOf, Error, FinalizationData, Proposal, + ProposalDecisionStatus, ProposalParameters, ProposalStatus, VoteKind, VotersParameters, + VotingResults, }; -use sr_primitives::traits::DispatchResult; +use sr_primitives::traits::{DispatchResult, OnFinalize, OnInitialize}; use sr_primitives::AccountId32; use srml_support::traits::Currency; use srml_support::StorageLinkedMap; @@ -26,9 +27,11 @@ fn initial_test_ext() -> runtime_io::TestExternalities { t.into() } +type System = system::Module; type Membership = membership::members::Module; type ProposalsEngine = proposals_engine::Module; type Council = governance::council::Module; +type ProposalCodex = proposals_codex::Module; fn setup_members(count: u8) { let authority_account_id = ::AccountId::default(); @@ -71,6 +74,30 @@ fn setup_council() { .is_ok()); } +pub(crate) fn increase_total_balance_issuance_using_account_id( + account_id: AccountId32, + balance: u128, +) { + type Balances = balances::Module; + let initial_balance = Balances::total_issuance(); + { + let _ = ::Currency::deposit_creating(&account_id, balance); + } + assert_eq!(Balances::total_issuance(), initial_balance + balance); +} + +// Recommendation from Parity on testing on_finalize +// https://substrate.dev/docs/en/next/development/module/tests +fn run_to_block(n: BlockNumber) { + while System::block_number() < n { + >::on_finalize(System::block_number()); + >::on_finalize(System::block_number()); + System::set_block_number(System::block_number() + 1); + >::on_initialize(System::block_number()); + >::on_initialize(System::block_number()); + } +} + struct VoteGenerator { proposal_id: u32, current_account_id: AccountId32, @@ -129,11 +156,8 @@ impl Default for DummyProposalFixture { fn default() -> Self { let title = b"title".to_vec(); let description = b"description".to_vec(); - let dummy_proposal = proposals_codex::Call::::execute_text_proposal( - title.clone(), - description.clone(), - b"text".to_vec(), - ); + let dummy_proposal = + proposals_codex::Call::::execute_text_proposal(b"text".to_vec()); DummyProposalFixture { parameters: ProposalParameters { @@ -365,3 +389,58 @@ fn proposal_reset_succeeds() { assert_eq!(CouncilManager::::total_voters_count(), 0); }); } + +#[test] +fn text_proposal_execution_succeeds() { + initial_test_ext().execute_with(|| { + setup_members(7); + setup_council(); + + println!("{}", CouncilManager::::total_voters_count()); + + let member_id = 1; + let account_id: [u8; 32] = [member_id; 32]; + increase_total_balance_issuance_using_account_id(account_id.clone().into(), 500000); + + assert_eq!( + ProposalCodex::create_text_proposal( + RawOrigin::Signed(account_id.into()).into(), + member_id as u64, + b"title".to_vec(), + b"body".to_vec(), + Some(>::from(1250u32)), + b"text".to_vec(), + ), + Ok(()) + ); + + let proposal_id = 1; + + let mut vote_generator = VoteGenerator::new(proposal_id); + vote_generator.vote_and_assert_ok(VoteKind::Approve); + vote_generator.vote_and_assert_ok(VoteKind::Approve); + vote_generator.vote_and_assert_ok(VoteKind::Approve); + vote_generator.vote_and_assert_ok(VoteKind::Approve); + vote_generator.vote_and_assert_ok(VoteKind::Approve); + + run_to_block(2); + + let proposal = ProposalsEngine::proposals(proposal_id); + + assert_eq!( + proposal, + Proposal { + status: ProposalStatus::approved(ApprovedProposalStatus::Executed, 1), + title: b"title".to_vec(), + description: b"body".to_vec(), + voting_results: VotingResults { + abstentions: 0, + approvals: 5, + rejections: 0, + slashes: 0, + }, + ..proposal + } + ); + }); +} From d1198de695f80c5d8770403c0e64f807720165a1 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Wed, 22 Apr 2020 16:39:40 +0300 Subject: [PATCH 227/286] Introduce ProposalEncoder to the proposals system - add proposal encoder to the runtime - modify codes to support proposal encoder - temporay disable proposals except text proposal --- runtime-modules/proposals/codex/src/lib.rs | 45 +++++++++----- .../codex/src/proposal_types/parameters.rs | 59 ++++++++++--------- runtime/src/integration/proposals/mod.rs | 2 + .../integration/proposals/proposal_encoder.rs | 25 ++++++++ runtime/src/lib.rs | 3 +- 5 files changed, 88 insertions(+), 46 deletions(-) create mode 100644 runtime/src/integration/proposals/proposal_encoder.rs diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index d2e6edab4a..4020247ef4 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -42,8 +42,9 @@ // #![warn(missing_docs)] mod proposal_types; -#[cfg(test)] -mod tests; + +// #[cfg(test)] +// mod tests; use codec::Encode; use common::origin_validator::ActorOriginValidator; @@ -70,6 +71,18 @@ pub use proposal_types::ProposalDetails; // proposal max balance percentage. const COUNCIL_MINT_MAX_BALANCE_PERCENT: u32 = 2; +pub trait ProposalEncoder { + fn encode_proposal( + proposal_details: ProposalDetails< + BalanceOfMint, + BalanceOfGovernanceCurrency, + T::BlockNumber, + T::AccountId, + MemberId, + >, + ) -> Vec; +} + /// 'Proposals codex' substrate module Trait pub trait Trait: system::Trait @@ -93,6 +106,8 @@ pub trait Trait: MemberId, Self::AccountId, >; + + type ProposalEncoder: ProposalEncoder; } /// Balance alias for `stake` module @@ -341,8 +356,8 @@ decl_module! { Error::TextProposalSizeExceeded); let proposal_parameters = proposal_types::parameters::text_proposal::(); - let proposal_code = - >::execute_text_proposal(title.clone(), description.clone(), text.clone()); + let proposal_details = ProposalDetails::, BalanceOfGovernanceCurrency, T::BlockNumber, T::AccountId, MemberId>::Text(text); + let proposal_code = T::ProposalEncoder::encode_proposal(proposal_details.clone()); Self::create_proposal( origin, @@ -350,12 +365,12 @@ decl_module! { title, description, stake_balance, - proposal_code.encode(), + proposal_code, proposal_parameters, - ProposalDetails::Text(text), + proposal_details, )?; } - +/* /// Create 'Runtime upgrade' proposal type. Runtime upgrade can be initiated only by /// members from the hardcoded list `RuntimeUpgradeProposalAllowedProposers` pub fn create_runtime_upgrade_proposal( @@ -637,27 +652,25 @@ decl_module! { ProposalDetails::SetStorageRoleParameters(role_parameters), )?; } - +*/ // *************** Extrinsic to execute /// Text proposal extrinsic. Should be used as callable object to pass to the `engine` module. - fn execute_text_proposal( + pub fn execute_text_proposal( origin, - title: Vec, - _description: Vec, - _text: Vec, + text: Vec, ) { ensure_root(origin)?; print("Text proposal: "); - let title_string_result = from_utf8(title.as_slice()); - if let Ok(title_string) = title_string_result{ - print(title_string); + let text_string_result = from_utf8(text.as_slice()); + if let Ok(text_string) = text_string_result{ + print(text_string); } } /// Runtime upgrade proposal extrinsic. /// Should be used as callable object to pass to the `engine` module. - fn execute_runtime_upgrade_proposal( + pub fn execute_runtime_upgrade_proposal( origin, title: Vec, _description: Vec, diff --git a/runtime-modules/proposals/codex/src/proposal_types/parameters.rs b/runtime-modules/proposals/codex/src/proposal_types/parameters.rs index 72b07169c7..83af0d20c0 100644 --- a/runtime-modules/proposals/codex/src/proposal_types/parameters.rs +++ b/runtime-modules/proposals/codex/src/proposal_types/parameters.rs @@ -126,32 +126,33 @@ pub(crate) fn set_storage_role_parameters_proposal( } } -#[cfg(test)] -mod test { - use crate::proposal_types::parameters::get_required_stake_by_fraction; - use crate::tests::{increase_total_balance_issuance, initial_test_ext, Test}; - - pub use sr_primitives::Perbill; - - #[test] - fn calculate_get_required_stake_by_fraction_with_zero_issuance() { - initial_test_ext() - .execute_with(|| assert_eq!(get_required_stake_by_fraction::(5, 7), 0)); - } - - #[test] - fn calculate_stake_by_percentage_for_defined_issuance_succeeds() { - initial_test_ext().execute_with(|| { - increase_total_balance_issuance(50000); - assert_eq!(get_required_stake_by_fraction::(1, 1000), 50) - }); - } - - #[test] - fn calculate_stake_by_percentage_for_defined_issuance_with_fraction_loss() { - initial_test_ext().execute_with(|| { - increase_total_balance_issuance(1111); - assert_eq!(get_required_stake_by_fraction::(3, 1000), 3); - }); - } -} +//TODO: uncomment +// #[cfg(test)] +// mod test { +// use crate::proposal_types::parameters::get_required_stake_by_fraction; +// use crate::tests::{increase_total_balance_issuance, initial_test_ext, Test}; +// +// pub use sr_primitives::Perbill; +// +// #[test] +// fn calculate_get_required_stake_by_fraction_with_zero_issuance() { +// initial_test_ext() +// .execute_with(|| assert_eq!(get_required_stake_by_fraction::(5, 7), 0)); +// } +// +// #[test] +// fn calculate_stake_by_percentage_for_defined_issuance_succeeds() { +// initial_test_ext().execute_with(|| { +// increase_total_balance_issuance(50000); +// assert_eq!(get_required_stake_by_fraction::(1, 1000), 50) +// }); +// } +// +// #[test] +// fn calculate_stake_by_percentage_for_defined_issuance_with_fraction_loss() { +// initial_test_ext().execute_with(|| { +// increase_total_balance_issuance(1111); +// assert_eq!(get_required_stake_by_fraction::(3, 1000), 3); +// }); +// } +// } diff --git a/runtime/src/integration/proposals/mod.rs b/runtime/src/integration/proposals/mod.rs index c38aff5e7f..47627fa1fb 100644 --- a/runtime/src/integration/proposals/mod.rs +++ b/runtime/src/integration/proposals/mod.rs @@ -3,9 +3,11 @@ mod council_elected_handler; mod council_origin_validator; mod membership_origin_validator; +mod proposal_encoder; mod staking_events_handler; pub use council_elected_handler::CouncilElectedHandler; pub use council_origin_validator::CouncilManager; pub use membership_origin_validator::{MemberId, MembershipOriginValidator}; +pub use proposal_encoder::ExtrinsicProposalEncoder; pub use staking_events_handler::StakingEventsHandler; diff --git a/runtime/src/integration/proposals/proposal_encoder.rs b/runtime/src/integration/proposals/proposal_encoder.rs new file mode 100644 index 0000000000..8d76b0ea96 --- /dev/null +++ b/runtime/src/integration/proposals/proposal_encoder.rs @@ -0,0 +1,25 @@ +use crate::integration::proposals::MemberId; +use crate::*; +use proposals_codex::{ProposalDetails, ProposalEncoder}; + +pub struct ExtrinsicProposalEncoder; + +impl ProposalEncoder for ExtrinsicProposalEncoder { + fn encode_proposal( + proposal_details: ProposalDetails< + Balance, + Balance, + BlockNumber, + AccountId, + MemberId, + >, + ) -> Vec { + match proposal_details { + ProposalDetails::Text(text) => { + crate::Call::ProposalsCodex(proposals_codex::Call::execute_text_proposal(text)) + .encode() + } + _ => unreachable!(), + } + } +} diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index e4afe8eb12..bd2c4c1b0f 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -59,7 +59,7 @@ pub use srml_support::{ pub use staking::StakerStatus; pub use timestamp::Call as TimestampCall; -use integration::proposals::{CouncilManager, MembershipOriginValidator}; +use integration::proposals::{CouncilManager, ExtrinsicProposalEncoder, MembershipOriginValidator}; /// An index to a block. pub type BlockNumber = u32; @@ -866,6 +866,7 @@ impl proposals_codex::Trait for Runtime { type MembershipOriginValidator = MembershipOriginValidator; type TextProposalMaxLength = TextProposalMaxLength; type RuntimeUpgradeWasmProposalMaxLength = RuntimeUpgradeWasmProposalMaxLength; + type ProposalEncoder = ExtrinsicProposalEncoder; } construct_runtime!( From 6fc4a5feadfd696b1e1cd59c451be58ccd5374c6 Mon Sep 17 00:00:00 2001 From: Gleb Urvanov Date: Wed, 22 Apr 2020 17:21:54 +0200 Subject: [PATCH 228/286] Rome Constantinople migration test implementation --- tests/network-tests/.env | 6 +- .../network-tests/joystream_node_runtime.wasm | Bin 0 -> 1777201 bytes tests/network-tests/package.json | 5 +- .../src/tests/membershipCreationTest.ts | 12 +- .../tests/proposals/spendingProposalTest.ts | 75 +++++++ .../src/tests/proposals/textProposalTest.ts | 68 +++++++ .../{ => proposals}/updateRuntimeTest.ts | 32 +-- .../workingGroupMmintCapacityProposalTest.ts | 80 ++++++++ .../tests/upgrade/romeRuntimeUpgradeTest.ts | 85 ++++++++ tests/network-tests/src/utils/apiWrapper.ts | 189 +++++++++++++++++- tests/network-tests/src/utils/sender.ts | 1 - tests/network-tests/src/utils/utils.ts | 5 + 12 files changed, 524 insertions(+), 34 deletions(-) create mode 100644 tests/network-tests/joystream_node_runtime.wasm create mode 100644 tests/network-tests/src/tests/proposals/spendingProposalTest.ts create mode 100644 tests/network-tests/src/tests/proposals/textProposalTest.ts rename tests/network-tests/src/tests/{ => proposals}/updateRuntimeTest.ts (71%) create mode 100644 tests/network-tests/src/tests/proposals/workingGroupMmintCapacityProposalTest.ts create mode 100644 tests/network-tests/src/tests/upgrade/romeRuntimeUpgradeTest.ts diff --git a/tests/network-tests/.env b/tests/network-tests/.env index 937f1e6923..e95cc8a1cf 100644 --- a/tests/network-tests/.env +++ b/tests/network-tests/.env @@ -12,5 +12,7 @@ COUNCIL_STAKE_GREATER_AMOUNT = 1500 COUNCIL_STAKE_LESSER_AMOUNT = 1000 # Number of members with greater stake in council election test. COUNCIL_ELECTION_K = 2 -# Stake for runtime upgrade proposal test -RUNTIME_UPGRADE_PROPOSAL_STAKE = 200 \ No newline at end of file +# Balance to spend using spending proposal +SPENDING_BALANCE = 1000 +# Minting capacity for content working group minting capacity test. +MINTING_CAPACITY = 100020 \ No newline at end of file diff --git a/tests/network-tests/joystream_node_runtime.wasm b/tests/network-tests/joystream_node_runtime.wasm new file mode 100644 index 0000000000000000000000000000000000000000..de03b4ad32c1416c00afc26db804a9484f9d5b5b GIT binary patch literal 1777201 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

dj&Wl+y63RiVd7NR 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�T&iuy@W%p!V? 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∋vF>!TH3d9>BvA}JUmfTVV6nJ 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
SY*CMnF>Z5`(;(O%MgWjk~E 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

2tMtqe5(H@wbil9I1h-awK*)E+vWw zy?sUy(>B{x|Js41Qe*kR9E!7;m^Af{3AsvVf?!)woSN_-Dfm$j#mfKAnF~kQ5U-C1 z^khwN^0QC}`om->FvfPMcWHTdBld#hz2~$b_X^f}z}M($wTPxE!fk0=0-*#O0DLl=pgl*u$B2L%wcR)3PTR89Yg)OXeGE!whB^y1`_AoTzm88=6a&n@=(Te7qV1vb=EP)^mwtd5bOQU z6F@wO{lz5{N^tGs`|&798{oWz8Yv+>xoYRP-i{etE*`G&ajo9m8PX=Qml-4IJROF z#O#H`KFcVn3>1{3-aqpWO*Iu0qGIfX1(H&qEpF%(&ch3QZ0*=SwD;xYq>R3n)$D-F z%?Xp3lrM^oYWc6*j9$+#u)zpC0YwIqhB%%%Ly~=1v#HF3_7{@)sy;X)IG^LR*Uldr zJ&S+>FN97|^WJueIjyJaLo=hp9-`|5Y*7J$9{XjT0EB;`PDtYkcG^I%i(0y`fSFLI9BcTW)Jji=l71i3<}{MJ?gte1Y56!x+F4iruM?o?R*IK2Lk~b=-b#-crj&T^tYOGP@OpFF; zSoK2n$r(YsEBHrlTj|S*CSmz_*i1|TYay+S_+k8pfC-6J4{M%rU%4z8!8RT6Wk+SjLlb4aLDOI_g zN)(ZstUfoBBVw6l8O)9b$G=cQY7B0+4$}y!Zk@QmBuH!(*N^)Aj3C(LLEt^xejYOL zLMPg˗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 literal 0 HcmV?d00001 diff --git a/tests/network-tests/package.json b/tests/network-tests/package.json index 3c59a6f28f..7de9a2fbb1 100644 --- a/tests/network-tests/package.json +++ b/tests/network-tests/package.json @@ -4,17 +4,18 @@ "license": "GPL-3.0-only", "scripts": { "build": "tsc --build tsconfig.json", - "test": "mocha -r ts-node/register src/tests/*", + "test": "mocha -r ts-node/register src/tests/**/*", "lint": "tslint --project tsconfig.json", "prettier": "prettier --write ./src" }, "dependencies": { - "@joystream/types": "^0.7.0", + "@joystream/types": "../joystream-apps/packages/joy-types", "@polkadot/api": "^0.96.1", "@polkadot/keyring": "^1.7.0-beta.5", "@types/bn.js": "^4.11.5", "bn.js": "^4.11.8", "dotenv": "^8.2.0", + "fs": "^0.0.1-security", "uuid": "^7.0.3" }, "devDependencies": { diff --git a/tests/network-tests/src/tests/membershipCreationTest.ts b/tests/network-tests/src/tests/membershipCreationTest.ts index 38037386f0..19eb4f056e 100644 --- a/tests/network-tests/src/tests/membershipCreationTest.ts +++ b/tests/network-tests/src/tests/membershipCreationTest.ts @@ -50,8 +50,8 @@ export function membershipTest(nKeyPairs: KeyringPair[]) { ); nKeyPairs.forEach((keyPair, index) => apiWrapper - .getMembership(keyPair.address) - .then(membership => assert(!membership.isEmpty, `Account ${keyPair.address} is not a member`)) + .getMemberIds(keyPair.address) + .then(membership => assert(membership.length > 0, `Account ${keyPair.address} is not a member`)) ); }).timeout(defaultTimeout); @@ -65,7 +65,9 @@ export function membershipTest(nKeyPairs: KeyringPair[]) { ) ); await apiWrapper.buyMembership(aKeyPair, paidTerms, `late_member_${aKeyPair.address.substring(0, 8)}`, true); - apiWrapper.getMembership(aKeyPair.address).then(membership => assert(membership.isEmpty, 'Account A is a member')); + apiWrapper + .getMemberIds(aKeyPair.address) + .then(membership => assert(membership.length === 0, 'Account A is a member')); }).timeout(defaultTimeout); it('Account A was able to buy the membership with sufficient funds', async () => { @@ -77,8 +79,8 @@ export function membershipTest(nKeyPairs: KeyringPair[]) { ); await apiWrapper.buyMembership(aKeyPair, paidTerms, `late_member_${aKeyPair.address.substring(0, 8)}`); apiWrapper - .getMembership(aKeyPair.address) - .then(membership => assert(!membership.isEmpty, 'Account A is a not member')); + .getMemberIds(aKeyPair.address) + .then(membership => assert(membership.length > 0, 'Account A is a not member')); }).timeout(defaultTimeout); after(() => { diff --git a/tests/network-tests/src/tests/proposals/spendingProposalTest.ts b/tests/network-tests/src/tests/proposals/spendingProposalTest.ts new file mode 100644 index 0000000000..2e96d926af --- /dev/null +++ b/tests/network-tests/src/tests/proposals/spendingProposalTest.ts @@ -0,0 +1,75 @@ +import { initConfig } from '../../utils/config'; +import { Keyring, WsProvider } from '@polkadot/api'; +import { KeyringPair } from '@polkadot/keyring/types'; +import { membershipTest } from '../membershipCreationTest'; +import { councilTest } from '../electingCouncilTest'; +import { registerJoystreamTypes } from '@joystream/types'; +import { ApiWrapper } from '../../utils/apiWrapper'; +import { v4 as uuid } from 'uuid'; +import BN = require('bn.js'); + +describe.skip('Spending proposal network tests', () => { + initConfig(); + const keyring = new Keyring({ type: 'sr25519' }); + const nodeUrl: string = process.env.NODE_URL!; + const sudoUri: string = process.env.SUDO_ACCOUNT_URI!; + const spendingBalance: BN = new BN(+process.env.SPENDING_BALANCE!); + const defaultTimeout: number = 120000; + + const m1KeyPairs: KeyringPair[] = new Array(); + const m2KeyPairs: KeyringPair[] = new Array(); + + let apiWrapper: ApiWrapper; + let sudo: KeyringPair; + + before(async function () { + this.timeout(defaultTimeout); + registerJoystreamTypes(); + const provider = new WsProvider(nodeUrl); + apiWrapper = await ApiWrapper.create(provider); + }); + + membershipTest(m1KeyPairs); + membershipTest(m2KeyPairs); + councilTest(m1KeyPairs, m2KeyPairs); + + it('Spending proposal test', async () => { + // Setup + sudo = keyring.addFromUri(sudoUri); + const description: string = 'spending proposal which is used for API network testing with some mock data'; + const runtimeVoteFee: BN = apiWrapper.estimateVoteForProposalFee(); + + // Topping the balances + const proposalStake: BN = await apiWrapper.getRequiredProposalStake(25, 10000); + const runtimeProposalFee: BN = apiWrapper.estimateProposeSpendingFee( + description, + description, + proposalStake, + spendingBalance, + sudo.address + ); + await apiWrapper.transferBalance(sudo, m1KeyPairs[0].address, runtimeProposalFee.add(proposalStake)); + await apiWrapper.transferBalanceToAccounts(sudo, m2KeyPairs, runtimeVoteFee); + + // Proposal creation + const proposalPromise = apiWrapper.expectProposalCreated(); + await apiWrapper.proposeSpending( + m1KeyPairs[0], + 'testing spending' + uuid().substring(0, 8), + 'spending to test proposal functionality' + uuid().substring(0, 8), + proposalStake, + spendingBalance, + sudo.address + ); + const proposalNumber = await proposalPromise; + + // Approving runtime update proposal + const runtimePromise = apiWrapper.expectProposalFinalized(); + await apiWrapper.batchApproveProposal(m2KeyPairs, proposalNumber); + await runtimePromise; + }).timeout(defaultTimeout); + + after(() => { + apiWrapper.close(); + }); +}); diff --git a/tests/network-tests/src/tests/proposals/textProposalTest.ts b/tests/network-tests/src/tests/proposals/textProposalTest.ts new file mode 100644 index 0000000000..7eac64ced3 --- /dev/null +++ b/tests/network-tests/src/tests/proposals/textProposalTest.ts @@ -0,0 +1,68 @@ +import { initConfig } from '../../utils/config'; +import { Keyring, WsProvider } from '@polkadot/api'; +import { KeyringPair } from '@polkadot/keyring/types'; +import { membershipTest } from '../membershipCreationTest'; +import { councilTest } from '../electingCouncilTest'; +import { registerJoystreamTypes } from '@joystream/types'; +import { ApiWrapper } from '../../utils/apiWrapper'; +import { v4 as uuid } from 'uuid'; +import BN = require('bn.js'); + +describe.skip('Text proposal network tests', () => { + initConfig(); + const keyring = new Keyring({ type: 'sr25519' }); + const nodeUrl: string = process.env.NODE_URL!; + const sudoUri: string = process.env.SUDO_ACCOUNT_URI!; + const defaultTimeout: number = 120000; + + const m1KeyPairs: KeyringPair[] = new Array(); + const m2KeyPairs: KeyringPair[] = new Array(); + + let apiWrapper: ApiWrapper; + let sudo: KeyringPair; + + before(async function () { + this.timeout(defaultTimeout); + registerJoystreamTypes(); + const provider = new WsProvider(nodeUrl); + apiWrapper = await ApiWrapper.create(provider); + }); + + membershipTest(m1KeyPairs); + membershipTest(m2KeyPairs); + councilTest(m1KeyPairs, m2KeyPairs); + + it('Text proposal test', async () => { + // Setup + sudo = keyring.addFromUri(sudoUri); + const proposalTitle: string = 'Testing proposal ' + uuid().substring(0, 8); + const description: string = 'Testing text proposal ' + uuid().substring(0, 8); + const proposalText: string = 'Text of the testing proposal ' + uuid().substring(0, 8); + const runtimeVoteFee: BN = apiWrapper.estimateVoteForProposalFee(); + await apiWrapper.transferBalanceToAccounts(sudo, m2KeyPairs, runtimeVoteFee); + + // Proposal stake calculation + const proposalStake: BN = await apiWrapper.getRequiredProposalStake(25, 10000); + const runtimeProposalFee: BN = apiWrapper.estimateProposeTextFee( + proposalStake, + description, + description, + proposalText + ); + await apiWrapper.transferBalance(sudo, m1KeyPairs[0].address, runtimeProposalFee.add(proposalStake)); + + // Proposal creation + const proposalPromise = apiWrapper.expectProposalCreated(); + await apiWrapper.proposeText(m1KeyPairs[0], proposalStake, proposalTitle, description, proposalText); + const proposalNumber = await proposalPromise; + + // Approving runtime update proposal + const textProposalPromise = apiWrapper.expectProposalFinalized(); + await apiWrapper.batchApproveProposal(m2KeyPairs, proposalNumber); + await textProposalPromise; + }).timeout(defaultTimeout); + + after(() => { + apiWrapper.close(); + }); +}); diff --git a/tests/network-tests/src/tests/updateRuntimeTest.ts b/tests/network-tests/src/tests/proposals/updateRuntimeTest.ts similarity index 71% rename from tests/network-tests/src/tests/updateRuntimeTest.ts rename to tests/network-tests/src/tests/proposals/updateRuntimeTest.ts index 402b0410f6..31aa70d05e 100644 --- a/tests/network-tests/src/tests/updateRuntimeTest.ts +++ b/tests/network-tests/src/tests/proposals/updateRuntimeTest.ts @@ -1,19 +1,19 @@ -import { initConfig } from '../utils/config'; +import { initConfig } from '../../utils/config'; import { Keyring, WsProvider } from '@polkadot/api'; import { Bytes } from '@polkadot/types'; import { KeyringPair } from '@polkadot/keyring/types'; -import { membershipTest } from './membershipCreationTest'; -import { councilTest } from './electingCouncilTest'; +import { membershipTest } from '../membershipCreationTest'; +import { councilTest } from '../electingCouncilTest'; import { registerJoystreamTypes } from '@joystream/types'; -import { ApiWrapper } from '../utils/apiWrapper'; +import { ApiWrapper } from '../../utils/apiWrapper'; +import { v4 as uuid } from 'uuid'; import BN = require('bn.js'); -describe('Runtime upgrade integration tests', () => { +describe.skip('Runtime upgrade networt tests', () => { initConfig(); const keyring = new Keyring({ type: 'sr25519' }); const nodeUrl: string = process.env.NODE_URL!; const sudoUri: string = process.env.SUDO_ACCOUNT_URI!; - const proposalStake: BN = new BN(+process.env.RUNTIME_UPGRADE_PROPOSAL_STAKE!); const defaultTimeout: number = 120000; const m1KeyPairs: KeyringPair[] = new Array(); @@ -37,32 +37,38 @@ describe('Runtime upgrade integration tests', () => { // Setup sudo = keyring.addFromUri(sudoUri); const runtime: Bytes = await apiWrapper.getRuntime(); - const description: string = 'runtime upgrade proposal which is used for API integration testing'; + const description: string = 'runtime upgrade proposal which is used for API network testing'; + const runtimeVoteFee: BN = apiWrapper.estimateVoteForProposalFee(); + + // Topping the balances + const proposalStake: BN = await apiWrapper.getRequiredProposalStake(1, 100); const runtimeProposalFee: BN = apiWrapper.estimateProposeRuntimeUpgradeFee( proposalStake, description, description, runtime ); - const runtimeVoteFee: BN = apiWrapper.estimateVoteForProposalFee(); - - // Topping the balances await apiWrapper.transferBalance(sudo, m1KeyPairs[0].address, runtimeProposalFee.add(proposalStake)); await apiWrapper.transferBalanceToAccounts(sudo, m2KeyPairs, runtimeVoteFee); // Proposal creation + console.log('proposing new runtime'); const proposalPromise = apiWrapper.expectProposalCreated(); + console.log('sending extr'); await apiWrapper.proposeRuntime( m1KeyPairs[0], proposalStake, - 'testing runtime', - 'runtime to test proposal functionality', + 'testing runtime' + uuid().substring(0, 8), + 'runtime to test proposal functionality' + uuid().substring(0, 8), runtime ); const proposalNumber = await proposalPromise; + console.log('proposed'); // Approving runtime update proposal - const runtimePromise = apiWrapper.expectRuntimeUpgraded(); + console.log('block number ' + apiWrapper.getBestBlock()); + console.log('approving new runtime'); + const runtimePromise = apiWrapper.expectProposalFinalized(); await apiWrapper.batchApproveProposal(m2KeyPairs, proposalNumber); await runtimePromise; }).timeout(defaultTimeout); diff --git a/tests/network-tests/src/tests/proposals/workingGroupMmintCapacityProposalTest.ts b/tests/network-tests/src/tests/proposals/workingGroupMmintCapacityProposalTest.ts new file mode 100644 index 0000000000..271dc1dee8 --- /dev/null +++ b/tests/network-tests/src/tests/proposals/workingGroupMmintCapacityProposalTest.ts @@ -0,0 +1,80 @@ +import { initConfig } from '../../utils/config'; +import { Keyring, WsProvider } from '@polkadot/api'; +import { KeyringPair } from '@polkadot/keyring/types'; +import { membershipTest } from '../membershipCreationTest'; +import { councilTest } from '../electingCouncilTest'; +import { registerJoystreamTypes } from '@joystream/types'; +import { ApiWrapper } from '../../utils/apiWrapper'; +import { v4 as uuid } from 'uuid'; +import BN = require('bn.js'); + +describe.skip('Mint capacity proposal network tests', () => { + initConfig(); + const keyring = new Keyring({ type: 'sr25519' }); + const nodeUrl: string = process.env.NODE_URL!; + const sudoUri: string = process.env.SUDO_ACCOUNT_URI!; + const mintingCapacity: BN = new BN(+process.env.MINTING_CAPACITY!); + const defaultTimeout: number = 120000; + + const m1KeyPairs: KeyringPair[] = new Array(); + const m2KeyPairs: KeyringPair[] = new Array(); + + let apiWrapper: ApiWrapper; + let sudo: KeyringPair; + + before(async function () { + this.timeout(defaultTimeout); + registerJoystreamTypes(); + const provider = new WsProvider(nodeUrl); + apiWrapper = await ApiWrapper.create(provider); + }); + + membershipTest(m1KeyPairs); + membershipTest(m2KeyPairs); + councilTest(m1KeyPairs, m2KeyPairs); + + // TODO implement the test + it('Mint capacity proposal test', async () => { + // Setup + sudo = keyring.addFromUri(sudoUri); + const description: string = 'spending proposal which is used for API network testing'; + const runtimeVoteFee: BN = apiWrapper.estimateVoteForProposalFee(); + + // Topping the balances + const proposalStake: BN = await apiWrapper.getRequiredProposalStake(25, 10000); + const runtimeProposalFee: BN = apiWrapper.estimateProposeWorkingGroupMintCapacityFee( + description, + description, + proposalStake, + mintingCapacity + ); + await apiWrapper.transferBalance(sudo, m1KeyPairs[0].address, runtimeProposalFee.add(proposalStake)); + await apiWrapper.transferBalanceToAccounts(sudo, m2KeyPairs, runtimeVoteFee); + + // Proposal creation + console.log('proposing new mint capacity'); + const proposalPromise = apiWrapper.expectProposalCreated(); + console.log('sending extr with capacity ' + mintingCapacity); + await apiWrapper.proposeWorkingGroupMintCapacity( + m1KeyPairs[0], + 'testing mint capacity' + uuid().substring(0, 8), + 'mint capacity to test proposal functionality' + uuid().substring(0, 8), + proposalStake, + mintingCapacity + ); + const proposalNumber = await proposalPromise; + console.log('proposed'); + //await apiWrapper.getProposal(proposalNumber); + + // Approving runtime update proposal + console.log('block number ' + (await apiWrapper.getBestBlock())); + console.log('approving new mint capacity'); + const runtimePromise = apiWrapper.expectProposalFinalized(); + await apiWrapper.batchApproveProposal(m2KeyPairs, proposalNumber); + await runtimePromise; + }).timeout(defaultTimeout); + + after(() => { + apiWrapper.close(); + }); +}); diff --git a/tests/network-tests/src/tests/upgrade/romeRuntimeUpgradeTest.ts b/tests/network-tests/src/tests/upgrade/romeRuntimeUpgradeTest.ts new file mode 100644 index 0000000000..dbcaac2cb2 --- /dev/null +++ b/tests/network-tests/src/tests/upgrade/romeRuntimeUpgradeTest.ts @@ -0,0 +1,85 @@ +import { initConfig } from '../../utils/config'; +import { Keyring, WsProvider } from '@polkadot/api'; +import { Bytes } from '@polkadot/types'; +import { KeyringPair } from '@polkadot/keyring/types'; +import { membershipTest } from '../membershipCreationTest'; +import { councilTest } from '../electingCouncilTest'; +import { registerJoystreamTypes } from '@joystream/types'; +import { ApiWrapper } from '../../utils/apiWrapper'; +import BN = require('bn.js'); +import { Utils } from '../../utils/utils'; + +describe('Runtime upgrade integration tests', () => { + initConfig(); + const keyring = new Keyring({ type: 'sr25519' }); + const nodeUrl: string = process.env.NODE_URL!; + const sudoUri: string = process.env.SUDO_ACCOUNT_URI!; + const proposalStake: BN = new BN(+process.env.RUNTIME_UPGRADE_PROPOSAL_STAKE!); + const defaultTimeout: number = 120000; + + const m1KeyPairs: KeyringPair[] = new Array(); + const m2KeyPairs: KeyringPair[] = new Array(); + + let apiWrapper: ApiWrapper; + let sudo: KeyringPair; + + before(async function () { + console.log('before the test'); + this.timeout(defaultTimeout); + registerJoystreamTypes(); + const provider = new WsProvider(nodeUrl); + console.log('1'); + apiWrapper = await ApiWrapper.create(provider); + console.log('2'); + }); + + console.log('3'); + membershipTest(m1KeyPairs); + console.log('4'); + membershipTest(m2KeyPairs); + console.log('5'); + councilTest(m1KeyPairs, m2KeyPairs); + console.log('6'); + + it('Upgrading the runtime test', async () => { + // Setup + console.log('7'); + sudo = keyring.addFromUri(sudoUri); + const runtime: string = Utils.readRuntimeFromFile('joystream_node_runtime.wasm'); + console.log('runtime read ' + runtime); + const description: string = 'runtime upgrade proposal which is used for API integration testing'; + const runtimeProposalFee: BN = apiWrapper.estimateRomeProposeRuntimeUpgradeFee( + proposalStake, + description, + description, + runtime + ); + const runtimeVoteFee: BN = apiWrapper.estimateVoteForRomeRuntimeProposalFee(); + + // Topping the balances + await apiWrapper.transferBalance(sudo, m1KeyPairs[0].address, runtimeProposalFee.add(proposalStake)); + await apiWrapper.transferBalanceToAccounts(sudo, m2KeyPairs, runtimeVoteFee); + + // Proposal creation + const proposalPromise = apiWrapper.expectProposalCreated(); + await apiWrapper.proposeRuntimeRome( + m1KeyPairs[0], + proposalStake, + 'testing runtime', + 'runtime to test proposal functionality', + runtime + ); + const proposalNumber = await proposalPromise; + + // Approving runtime update proposal + const runtimePromise = apiWrapper.expectRomeRuntimeUpgraded(); + await apiWrapper.batchApproveRomeProposal(m2KeyPairs, proposalNumber); + await runtimePromise; + }).timeout(defaultTimeout); + + membershipTest(new Array()); + + after(() => { + apiWrapper.close(); + }); +}); diff --git a/tests/network-tests/src/utils/apiWrapper.ts b/tests/network-tests/src/utils/apiWrapper.ts index 386a4420b4..e49d6cbf73 100644 --- a/tests/network-tests/src/utils/apiWrapper.ts +++ b/tests/network-tests/src/utils/apiWrapper.ts @@ -1,8 +1,8 @@ import { ApiPromise, WsProvider } from '@polkadot/api'; -import { Option, Vec, Bytes } from '@polkadot/types'; +import { Option, Vec, Bytes, u32 } from '@polkadot/types'; import { Codec } from '@polkadot/types/types'; import { KeyringPair } from '@polkadot/keyring/types'; -import { UserInfo, PaidMembershipTerms } from '@joystream/types/lib/members'; +import { UserInfo, PaidMembershipTerms, MemberId } from '@joystream/types/lib/members'; import { Seat, VoteKind } from '@joystream/types'; import { Balance, EventRecord } from '@polkadot/types/interfaces'; import BN = require('bn.js'); @@ -41,8 +41,8 @@ export class ApiWrapper { ); } - public getMembership(address: string): Promise { - return this.api.query.members.memberIdsByControllerAccountId(address); + public getMemberIds(address: string): Promise { + return this.api.query.members.memberIdsByControllerAccountId>(address); } public getBalance(address: string): Promise { @@ -99,12 +99,51 @@ export class ApiWrapper { return this.estimateTxFee(this.api.tx.councilElection.reveal(hashedVote, nominee, salt)); } - public estimateProposeRuntimeUpgradeFee(stake: BN, name: string, description: string, runtime: Bytes): BN { + public estimateProposeRuntimeUpgradeFee(stake: BN, name: string, description: string, runtime: Bytes | string): BN { + return this.estimateTxFee( + this.api.tx.proposalsCodex.createRuntimeUpgradeProposal(stake, name, description, stake, runtime) + ); + } + + public estimateRomeProposeRuntimeUpgradeFee( + stake: BN, + name: string, + description: string, + runtime: Bytes | string + ): BN { return this.estimateTxFee(this.api.tx.proposals.createProposal(stake, name, description, runtime)); } + public estimateProposeTextFee(stake: BN, name: string, description: string, text: string): BN { + return this.estimateTxFee(this.api.tx.proposalsCodex.createTextProposal(stake, name, description, stake, text)); + } + + public estimateProposeSpendingFee( + title: string, + description: string, + stake: BN, + balance: BN, + destination: string + ): BN { + return this.estimateTxFee( + this.api.tx.proposalsCodex.createSpendingProposal(stake, title, description, stake, balance, destination) + ); + } + + public estimateProposeWorkingGroupMintCapacityFee(title: string, description: string, stake: BN, balance: BN): BN { + return this.estimateTxFee( + this.api.tx.proposalsCodex.createSetContentWorkingGroupMintCapacityProposal( + stake, + title, + description, + stake, + balance + ) + ); + } + public estimateVoteForProposalFee(): BN { - return this.estimateTxFee(this.api.tx.proposals.voteOnProposal(0, 'Approve')); + return this.estimateTxFee(this.api.tx.proposalsEngine.vote(0, 0, 'Approve')); } private applyForCouncilElection(account: KeyringPair, amount: BN): Promise { @@ -197,12 +236,27 @@ export class ApiWrapper { return this.api.query.substrate.code(); } - public proposeRuntime( + public async proposeRuntime( + account: KeyringPair, + stake: BN, + name: string, + description: string, + runtime: Bytes | string + ): Promise { + const memberId: BN = (await this.getMemberIds(account.address))[0].toBn(); + return this.sender.signAndSend( + this.api.tx.proposalsCodex.createRuntimeUpgradeProposal(memberId, name, description, stake, runtime), + account, + false + ); + } + + public proposeRuntimeRome( account: KeyringPair, stake: BN, name: string, description: string, - runtime: Bytes + runtime: Bytes | string ): Promise { return this.sender.signAndSend( this.api.tx.proposals.createProposal(stake, name, description, runtime), @@ -211,18 +265,83 @@ export class ApiWrapper { ); } - public approveProposal(account: KeyringPair, proposal: BN): Promise { + public async proposeText( + account: KeyringPair, + stake: BN, + name: string, + description: string, + text: string + ): Promise { + const memberId: BN = (await this.getMemberIds(account.address))[0].toBn(); return this.sender.signAndSend( - this.api.tx.proposals.voteOnProposal(proposal, new VoteKind('Approve')), + this.api.tx.proposalsCodex.createTextProposal(memberId, name, description, stake, text), + account, + false + ); + } + + public async proposeSpending( + account: KeyringPair, + title: string, + description: string, + stake: BN, + balance: BN, + destination: string + ): Promise { + const memberId: BN = (await this.getMemberIds(account.address))[0].toBn(); + return this.sender.signAndSend( + this.api.tx.proposalsCodex.createSpendingProposal(memberId, title, description, stake, balance, destination), + account, + false + ); + } + + public async proposeWorkingGroupMintCapacity( + account: KeyringPair, + title: string, + description: string, + stake: BN, + balance: BN + ): Promise { + const memberId: BN = (await this.getMemberIds(account.address))[0].toBn(); + return this.sender.signAndSend( + this.api.tx.proposalsCodex.createSetContentWorkingGroupMintCapacityProposal( + memberId, + title, + description, + stake, + balance + ), account, false ); } + public approveProposal(account: KeyringPair, memberId: BN, proposal: BN): Promise { + return this.sender.signAndSend(this.api.tx.proposalsEngine.vote(memberId, proposal, 'Approve'), account, false); + } + public batchApproveProposal(council: KeyringPair[], proposal: BN): Promise { return Promise.all( council.map(async keyPair => { - await this.approveProposal(keyPair, proposal); + const memberId: BN = (await this.getMemberIds(keyPair.address))[0].toBn(); + await this.approveProposal(keyPair, memberId, proposal); + }) + ); + } + + public approveRomeProposal(account: KeyringPair, proposal: BN): Promise { + return this.sender.signAndSend( + this.api.tx.proposals.voteOnProposal(proposal, new VoteKind('Approve')), + account, + false + ); + } + + public batchApproveRomeProposal(council: KeyringPair[], proposal: BN): Promise { + return Promise.all( + council.map(async keyPair => { + await this.approveRomeProposal(keyPair, proposal); }) ); } @@ -254,4 +373,52 @@ export class ApiWrapper { }); }); } + + public expectRomeRuntimeUpgraded(): Promise { + return new Promise(async resolve => { + await this.api.query.system.events>(events => { + events.forEach(record => { + if (record.event.method.toString() === 'RuntimeUpdated') { + resolve(); + } + }); + }); + }); + } + + public expectProposalFinalized(): Promise { + return new Promise(async resolve => { + await this.api.query.system.events>(events => { + events.forEach(record => { + if ( + record.event.method.toString() === 'ProposalStatusUpdated' && + record.event.data[1].toString().includes('Finalized') + ) { + resolve(); + } + }); + }); + }); + } + + public getTotalIssuance(): Promise { + return this.api.query.balances.totalIssuance(); + } + + public async getProposal(id: BN) { + const proposal = await this.api.query.proposalsEngine.proposals(id); + console.log('proposal to string ' + proposal.toString()); + console.log('proposal to raw ' + proposal.toRawType()); + return; + } + + public async getRequiredProposalStake(numerator: number, denominator: number): Promise { + const issuance: number = await (await this.getTotalIssuance()).toNumber(); + const stake = (issuance * numerator) / denominator; + return new BN(stake.toFixed(0)); + } + + public getProposalCount(): Promise { + return this.api.query.proposalsEngine.proposalCount(); + } } diff --git a/tests/network-tests/src/utils/sender.ts b/tests/network-tests/src/utils/sender.ts index b09e780cdc..b8e1c15499 100644 --- a/tests/network-tests/src/utils/sender.ts +++ b/tests/network-tests/src/utils/sender.ts @@ -37,7 +37,6 @@ export class Sender { ): Promise { return new Promise(async (resolve, reject) => { const nonce: BN = await this.getNonce(account.address); - // console.log('sending transaction from ' + account.address + ' with nonce ' + nonce); const signedTx = tx.sign(account, { nonce }); await signedTx .send(async result => { diff --git a/tests/network-tests/src/utils/utils.ts b/tests/network-tests/src/utils/utils.ts index 8f65093c3d..84f6c00213 100644 --- a/tests/network-tests/src/utils/utils.ts +++ b/tests/network-tests/src/utils/utils.ts @@ -2,6 +2,7 @@ import { IExtrinsic } from '@polkadot/types/types'; import { compactToU8a, stringToU8a } from '@polkadot/util'; import { blake2AsHex } from '@polkadot/util-crypto'; import BN = require('bn.js'); +import fs = require('fs'); import { decodeAddress } from '@polkadot/keyring'; import { Seat } from '@joystream/types'; @@ -42,4 +43,8 @@ export class Utils { public static getTotalStake(seat: Seat): BN { return new BN(+seat.stake.toString() + seat.backers.reduce((a, baker) => a + +baker.stake.toString(), 0)); } + + public static readRuntimeFromFile(path: string): string { + return '0x' + fs.readFileSync(path).toString('hex'); + } } From 245225ebb98fe4c183044e383c8c711c0fad859f Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Wed, 22 Apr 2020 19:52:36 +0300 Subject: [PATCH 229/286] Migrate all proposals to the new serialization model - change proposals codex extrinscis - enrich runtime proposal encoder - restore tests --- runtime-modules/proposals/codex/src/lib.rs | 114 +++++++----------- .../proposals/codex/src/proposal_types/mod.rs | 22 +++- .../codex/src/proposal_types/parameters.rs | 59 +++++---- .../proposals/codex/src/tests/mock.rs | 8 ++ .../proposals/codex/src/tests/mod.rs | 2 +- .../integration/proposals/proposal_encoder.rs | 72 ++++++++--- runtime/src/test/proposals_integration.rs | 2 - 7 files changed, 160 insertions(+), 119 deletions(-) diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index 4020247ef4..1f6c812b67 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -43,14 +43,13 @@ mod proposal_types; -// #[cfg(test)] -// mod tests; +#[cfg(test)] +mod tests; -use codec::Encode; use common::origin_validator::ActorOriginValidator; use governance::election_params::ElectionParameters; use proposal_engine::ProposalParameters; -use roles::actors::{Role, RoleParameters}; +use roles::actors::RoleParameters; use rstd::clone::Clone; use rstd::convert::TryInto; use rstd::prelude::*; @@ -65,24 +64,12 @@ use srml_support::traits::{Currency, Get}; use srml_support::{decl_error, decl_module, decl_storage, ensure, print}; use system::{ensure_root, RawOrigin}; -pub use proposal_types::ProposalDetails; +pub use proposal_types::{ProposalDetails, ProposalDetailsOf, ProposalEncoder}; // Percentage of the total token issue as max mint balance value. Shared with spending // proposal max balance percentage. const COUNCIL_MINT_MAX_BALANCE_PERCENT: u32 = 2; -pub trait ProposalEncoder { - fn encode_proposal( - proposal_details: ProposalDetails< - BalanceOfMint, - BalanceOfGovernanceCurrency, - T::BlockNumber, - T::AccountId, - MemberId, - >, - ) -> Vec; -} - /// 'Proposals codex' substrate module Trait pub trait Trait: system::Trait @@ -370,7 +357,7 @@ decl_module! { proposal_details, )?; } -/* + /// Create 'Runtime upgrade' proposal type. Runtime upgrade can be initiated only by /// members from the hardcoded list `RuntimeUpgradeProposalAllowedProposers` pub fn create_runtime_upgrade_proposal( @@ -387,20 +374,23 @@ decl_module! { let wasm_hash = blake2_256(&wasm); - let proposal_code = - >::execute_runtime_upgrade_proposal(title.clone(), description.clone(), wasm); + // The runtime upgrade proposal has two proposal details: wasm and wasm hash. + // This is an exception for the optimization. let proposal_parameters = proposal_types::parameters::runtime_upgrade_proposal::(); + let proposal_details = ProposalDetails::RuntimeUpgrade(wasm); + let proposal_code = T::ProposalEncoder::encode_proposal(proposal_details.clone()); + let proposal_details_for_hash = ProposalDetails::RuntimeUpgradeHash(wasm_hash.to_vec()); Self::create_proposal( origin, member_id, title, description, stake_balance, - proposal_code.encode(), + proposal_code, proposal_parameters, - ProposalDetails::RuntimeUpgrade(wasm_hash.to_vec()), + proposal_details_for_hash, )?; } @@ -418,9 +408,8 @@ decl_module! { Self::ensure_council_election_parameters_valid(&election_parameters)?; - let proposal_code = - >::set_election_parameters(election_parameters.clone()); - + let proposal_details = ProposalDetails::SetElectionParameters(election_parameters); + let proposal_code = T::ProposalEncoder::encode_proposal(proposal_details.clone()); let proposal_parameters = proposal_types::parameters::set_election_parameters_proposal::(); @@ -430,9 +419,9 @@ decl_module! { title, description, stake_balance, - proposal_code.encode(), + proposal_code, proposal_parameters, - ProposalDetails::SetElectionParameters(election_parameters), + proposal_details, )?; } @@ -455,11 +444,10 @@ decl_module! { Error::InvalidStorageWorkingGroupMintCapacity ); - let proposal_code = - >::set_mint_capacity(mint_balance.clone()); - let proposal_parameters = proposal_types::parameters::set_content_working_group_mint_capacity_proposal::(); + let proposal_details = ProposalDetails::SetContentWorkingGroupMintCapacity(mint_balance); + let proposal_code = T::ProposalEncoder::encode_proposal(proposal_details.clone()); Self::create_proposal( origin, @@ -467,9 +455,9 @@ decl_module! { title, description, stake_balance, - proposal_code.encode(), + proposal_code, proposal_parameters, - ProposalDetails::SetContentWorkingGroupMintCapacity(mint_balance), + proposal_details, )?; } @@ -498,13 +486,10 @@ decl_module! { Error::InvalidSpendingProposalBalance ); - let proposal_code = >::spend_from_council_mint( - balance.clone(), - destination.clone() - ); - let proposal_parameters = proposal_types::parameters::spending_proposal::(); + let proposal_details = ProposalDetails::Spending(balance, destination); + let proposal_code = T::ProposalEncoder::encode_proposal(proposal_details.clone()); Self::create_proposal( origin, @@ -512,13 +497,12 @@ decl_module! { title, description, stake_balance, - proposal_code.encode(), + proposal_code, proposal_parameters, - ProposalDetails::Spending(balance, destination), + proposal_details, )?; } - /// Create 'Set lead' proposal type. /// This proposal uses `replace_lead()` extrinsic from the `content_working_group` module. pub fn create_set_lead_proposal( @@ -537,11 +521,10 @@ decl_module! { ); } - let proposal_code = - >::replace_lead(new_lead.clone()); - let proposal_parameters = proposal_types::parameters::set_lead_proposal::(); + let proposal_details = ProposalDetails::SetLead(new_lead); + let proposal_code = T::ProposalEncoder::encode_proposal(proposal_details.clone()); Self::create_proposal( origin, @@ -549,9 +532,9 @@ decl_module! { title, description, stake_balance, - proposal_code.encode(), + proposal_code, proposal_parameters, - ProposalDetails::SetLead(new_lead), + proposal_details, )?; } @@ -565,11 +548,10 @@ decl_module! { stake_balance: Option>, actor_account: T::AccountId, ) { - let proposal_code = - >::remove_actor(actor_account.clone()); - let proposal_parameters = proposal_types::parameters::evict_storage_provider_proposal::(); + let proposal_details = ProposalDetails::EvictStorageProvider(actor_account); + let proposal_code = T::ProposalEncoder::encode_proposal(proposal_details.clone()); Self::create_proposal( origin, @@ -577,9 +559,9 @@ decl_module! { title, description, stake_balance, - proposal_code.encode(), + proposal_code, proposal_parameters, - ProposalDetails::EvictStorageProvider(actor_account), + proposal_details, )?; } @@ -603,11 +585,10 @@ decl_module! { Error::InvalidValidatorCount ); - let proposal_code = - >::set_validator_count(new_validator_count); - let proposal_parameters = proposal_types::parameters::set_validator_count_proposal::(); + let proposal_details = ProposalDetails::SetValidatorCount(new_validator_count); + let proposal_code = T::ProposalEncoder::encode_proposal(proposal_details.clone()); Self::create_proposal( origin, @@ -615,9 +596,9 @@ decl_module! { title, description, stake_balance, - proposal_code.encode(), + proposal_code, proposal_parameters, - ProposalDetails::SetValidatorCount(new_validator_count), + proposal_details, )?; } @@ -633,13 +614,10 @@ decl_module! { ) { Self::ensure_storage_role_parameters_valid(&role_parameters)?; - let proposal_code = >::set_role_parameters( - Role::StorageProvider, - role_parameters.clone() - ); - let proposal_parameters = proposal_types::parameters::set_storage_role_parameters_proposal::(); + let proposal_details = ProposalDetails::SetStorageRoleParameters(role_parameters); + let proposal_code = T::ProposalEncoder::encode_proposal(proposal_details.clone()); Self::create_proposal( origin, @@ -647,12 +625,12 @@ decl_module! { title, description, stake_balance, - proposal_code.encode(), + proposal_code, proposal_parameters, - ProposalDetails::SetStorageRoleParameters(role_parameters), + proposal_details, )?; } -*/ + // *************** Extrinsic to execute /// Text proposal extrinsic. Should be used as callable object to pass to the `engine` module. @@ -672,20 +650,16 @@ decl_module! { /// Should be used as callable object to pass to the `engine` module. pub fn execute_runtime_upgrade_proposal( origin, - title: Vec, - _description: Vec, wasm: Vec, ) { let (cloned_origin1, cloned_origin2) = Self::double_origin(origin); ensure_root(cloned_origin1)?; - print("Runtime upgrade proposal: "); - let title_string_result = from_utf8(title.as_slice()); - if let Ok(title_string) = title_string_result{ - print(title_string); - } + print("Runtime upgrade proposal execution started."); >::set_code(cloned_origin2, wasm)?; + + print("Runtime upgrade proposal execution finished."); } } } diff --git a/runtime-modules/proposals/codex/src/proposal_types/mod.rs b/runtime-modules/proposals/codex/src/proposal_types/mod.rs index e9e7bc93dc..7d720bf20c 100644 --- a/runtime-modules/proposals/codex/src/proposal_types/mod.rs +++ b/runtime-modules/proposals/codex/src/proposal_types/mod.rs @@ -8,6 +8,21 @@ use serde::{Deserialize, Serialize}; use crate::ElectionParameters; use roles::actors::RoleParameters; +/// Encodes proposal using its details information. +pub trait ProposalEncoder { + /// Encodes proposal using its details information. + fn encode_proposal(proposal_details: ProposalDetailsOf) -> Vec; +} + +/// _ProposalDetails_ alias for type simplification +pub type ProposalDetailsOf = ProposalDetails< + crate::BalanceOfMint, + crate::BalanceOfGovernanceCurrency, + ::BlockNumber, + ::AccountId, + crate::MemberId, +>; + /// Proposal details provide voters the information required for the perceived voting. #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] #[derive(Encode, Decode, Clone, PartialEq, Debug)] @@ -15,7 +30,12 @@ pub enum ProposalDetails), - /// The hash of wasm code for the `runtime upgrade` proposal + /// The hash of wasm code for the `runtime upgrade` proposal. The runtime upgrade proposal has + /// two proposal details: wasm and wasm hash. This is an exception for the optimization. + RuntimeUpgradeHash(Vec), + + /// The wasm code for the `runtime upgrade` proposal. The runtime upgrade proposal has + /// two proposal details: wasm and wasm hash. This is an exception for the optimization. RuntimeUpgrade(Vec), /// Election parameters for the `set election parameters` proposal diff --git a/runtime-modules/proposals/codex/src/proposal_types/parameters.rs b/runtime-modules/proposals/codex/src/proposal_types/parameters.rs index 83af0d20c0..72b07169c7 100644 --- a/runtime-modules/proposals/codex/src/proposal_types/parameters.rs +++ b/runtime-modules/proposals/codex/src/proposal_types/parameters.rs @@ -126,33 +126,32 @@ pub(crate) fn set_storage_role_parameters_proposal( } } -//TODO: uncomment -// #[cfg(test)] -// mod test { -// use crate::proposal_types::parameters::get_required_stake_by_fraction; -// use crate::tests::{increase_total_balance_issuance, initial_test_ext, Test}; -// -// pub use sr_primitives::Perbill; -// -// #[test] -// fn calculate_get_required_stake_by_fraction_with_zero_issuance() { -// initial_test_ext() -// .execute_with(|| assert_eq!(get_required_stake_by_fraction::(5, 7), 0)); -// } -// -// #[test] -// fn calculate_stake_by_percentage_for_defined_issuance_succeeds() { -// initial_test_ext().execute_with(|| { -// increase_total_balance_issuance(50000); -// assert_eq!(get_required_stake_by_fraction::(1, 1000), 50) -// }); -// } -// -// #[test] -// fn calculate_stake_by_percentage_for_defined_issuance_with_fraction_loss() { -// initial_test_ext().execute_with(|| { -// increase_total_balance_issuance(1111); -// assert_eq!(get_required_stake_by_fraction::(3, 1000), 3); -// }); -// } -// } +#[cfg(test)] +mod test { + use crate::proposal_types::parameters::get_required_stake_by_fraction; + use crate::tests::{increase_total_balance_issuance, initial_test_ext, Test}; + + pub use sr_primitives::Perbill; + + #[test] + fn calculate_get_required_stake_by_fraction_with_zero_issuance() { + initial_test_ext() + .execute_with(|| assert_eq!(get_required_stake_by_fraction::(5, 7), 0)); + } + + #[test] + fn calculate_stake_by_percentage_for_defined_issuance_succeeds() { + initial_test_ext().execute_with(|| { + increase_total_balance_issuance(50000); + assert_eq!(get_required_stake_by_fraction::(1, 1000), 50) + }); + } + + #[test] + fn calculate_stake_by_percentage_for_defined_issuance_with_fraction_loss() { + initial_test_ext().execute_with(|| { + increase_total_balance_issuance(1111); + assert_eq!(get_required_stake_by_fraction::(3, 1000), 3); + }); + } +} diff --git a/runtime-modules/proposals/codex/src/tests/mock.rs b/runtime-modules/proposals/codex/src/tests/mock.rs index 7b80011871..1566fc9c1e 100644 --- a/runtime-modules/proposals/codex/src/tests/mock.rs +++ b/runtime-modules/proposals/codex/src/tests/mock.rs @@ -3,6 +3,7 @@ // TODO: remove after post-Rome substrate upgrade #![allow(array_into_iter)] +use crate::{ProposalDetailsOf, ProposalEncoder}; pub use primitives::{Blake2Hasher, H256}; use proposal_engine::VotersParameters; use sr_primitives::curve::PiecewiseLinear; @@ -249,6 +250,13 @@ impl crate::Trait for Test { type TextProposalMaxLength = TextProposalMaxLength; type RuntimeUpgradeWasmProposalMaxLength = RuntimeUpgradeWasmProposalMaxLength; type MembershipOriginValidator = (); + type ProposalEncoder = (); +} + +impl ProposalEncoder for () { + fn encode_proposal(_proposal_details: ProposalDetailsOf) -> Vec { + Vec::new() + } } impl system::Trait for Test { diff --git a/runtime-modules/proposals/codex/src/tests/mod.rs b/runtime-modules/proposals/codex/src/tests/mod.rs index d66127363f..23255ea622 100644 --- a/runtime-modules/proposals/codex/src/tests/mod.rs +++ b/runtime-modules/proposals/codex/src/tests/mod.rs @@ -223,7 +223,7 @@ fn create_runtime_upgrade_common_checks_succeed() { ) }, proposal_parameters: crate::proposal_types::parameters::runtime_upgrade_proposal::(), - proposal_details: ProposalDetails::RuntimeUpgrade(blake2_256(b"wasm").to_vec()), + proposal_details: ProposalDetails::RuntimeUpgradeHash(blake2_256(b"wasm").to_vec()), }; proposal_fixture.check_all(); }); diff --git a/runtime/src/integration/proposals/proposal_encoder.rs b/runtime/src/integration/proposals/proposal_encoder.rs index 8d76b0ea96..5712c3d84e 100644 --- a/runtime/src/integration/proposals/proposal_encoder.rs +++ b/runtime/src/integration/proposals/proposal_encoder.rs @@ -1,25 +1,67 @@ -use crate::integration::proposals::MemberId; -use crate::*; -use proposals_codex::{ProposalDetails, ProposalEncoder}; +use crate::{Call, Runtime}; +use proposals_codex::{ProposalDetails, ProposalDetailsOf, ProposalEncoder}; +use roles::actors::Role; -pub struct ExtrinsicProposalEncoder; +use codec::Encode; +use rstd::vec::Vec; +use srml_support::print; +/// _ProposalEncoder_ implementation. It encodes extrinsics with proposal details parameters +/// using Runtime Call and parity codec. +pub struct ExtrinsicProposalEncoder; impl ProposalEncoder for ExtrinsicProposalEncoder { - fn encode_proposal( - proposal_details: ProposalDetails< - Balance, - Balance, - BlockNumber, - AccountId, - MemberId, - >, - ) -> Vec { + fn encode_proposal(proposal_details: ProposalDetailsOf) -> Vec { match proposal_details { ProposalDetails::Text(text) => { - crate::Call::ProposalsCodex(proposals_codex::Call::execute_text_proposal(text)) + Call::ProposalsCodex(proposals_codex::Call::execute_text_proposal(text)).encode() + } + ProposalDetails::SetElectionParameters(election_parameters) => Call::CouncilElection( + governance::election::Call::set_election_parameters(election_parameters), + ) + .encode(), + ProposalDetails::SetContentWorkingGroupMintCapacity(mint_balance) => { + Call::ContentWorkingGroup(content_working_group::Call::set_mint_capacity( + mint_balance, + )) + .encode() + } + ProposalDetails::Spending(balance, destination) => Call::Council( + governance::council::Call::spend_from_council_mint(balance, destination), + ) + .encode(), + ProposalDetails::SetLead(new_lead) => { + Call::ContentWorkingGroup(content_working_group::Call::replace_lead(new_lead)) .encode() } - _ => unreachable!(), + ProposalDetails::EvictStorageProvider(actor_account) => { + Call::Actors(roles::actors::Call::remove_actor(actor_account)).encode() + } + ProposalDetails::SetValidatorCount(new_validator_count) => { + Call::Staking(staking::Call::set_validator_count(new_validator_count)).encode() + } + ProposalDetails::SetStorageRoleParameters(role_parameters) => Call::Actors( + roles::actors::Call::set_role_parameters(Role::StorageProvider, role_parameters), + ) + .encode(), + ProposalDetails::RuntimeUpgrade(wasm_code) => { + // The runtime upgrade proposal has two proposal details: wasm and wasm hash. + // This is an exception for the optimization. + + // This is a real extrinsic call. + Call::ProposalsCodex(proposals_codex::Call::execute_runtime_upgrade_proposal( + wasm_code, + )) + .encode() + } + ProposalDetails::RuntimeUpgradeHash(_) => { + // The runtime upgrade proposal has two proposal details: wasm and wasm hash. + // This is an exception for the optimization. + + // Cannot be here. This is a bug. + print("Invalid proposal: cannot encode ProposalDetails::RuntimeUpgradeHash"); + + Vec::new() + } } } } diff --git a/runtime/src/test/proposals_integration.rs b/runtime/src/test/proposals_integration.rs index 0854a0dc5c..3360eaa19a 100644 --- a/runtime/src/test/proposals_integration.rs +++ b/runtime/src/test/proposals_integration.rs @@ -396,8 +396,6 @@ fn text_proposal_execution_succeeds() { setup_members(7); setup_council(); - println!("{}", CouncilManager::::total_voters_count()); - let member_id = 1; let account_id: [u8; 32] = [member_id; 32]; increase_total_balance_issuance_using_account_id(account_id.clone().into(), 500000); From ebecf2d83763876726346145223bc7026b9b20d3 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Wed, 22 Apr 2020 20:36:42 +0300 Subject: [PATCH 230/286] Add runtime-proposal codex integration tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - add integration test for the ‘set lead’ proposal - add integration test for the ‘spending’ proposal --- runtime-modules/governance/src/council.rs | 2 +- runtime/src/test/proposals_integration.rs | 121 +++++++++++++++++++--- 2 files changed, 106 insertions(+), 17 deletions(-) diff --git a/runtime-modules/governance/src/council.rs b/runtime-modules/governance/src/council.rs index e419d3ebdd..51d2d11230 100644 --- a/runtime-modules/governance/src/council.rs +++ b/runtime-modules/governance/src/council.rs @@ -136,7 +136,7 @@ decl_module! { /// Sets the capacity of the the council mint, if it doesn't exist, attempts to /// create a new one. - fn set_council_mint_capacity(origin, capacity: minting::BalanceOf) { + pub fn set_council_mint_capacity(origin, capacity: minting::BalanceOf) { ensure_root(origin)?; if let Some(mint_id) = Self::council_mint() { diff --git a/runtime/src/test/proposals_integration.rs b/runtime/src/test/proposals_integration.rs index 3360eaa19a..c296f48db1 100644 --- a/runtime/src/test/proposals_integration.rs +++ b/runtime/src/test/proposals_integration.rs @@ -27,6 +27,7 @@ fn initial_test_ext() -> runtime_io::TestExternalities { t.into() } +type Balances = balances::Module; type System = system::Module; type Membership = membership::members::Module; type ProposalsEngine = proposals_engine::Module; @@ -390,27 +391,26 @@ fn proposal_reset_succeeds() { }); } -#[test] -fn text_proposal_execution_succeeds() { - initial_test_ext().execute_with(|| { - setup_members(7); +struct CodexProposalTestFixture +where + SuccessfulCall: Fn() -> DispatchResult, +{ + successful_call: SuccessfulCall, +} + +impl CodexProposalTestFixture +where + SuccessfulCall: Fn() -> DispatchResult, +{ + fn call_extrinsic_and_assert(&self) { + setup_members(15); setup_council(); - let member_id = 1; + let member_id = 10; let account_id: [u8; 32] = [member_id; 32]; increase_total_balance_issuance_using_account_id(account_id.clone().into(), 500000); - assert_eq!( - ProposalCodex::create_text_proposal( - RawOrigin::Signed(account_id.into()).into(), - member_id as u64, - b"title".to_vec(), - b"body".to_vec(), - Some(>::from(1250u32)), - b"text".to_vec(), - ), - Ok(()) - ); + assert_eq!((self.successful_call)(), Ok(())); let proposal_id = 1; @@ -440,5 +440,94 @@ fn text_proposal_execution_succeeds() { ..proposal } ); + } +} + +#[test] +fn text_proposal_execution_succeeds() { + initial_test_ext().execute_with(|| { + let member_id = 10; + let account_id: [u8; 32] = [member_id; 32]; + + let codex_extrinsic_test_fixture = CodexProposalTestFixture { + successful_call: || { + ProposalCodex::create_text_proposal( + RawOrigin::Signed(account_id.into()).into(), + member_id as u64, + b"title".to_vec(), + b"body".to_vec(), + Some(>::from(1250u32)), + b"text".to_vec(), + ) + }, + }; + + codex_extrinsic_test_fixture.call_extrinsic_and_assert(); + }); +} + +#[test] +fn set_lead_proposal_execution_succeeds() { + initial_test_ext().execute_with(|| { + let member_id = 10; + let account_id: [u8; 32] = [member_id; 32]; + + let codex_extrinsic_test_fixture = CodexProposalTestFixture { + successful_call: || { + ProposalCodex::create_set_lead_proposal( + RawOrigin::Signed(account_id.clone().into()).into(), + member_id as u64, + b"title".to_vec(), + b"body".to_vec(), + Some(>::from(1250u32)), + Some((member_id as u64, account_id.into())), + ) + }, + }; + + assert!(content_working_group::Module::::ensure_lead_is_set().is_err()); + + codex_extrinsic_test_fixture.call_extrinsic_and_assert(); + + assert!(content_working_group::Module::::ensure_lead_is_set().is_ok()); + }); +} + +#[test] +fn spending_proposal_execution_succeeds() { + initial_test_ext().execute_with(|| { + let member_id = 10; + let account_id: [u8; 32] = [member_id; 32]; + let new_balance = >::from(5555u32); + + let target_account_id: [u8; 32] = [12; 32]; + + assert!(Council::set_council_mint_capacity(RawOrigin::Root.into(), new_balance).is_ok()); + + let codex_extrinsic_test_fixture = CodexProposalTestFixture { + successful_call: || { + ProposalCodex::create_spending_proposal( + RawOrigin::Signed(account_id.clone().into()).into(), + member_id as u64, + b"title".to_vec(), + b"body".to_vec(), + Some(>::from(1250u32)), + new_balance, + target_account_id.clone().into(), + ) + }, + }; + + assert_eq!( + Balances::free_balance::(target_account_id.clone().into()), + 0 + ); + + codex_extrinsic_test_fixture.call_extrinsic_and_assert(); + + assert_eq!( + Balances::free_balance::(target_account_id.into()), + new_balance + ); }); } From 2562fbe1474ac68b1f5cda5f007ec7feec6ba891 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Thu, 23 Apr 2020 16:51:48 +0300 Subject: [PATCH 231/286] Remove RuntimeUpgradeHash proposal details - remove the optimization for the runtime upgrade proposal --- runtime-modules/proposals/codex/Cargo.toml | 12 +++++----- runtime-modules/proposals/codex/src/lib.rs | 9 +------ .../proposals/codex/src/proposal_types/mod.rs | 7 +----- .../proposals/codex/src/tests/mod.rs | 3 +-- .../integration/proposals/proposal_encoder.rs | 24 ++++--------------- 5 files changed, 13 insertions(+), 42 deletions(-) diff --git a/runtime-modules/proposals/codex/Cargo.toml b/runtime-modules/proposals/codex/Cargo.toml index 9369a6daf9..5b5ea5a2c9 100644 --- a/runtime-modules/proposals/codex/Cargo.toml +++ b/runtime-modules/proposals/codex/Cargo.toml @@ -91,12 +91,6 @@ git = 'https://github.com/paritytech/substrate.git' package = 'srml-staking' rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' -[dependencies.runtime-io] -default_features = false -git = 'https://github.com/paritytech/substrate.git' -package = 'sr-io' -rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' - [dependencies.stake] default_features = false package = 'substrate-stake-module' @@ -173,6 +167,12 @@ git = 'https://github.com/paritytech/substrate.git' package = 'sr-staking-primitives' rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' +[dev-dependencies.runtime-io] +default_features = false +git = 'https://github.com/paritytech/substrate.git' +package = 'sr-io' +rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8' + # don't rename the dependency it is causing some strange compiler error: # https://github.com/rust-lang/rust/issues/64450 [dev-dependencies.srml-staking-reward-curve] diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index 1f6c812b67..04e0d2cdc6 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -55,7 +55,6 @@ use rstd::convert::TryInto; use rstd::prelude::*; use rstd::str::from_utf8; use rstd::vec::Vec; -use runtime_io::blake2_256; use sr_primitives::traits::SaturatedConversion; use sr_primitives::traits::{One, Zero}; use sr_primitives::Perbill; @@ -372,16 +371,10 @@ decl_module! { ensure!(wasm.len() as u32 <= T::RuntimeUpgradeWasmProposalMaxLength::get(), Error::RuntimeProposalSizeExceeded); - let wasm_hash = blake2_256(&wasm); - - // The runtime upgrade proposal has two proposal details: wasm and wasm hash. - // This is an exception for the optimization. - let proposal_parameters = proposal_types::parameters::runtime_upgrade_proposal::(); let proposal_details = ProposalDetails::RuntimeUpgrade(wasm); let proposal_code = T::ProposalEncoder::encode_proposal(proposal_details.clone()); - let proposal_details_for_hash = ProposalDetails::RuntimeUpgradeHash(wasm_hash.to_vec()); Self::create_proposal( origin, member_id, @@ -390,7 +383,7 @@ decl_module! { stake_balance, proposal_code, proposal_parameters, - proposal_details_for_hash, + proposal_details, )?; } diff --git a/runtime-modules/proposals/codex/src/proposal_types/mod.rs b/runtime-modules/proposals/codex/src/proposal_types/mod.rs index 7d720bf20c..fc0a1ce370 100644 --- a/runtime-modules/proposals/codex/src/proposal_types/mod.rs +++ b/runtime-modules/proposals/codex/src/proposal_types/mod.rs @@ -30,12 +30,7 @@ pub enum ProposalDetails), - /// The hash of wasm code for the `runtime upgrade` proposal. The runtime upgrade proposal has - /// two proposal details: wasm and wasm hash. This is an exception for the optimization. - RuntimeUpgradeHash(Vec), - - /// The wasm code for the `runtime upgrade` proposal. The runtime upgrade proposal has - /// two proposal details: wasm and wasm hash. This is an exception for the optimization. + /// The wasm code for the `runtime upgrade` proposal RuntimeUpgrade(Vec), /// Election parameters for the `set election parameters` proposal diff --git a/runtime-modules/proposals/codex/src/tests/mod.rs b/runtime-modules/proposals/codex/src/tests/mod.rs index 23255ea622..2bc3f870f4 100644 --- a/runtime-modules/proposals/codex/src/tests/mod.rs +++ b/runtime-modules/proposals/codex/src/tests/mod.rs @@ -8,7 +8,6 @@ use system::RawOrigin; use crate::{BalanceOf, Error, ProposalDetails}; use proposal_engine::ProposalParameters; use roles::actors::RoleParameters; -use runtime_io::blake2_256; use srml_support::dispatch::DispatchResult; pub use mock::*; @@ -223,7 +222,7 @@ fn create_runtime_upgrade_common_checks_succeed() { ) }, proposal_parameters: crate::proposal_types::parameters::runtime_upgrade_proposal::(), - proposal_details: ProposalDetails::RuntimeUpgradeHash(blake2_256(b"wasm").to_vec()), + proposal_details: ProposalDetails::RuntimeUpgrade(b"wasm".to_vec()), }; proposal_fixture.check_all(); }); diff --git a/runtime/src/integration/proposals/proposal_encoder.rs b/runtime/src/integration/proposals/proposal_encoder.rs index 5712c3d84e..7069f28af9 100644 --- a/runtime/src/integration/proposals/proposal_encoder.rs +++ b/runtime/src/integration/proposals/proposal_encoder.rs @@ -4,7 +4,6 @@ use roles::actors::Role; use codec::Encode; use rstd::vec::Vec; -use srml_support::print; /// _ProposalEncoder_ implementation. It encodes extrinsics with proposal details parameters /// using Runtime Call and parity codec. @@ -43,25 +42,10 @@ impl ProposalEncoder for ExtrinsicProposalEncoder { roles::actors::Call::set_role_parameters(Role::StorageProvider, role_parameters), ) .encode(), - ProposalDetails::RuntimeUpgrade(wasm_code) => { - // The runtime upgrade proposal has two proposal details: wasm and wasm hash. - // This is an exception for the optimization. - - // This is a real extrinsic call. - Call::ProposalsCodex(proposals_codex::Call::execute_runtime_upgrade_proposal( - wasm_code, - )) - .encode() - } - ProposalDetails::RuntimeUpgradeHash(_) => { - // The runtime upgrade proposal has two proposal details: wasm and wasm hash. - // This is an exception for the optimization. - - // Cannot be here. This is a bug. - print("Invalid proposal: cannot encode ProposalDetails::RuntimeUpgradeHash"); - - Vec::new() - } + ProposalDetails::RuntimeUpgrade(wasm_code) => Call::ProposalsCodex( + proposals_codex::Call::execute_runtime_upgrade_proposal(wasm_code), + ) + .encode(), } } } From 08bba74371306ec0e3a85e5c23096a436f1939f7 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Thu, 23 Apr 2020 19:42:44 +0300 Subject: [PATCH 232/286] Add runtime integration tests for all proposals Only runtime upgrade proposal is missing --- runtime/src/test/proposals_integration.rs | 204 +++++++++++++++++++++- 1 file changed, 200 insertions(+), 4 deletions(-) diff --git a/runtime/src/test/proposals_integration.rs b/runtime/src/test/proposals_integration.rs index c296f48db1..88f1dda18d 100644 --- a/runtime/src/test/proposals_integration.rs +++ b/runtime/src/test/proposals_integration.rs @@ -2,19 +2,22 @@ #![cfg(test)] -use crate::{BlockNumber, ProposalCancellationFee, Runtime}; +use crate::{BlockNumber, ElectionParameters, ProposalCancellationFee, Runtime}; use codec::Encode; use governance::election::CouncilElected; use membership::members; +use membership::role_types::Role; use proposals_engine::{ ActiveStake, ApprovedProposalStatus, BalanceOf, Error, FinalizationData, Proposal, ProposalDecisionStatus, ProposalParameters, ProposalStatus, VoteKind, VotersParameters, VotingResults, }; +use roles::actors::RoleParameters; + use sr_primitives::traits::{DispatchResult, OnFinalize, OnInitialize}; use sr_primitives::AccountId32; use srml_support::traits::Currency; -use srml_support::StorageLinkedMap; +use srml_support::{StorageLinkedMap, StorageMap, StorageValue}; use system::RawOrigin; use crate::CouncilManager; @@ -32,7 +35,9 @@ type System = system::Module; type Membership = membership::members::Module; type ProposalsEngine = proposals_engine::Module; type Council = governance::council::Module; +type Election = governance::election::Module; type ProposalCodex = proposals_codex::Module; +type Mint = minting::Module; fn setup_members(count: u8) { let authority_account_id = ::AccountId::default(); @@ -396,6 +401,7 @@ where SuccessfulCall: Fn() -> DispatchResult, { successful_call: SuccessfulCall, + member_id: u64, } impl CodexProposalTestFixture @@ -406,8 +412,7 @@ where setup_members(15); setup_council(); - let member_id = 10; - let account_id: [u8; 32] = [member_id; 32]; + let account_id: [u8; 32] = [self.member_id as u8; 32]; increase_total_balance_issuance_using_account_id(account_id.clone().into(), 500000); assert_eq!((self.successful_call)(), Ok(())); @@ -450,6 +455,7 @@ fn text_proposal_execution_succeeds() { let account_id: [u8; 32] = [member_id; 32]; let codex_extrinsic_test_fixture = CodexProposalTestFixture { + member_id: member_id as u64, successful_call: || { ProposalCodex::create_text_proposal( RawOrigin::Signed(account_id.into()).into(), @@ -473,6 +479,7 @@ fn set_lead_proposal_execution_succeeds() { let account_id: [u8; 32] = [member_id; 32]; let codex_extrinsic_test_fixture = CodexProposalTestFixture { + member_id: member_id as u64, successful_call: || { ProposalCodex::create_set_lead_proposal( RawOrigin::Signed(account_id.clone().into()).into(), @@ -505,6 +512,7 @@ fn spending_proposal_execution_succeeds() { assert!(Council::set_council_mint_capacity(RawOrigin::Root.into(), new_balance).is_ok()); let codex_extrinsic_test_fixture = CodexProposalTestFixture { + member_id: member_id as u64, successful_call: || { ProposalCodex::create_spending_proposal( RawOrigin::Signed(account_id.clone().into()).into(), @@ -531,3 +539,191 @@ fn spending_proposal_execution_succeeds() { ); }); } + +#[test] +fn set_content_working_group_mint_capacity_execution_succeeds() { + initial_test_ext().execute_with(|| { + let member_id = 1; + let account_id: [u8; 32] = [member_id; 32]; + let new_balance = >::from(55u32); + + let mint_id = + Mint::add_mint(0, None).expect("Failed to create a mint for the content working group"); + >::put(mint_id); + + assert_eq!(Mint::get_mint_capacity(mint_id), Ok(0)); + + let codex_extrinsic_test_fixture = CodexProposalTestFixture { + member_id: member_id as u64, + successful_call: || { + ProposalCodex::create_set_content_working_group_mint_capacity_proposal( + RawOrigin::Signed(account_id.clone().into()).into(), + member_id as u64, + b"title".to_vec(), + b"body".to_vec(), + Some(>::from(1250u32)), + new_balance, + ) + }, + }; + + codex_extrinsic_test_fixture.call_extrinsic_and_assert(); + + assert_eq!(Mint::get_mint_capacity(mint_id), Ok(new_balance)); + }); +} + +#[test] +fn set_election_parameters_proposal_execution_succeeds() { + initial_test_ext().execute_with(|| { + let member_id = 1; + let account_id: [u8; 32] = [member_id; 32]; + + let election_parameters = ElectionParameters { + announcing_period: 14400, + voting_period: 14400, + revealing_period: 14400, + council_size: 4, + candidacy_limit: 25, + new_term_duration: 14400, + min_council_stake: 1, + min_voting_stake: 1, + }; + assert_eq!(Election::announcing_period(), 0); + + let codex_extrinsic_test_fixture = CodexProposalTestFixture { + member_id: member_id as u64, + successful_call: || { + ProposalCodex::create_set_election_parameters_proposal( + RawOrigin::Signed(account_id.clone().into()).into(), + member_id as u64, + b"title".to_vec(), + b"body".to_vec(), + Some(>::from(3750u32)), + election_parameters, + ) + }, + }; + codex_extrinsic_test_fixture.call_extrinsic_and_assert(); + + assert_eq!(Election::announcing_period(), 14400); + }); +} + +#[test] +fn evict_storage_provider_proposal_execution_succeeds() { + initial_test_ext().execute_with(|| { + let member_id = 1; + let account_id: [u8; 32] = [member_id; 32]; + + let target_member_id = 3; + let target_account: [u8; 32] = [target_member_id; 32]; + let target_account_id: AccountId32 = target_account.into(); + + >::insert( + Role::StorageProvider, + roles::actors::RoleParameters::default(), + ); + + >::insert( + Role::StorageProvider, + vec![target_account_id.clone()], + ); + + >::insert( + target_account_id.clone(), + roles::actors::Actor { + member_id: target_member_id as u64, + role: Role::StorageProvider, + account: target_account_id, + joined_at: 1, + }, + ); + + let codex_extrinsic_test_fixture = CodexProposalTestFixture { + member_id: member_id as u64, + successful_call: || { + ProposalCodex::create_evict_storage_provider_proposal( + RawOrigin::Signed(account_id.clone().into()).into(), + member_id as u64, + b"title".to_vec(), + b"body".to_vec(), + Some(>::from(500u32)), + target_account.into(), + ) + }, + }; + codex_extrinsic_test_fixture.call_extrinsic_and_assert(); + + assert_eq!( + >::get(Role::StorageProvider), + Vec::new() + ); + }); +} + +#[test] +fn set_storage_role_parameters_proposal_execution_succeeds() { + initial_test_ext().execute_with(|| { + let member_id = 1; + let account_id: [u8; 32] = [member_id; 32]; + + >::insert( + Role::StorageProvider, + RoleParameters::default(), + ); + + let target_role_parameters = RoleParameters { + startup_grace_period: 700, + ..RoleParameters::default() + }; + + let codex_extrinsic_test_fixture = CodexProposalTestFixture { + member_id: member_id as u64, + successful_call: || { + ProposalCodex::create_set_storage_role_parameters_proposal( + RawOrigin::Signed(account_id.clone().into()).into(), + member_id as u64, + b"title".to_vec(), + b"body".to_vec(), + Some(>::from(1250u32)), + target_role_parameters.clone(), + ) + }, + }; + codex_extrinsic_test_fixture.call_extrinsic_and_assert(); + + assert_eq!( + >::get(Role::StorageProvider), + Some(target_role_parameters) + ); + }); +} + +#[test] +fn set_validator_count_proposal_execution_succeeds() { + initial_test_ext().execute_with(|| { + let member_id = 1; + let account_id: [u8; 32] = [member_id; 32]; + + let new_validator_count = 8; + assert_eq!(::get(), 0); + + let codex_extrinsic_test_fixture = CodexProposalTestFixture { + member_id: member_id as u64, + successful_call: || { + ProposalCodex::create_set_validator_count_proposal( + RawOrigin::Signed(account_id.clone().into()).into(), + member_id as u64, + b"title".to_vec(), + b"body".to_vec(), + Some(>::from(1250u32)), + new_validator_count, + ) + }, + }; + codex_extrinsic_test_fixture.call_extrinsic_and_assert(); + + assert_eq!(::get(), new_validator_count); + }); +} From 14e99bce1c68c9cccff7f8039f874950aabc64e3 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 24 Apr 2020 12:30:47 +0300 Subject: [PATCH 233/286] =?UTF-8?q?Fix=20=E2=80=98cargo=20intall=20issue?= =?UTF-8?q?=E2=80=99=20with=20codex?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/Joystream/joystream/issues/305 --- runtime-modules/proposals/codex/Cargo.toml | 2 ++ runtime/Cargo.toml | 3 +++ 2 files changed, 5 insertions(+) diff --git a/runtime-modules/proposals/codex/Cargo.toml b/runtime-modules/proposals/codex/Cargo.toml index 9369a6daf9..3d0552c0af 100644 --- a/runtime-modules/proposals/codex/Cargo.toml +++ b/runtime-modules/proposals/codex/Cargo.toml @@ -25,6 +25,8 @@ std = [ 'governance/std', 'mint/std', 'roles/std', + 'common/std', + 'content_working_group/std', ] diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 90d74ed9a1..5585bbd09b 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -59,6 +59,9 @@ std = [ 'roles/std', 'service_discovery/std', 'storage/std', + 'proposals_engine/std', + 'proposals_discussion/std', + 'proposals_codex/std', ] # [dependencies] From 370e00849d018cc822f0c253ba72940940054920 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 24 Apr 2020 13:03:22 +0300 Subject: [PATCH 234/286] Add comments to the proposals codex module --- runtime-modules/proposals/codex/src/lib.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index 04e0d2cdc6..e1baf68832 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -34,6 +34,9 @@ //! - [governance](../substrate_governance_module/index.html) //! - [content_working_group](../substrate_content_working_group_module/index.html) //! +//! ### Notes +//! The module uses [ProposalEncoder](./trait.ProposalEncoder.html) to encode the proposal using +//! its details. Encoded byte vector is passed to the _proposals engine_ as serialized executable code. // Ensure we're `no_std` when compiling for Wasm. #![cfg_attr(not(feature = "std"), no_std)] @@ -93,6 +96,7 @@ pub trait Trait: Self::AccountId, >; + /// Encodes the proposal usint its details type ProposalEncoder: ProposalEncoder; } From 712fe2c56c086159d91bb33a8645e8a5c0bf5029 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 24 Apr 2020 17:45:35 +0300 Subject: [PATCH 235/286] Modify travis.yml to enable clippy checks --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 5798a3f78a..b6bd8b81f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,8 @@ matrix: before_install: - rustup component add rustfmt - cargo fmt --all -- --check + - rustup component add clippy + - BUILD_DUMMY_WASM_BINARY=1 cargo clippy -- -D warnings - rustup default stable - rustup update nightly - rustup target add wasm32-unknown-unknown --toolchain nightly From b71e47184604c79698f17b94bac87516c063e132 Mon Sep 17 00:00:00 2001 From: Gleb Urvanov Date: Fri, 24 Apr 2020 16:47:40 +0200 Subject: [PATCH 236/286] updated runtime from Rome to Constantinople --- .gitignore | 3 + tests/network-tests/.env | 4 +- .../network-tests/joystream_node_runtime.wasm | Bin 1777201 -> 0 bytes tests/network-tests/package.json | 3 +- .../src/tests/rome/electingCouncilTest.ts | 127 +++++ .../src/tests/rome/membershipCreationTest.ts | 94 ++++ .../romeRuntimeUpgradeTest.ts | 28 +- .../src/tests/rome/utils/apiWrapper.ts | 433 ++++++++++++++++++ .../src/tests/rome/utils/sender.ts | 66 +++ .../src/tests/rome/utils/utils.ts | 51 +++ tests/network-tests/src/utils/apiWrapper.ts | 4 + tests/network-tests/src/utils/utils.ts | 1 + 12 files changed, 799 insertions(+), 15 deletions(-) delete mode 100644 tests/network-tests/joystream_node_runtime.wasm create mode 100644 tests/network-tests/src/tests/rome/electingCouncilTest.ts create mode 100644 tests/network-tests/src/tests/rome/membershipCreationTest.ts rename tests/network-tests/src/tests/{upgrade => rome}/romeRuntimeUpgradeTest.ts (78%) create mode 100644 tests/network-tests/src/tests/rome/utils/apiWrapper.ts create mode 100644 tests/network-tests/src/tests/rome/utils/sender.ts create mode 100644 tests/network-tests/src/tests/rome/utils/utils.ts diff --git a/.gitignore b/.gitignore index 22fa52c180..e590d097e2 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,6 @@ yarn* # Visual Studio Code .vscode + +# Compiled WASM code +*.wasm \ No newline at end of file diff --git a/tests/network-tests/.env b/tests/network-tests/.env index e95cc8a1cf..c3c3a62e65 100644 --- a/tests/network-tests/.env +++ b/tests/network-tests/.env @@ -15,4 +15,6 @@ COUNCIL_ELECTION_K = 2 # Balance to spend using spending proposal SPENDING_BALANCE = 1000 # Minting capacity for content working group minting capacity test. -MINTING_CAPACITY = 100020 \ No newline at end of file +MINTING_CAPACITY = 100020 +# Stake amount for Rome runtime upgrade proposal +RUNTIME_UPGRADE_PROPOSAL_STAKE = 100000 \ No newline at end of file diff --git a/tests/network-tests/joystream_node_runtime.wasm b/tests/network-tests/joystream_node_runtime.wasm deleted file mode 100644 index de03b4ad32c1416c00afc26db804a9484f9d5b5b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1777201 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

dj&Wl+y63RiVd7NR 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�T&iuy@W%p!V? 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∋vF>!TH3d9>BvA}JUmfTVV6nJ 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
SY*CMnF>Z5`(;(O%MgWjk~E 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

2tMtqe5(H@wbil9I1h-awK*)E+vWw zy?sUy(>B{x|Js41Qe*kR9E!7;m^Af{3AsvVf?!)woSN_-Dfm$j#mfKAnF~kQ5U-C1 z^khwN^0QC}`om->FvfPMcWHTdBld#hz2~$b_X^f}z}M($wTPxE!fk0=0-*#O0DLl=pgl*u$B2L%wcR)3PTR89Yg)OXeGE!whB^y1`_AoTzm88=6a&n@=(Te7qV1vb=EP)^mwtd5bOQU z6F@wO{lz5{N^tGs`|&798{oWz8Yv+>xoYRP-i{etE*`G&ajo9m8PX=Qml-4IJROF z#O#H`KFcVn3>1{3-aqpWO*Iu0qGIfX1(H&qEpF%(&ch3QZ0*=SwD;xYq>R3n)$D-F z%?Xp3lrM^oYWc6*j9$+#u)zpC0YwIqhB%%%Ly~=1v#HF3_7{@)sy;X)IG^LR*Uldr zJ&S+>FN97|^WJueIjyJaLo=hp9-`|5Y*7J$9{XjT0EB;`PDtYkcG^I%i(0y`fSFLI9BcTW)Jji=l71i3<}{MJ?gte1Y56!x+F4iruM?o?R*IK2Lk~b=-b#-crj&T^tYOGP@OpFF; zSoK2n$r(YsEBHrlTj|S*CSmz_*i1|TYay+S_+k8pfC-6J4{M%rU%4z8!8RT6Wk+SjLlb4aLDOI_g zN)(ZstUfoBBVw6l8O)9b$G=cQY7B0+4$}y!Zk@QmBuH!(*N^)Aj3C(LLEt^xejYOL zLMPg˗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 diff --git a/tests/network-tests/package.json b/tests/network-tests/package.json index 7de9a2fbb1..e7a56d58c7 100644 --- a/tests/network-tests/package.json +++ b/tests/network-tests/package.json @@ -9,7 +9,8 @@ "prettier": "prettier --write ./src" }, "dependencies": { - "@joystream/types": "../joystream-apps/packages/joy-types", + "@joystream/types": "^0.7.0", + "@rome/types@npm:@joystream/types": "^0.7.0", "@polkadot/api": "^0.96.1", "@polkadot/keyring": "^1.7.0-beta.5", "@types/bn.js": "^4.11.5", diff --git a/tests/network-tests/src/tests/rome/electingCouncilTest.ts b/tests/network-tests/src/tests/rome/electingCouncilTest.ts new file mode 100644 index 0000000000..f090d27737 --- /dev/null +++ b/tests/network-tests/src/tests/rome/electingCouncilTest.ts @@ -0,0 +1,127 @@ +import { membershipTest } from './membershipCreationTest'; +import { KeyringPair } from '@polkadot/keyring/types'; +import { ApiWrapper } from './utils/apiWrapper'; +import { WsProvider, Keyring } from '@polkadot/api'; +import { initConfig } from '../../utils/config'; +import BN = require('bn.js'); +import { registerJoystreamTypes, Seat } from '@rome/types'; +import { assert } from 'chai'; +import { v4 as uuid } from 'uuid'; +import { Utils } from './utils/utils'; + +export function councilTest(m1KeyPairs: KeyringPair[], m2KeyPairs: KeyringPair[]) { + initConfig(); + const keyring = new Keyring({ type: 'sr25519' }); + const nodeUrl: string = process.env.NODE_URL!; + const sudoUri: string = process.env.SUDO_ACCOUNT_URI!; + const K: number = +process.env.COUNCIL_ELECTION_K!; + const greaterStake: BN = new BN(+process.env.COUNCIL_STAKE_GREATER_AMOUNT!); + const lesserStake: BN = new BN(+process.env.COUNCIL_STAKE_LESSER_AMOUNT!); + const defaultTimeout: number = 120000; + let sudo: KeyringPair; + let apiWrapper: ApiWrapper; + + before(async function () { + this.timeout(defaultTimeout); + registerJoystreamTypes(); + const provider = new WsProvider(nodeUrl); + apiWrapper = await ApiWrapper.create(provider); + }); + + it('Electing a council test', async () => { + // Setup goes here because M keypairs are generated after before() function + sudo = keyring.addFromUri(sudoUri); + let now = await apiWrapper.getBestBlock(); + const applyForCouncilFee: BN = apiWrapper.estimateApplyForCouncilFee(greaterStake); + const voteForCouncilFee: BN = apiWrapper.estimateVoteForCouncilFee(sudo.address, sudo.address, greaterStake); + const salt: string[] = new Array(); + m1KeyPairs.forEach(() => { + salt.push(''.concat(uuid().replace(/-/g, ''))); + }); + const revealVoteFee: BN = apiWrapper.estimateRevealVoteFee(sudo.address, salt[0]); + + // Topping the balances + await apiWrapper.transferBalanceToAccounts(sudo, m2KeyPairs, applyForCouncilFee.add(greaterStake)); + await apiWrapper.transferBalanceToAccounts( + sudo, + m1KeyPairs, + voteForCouncilFee.add(revealVoteFee).add(greaterStake) + ); + + // First K members stake more + await apiWrapper.sudoStartAnnouncingPerion(sudo, now.addn(100)); + await apiWrapper.batchApplyForCouncilElection(m2KeyPairs.slice(0, K), greaterStake); + m2KeyPairs.slice(0, K).forEach(keyPair => + apiWrapper.getCouncilElectionStake(keyPair.address).then(stake => { + assert( + stake.eq(greaterStake), + `${keyPair.address} not applied correctrly for council election with stake ${stake} versus expected ${greaterStake}` + ); + }) + ); + + // Last members stake less + await apiWrapper.batchApplyForCouncilElection(m2KeyPairs.slice(K), lesserStake); + m2KeyPairs.slice(K).forEach(keyPair => + apiWrapper.getCouncilElectionStake(keyPair.address).then(stake => { + assert( + stake.eq(lesserStake), + `${keyPair.address} not applied correctrly for council election with stake ${stake} versus expected ${lesserStake}` + ); + }) + ); + + // Voting + await apiWrapper.sudoStartVotingPerion(sudo, now.addn(100)); + await apiWrapper.batchVoteForCouncilMember( + m1KeyPairs.slice(0, K), + m2KeyPairs.slice(0, K), + salt.slice(0, K), + lesserStake + ); + await apiWrapper.batchVoteForCouncilMember(m1KeyPairs.slice(K), m2KeyPairs.slice(K), salt.slice(K), greaterStake); + + // Revealing + await apiWrapper.sudoStartRevealingPerion(sudo, now.addn(100)); + await apiWrapper.batchRevealVote(m1KeyPairs.slice(0, K), m2KeyPairs.slice(0, K), salt.slice(0, K)); + await apiWrapper.batchRevealVote(m1KeyPairs.slice(K), m2KeyPairs.slice(K), salt.slice(K)); + now = await apiWrapper.getBestBlock(); + + // Resolving election + // 3 is to ensure the revealing block is in future + await apiWrapper.sudoStartRevealingPerion(sudo, now.addn(3)); + await Utils.wait(apiWrapper.getBlockDuration().muln(2.5).toNumber()); + const seats: Seat[] = await apiWrapper.getCouncil(); + + // Preparing collections to increase assertion readability + const m2addresses: string[] = m2KeyPairs.map(keyPair => keyPair.address); + const m1addresses: string[] = m1KeyPairs.map(keyPair => keyPair.address); + const members: string[] = seats.map(seat => seat.member.toString()); + const bakers: string[] = seats.reduce( + (array, seat) => array.concat(seat.backers.map(baker => baker.member.toString())), + new Array() + ); + + // Assertions + m2addresses.forEach(address => assert(members.includes(address), `Account ${address} is not in the council`)); + m1addresses.forEach(address => assert(bakers.includes(address), `Account ${address} is not in the voters`)); + seats.forEach(seat => + assert( + Utils.getTotalStake(seat).eq(greaterStake.add(lesserStake)), + `Member ${seat.member} has unexpected stake ${Utils.getTotalStake(seat)}` + ) + ); + }).timeout(defaultTimeout); + + after(() => { + apiWrapper.close(); + }); +} + +describe.skip('Council integration tests', () => { + const m1KeyPairs: KeyringPair[] = new Array(); + const m2KeyPairs: KeyringPair[] = new Array(); + membershipTest(m1KeyPairs); + membershipTest(m2KeyPairs); + councilTest(m1KeyPairs, m2KeyPairs); +}); diff --git a/tests/network-tests/src/tests/rome/membershipCreationTest.ts b/tests/network-tests/src/tests/rome/membershipCreationTest.ts new file mode 100644 index 0000000000..c4413966f4 --- /dev/null +++ b/tests/network-tests/src/tests/rome/membershipCreationTest.ts @@ -0,0 +1,94 @@ +import { WsProvider } from '@polkadot/api'; +import { registerJoystreamTypes } from '@rome/types'; +import { Keyring } from '@polkadot/keyring'; +import { assert } from 'chai'; +import { KeyringPair } from '@polkadot/keyring/types'; +import BN = require('bn.js'); +import { ApiWrapper } from './utils/apiWrapper'; +import { initConfig } from '../../utils/config'; +import { v4 as uuid } from 'uuid'; + +export function membershipTest(nKeyPairs: KeyringPair[]) { + initConfig(); + const keyring = new Keyring({ type: 'sr25519' }); + const N: number = +process.env.MEMBERSHIP_CREATION_N!; + const paidTerms: number = +process.env.MEMBERSHIP_PAID_TERMS!; + const nodeUrl: string = process.env.NODE_URL!; + const sudoUri: string = process.env.SUDO_ACCOUNT_URI!; + const defaultTimeout: number = 30000; + let apiWrapper: ApiWrapper; + let sudo: KeyringPair; + let aKeyPair: KeyringPair; + let membershipFee: BN; + let membershipTransactionFee: BN; + + before(async function () { + this.timeout(defaultTimeout); + registerJoystreamTypes(); + const provider = new WsProvider(nodeUrl); + apiWrapper = await ApiWrapper.create(provider); + sudo = keyring.addFromUri(sudoUri); + for (let i = 0; i < N; i++) { + nKeyPairs.push(keyring.addFromUri(i + uuid().substring(0, 8))); + } + aKeyPair = keyring.addFromUri(uuid().substring(0, 8)); + membershipFee = await apiWrapper.getMembershipFee(paidTerms); + membershipTransactionFee = apiWrapper.estimateBuyMembershipFee( + sudo, + paidTerms, + 'member_name_which_is_longer_than_expected' + ); + await apiWrapper.transferBalanceToAccounts(sudo, nKeyPairs, membershipTransactionFee.add(new BN(membershipFee))); + await apiWrapper.transferBalance(sudo, aKeyPair.address, membershipTransactionFee); + }); + + it('Buy membeship is accepted with sufficient funds', async () => { + await Promise.all( + nKeyPairs.map(async (keyPair, index) => { + await apiWrapper.buyMembership(keyPair, paidTerms, `new_member_${index}${keyPair.address.substring(0, 8)}`); + }) + ); + nKeyPairs.forEach((keyPair, index) => + apiWrapper + .getMemberIds(keyPair.address) + .then(membership => assert(membership.length > 0, `Account ${keyPair.address} is not a member`)) + ); + }).timeout(defaultTimeout); + + it('Account A can not buy the membership with insufficient funds', async () => { + await apiWrapper + .getBalance(aKeyPair.address) + .then(balance => + assert( + balance.toBn() < membershipFee.add(membershipTransactionFee), + 'Account A already have sufficient balance to purchase membership' + ) + ); + await apiWrapper.buyMembership(aKeyPair, paidTerms, `late_member_${aKeyPair.address.substring(0, 8)}`, true); + apiWrapper + .getMemberIds(aKeyPair.address) + .then(membership => assert(membership.length === 0, 'Account A is a member')); + }).timeout(defaultTimeout); + + it('Account A was able to buy the membership with sufficient funds', async () => { + await apiWrapper.transferBalance(sudo, aKeyPair.address, membershipFee.add(membershipTransactionFee)); + apiWrapper + .getBalance(aKeyPair.address) + .then(balance => + assert(balance.toBn() >= membershipFee, 'The account balance is insufficient to purchase membership') + ); + await apiWrapper.buyMembership(aKeyPair, paidTerms, `late_member_${aKeyPair.address.substring(0, 8)}`); + apiWrapper + .getMemberIds(aKeyPair.address) + .then(membership => assert(membership.length > 0, 'Account A is a not member')); + }).timeout(defaultTimeout); + + after(() => { + apiWrapper.close(); + }); +} + +describe.skip('Membership integration tests', () => { + const nKeyPairs: KeyringPair[] = new Array(); + membershipTest(nKeyPairs); +}); diff --git a/tests/network-tests/src/tests/upgrade/romeRuntimeUpgradeTest.ts b/tests/network-tests/src/tests/rome/romeRuntimeUpgradeTest.ts similarity index 78% rename from tests/network-tests/src/tests/upgrade/romeRuntimeUpgradeTest.ts rename to tests/network-tests/src/tests/rome/romeRuntimeUpgradeTest.ts index dbcaac2cb2..9ff7dce4a4 100644 --- a/tests/network-tests/src/tests/upgrade/romeRuntimeUpgradeTest.ts +++ b/tests/network-tests/src/tests/rome/romeRuntimeUpgradeTest.ts @@ -4,10 +4,10 @@ import { Bytes } from '@polkadot/types'; import { KeyringPair } from '@polkadot/keyring/types'; import { membershipTest } from '../membershipCreationTest'; import { councilTest } from '../electingCouncilTest'; -import { registerJoystreamTypes } from '@joystream/types'; -import { ApiWrapper } from '../../utils/apiWrapper'; +import { registerJoystreamTypes } from '@rome/types'; +import { ApiWrapper } from './utils/apiWrapper'; import BN = require('bn.js'); -import { Utils } from '../../utils/utils'; +import { Utils } from './utils/utils'; describe('Runtime upgrade integration tests', () => { initConfig(); @@ -22,31 +22,28 @@ describe('Runtime upgrade integration tests', () => { let apiWrapper: ApiWrapper; let sudo: KeyringPair; + let provider: WsProvider; before(async function () { - console.log('before the test'); this.timeout(defaultTimeout); registerJoystreamTypes(); - const provider = new WsProvider(nodeUrl); - console.log('1'); + provider = new WsProvider(nodeUrl); apiWrapper = await ApiWrapper.create(provider); - console.log('2'); }); - console.log('3'); membershipTest(m1KeyPairs); - console.log('4'); membershipTest(m2KeyPairs); - console.log('5'); councilTest(m1KeyPairs, m2KeyPairs); - console.log('6'); it('Upgrading the runtime test', async () => { // Setup console.log('7'); sudo = keyring.addFromUri(sudoUri); + // const runtime: Bytes = await apiWrapper.getRuntime(); const runtime: string = Utils.readRuntimeFromFile('joystream_node_runtime.wasm'); - console.log('runtime read ' + runtime); + console.log('runtime length ' + runtime.length); + console.log('runtime strart ' + runtime.slice(0, 10)); + console.log('runtime end ' + runtime.slice(runtime.length - 10)); const description: string = 'runtime upgrade proposal which is used for API integration testing'; const runtimeProposalFee: BN = apiWrapper.estimateRomeProposeRuntimeUpgradeFee( proposalStake, @@ -62,6 +59,7 @@ describe('Runtime upgrade integration tests', () => { // Proposal creation const proposalPromise = apiWrapper.expectProposalCreated(); + console.log('proposal will be sent'); await apiWrapper.proposeRuntimeRome( m1KeyPairs[0], proposalStake, @@ -69,15 +67,19 @@ describe('Runtime upgrade integration tests', () => { 'runtime to test proposal functionality', runtime ); + console.log('proposal sent'); const proposalNumber = await proposalPromise; + console.log('proposal created'); // Approving runtime update proposal const runtimePromise = apiWrapper.expectRomeRuntimeUpgraded(); + console.log('voting'); await apiWrapper.batchApproveRomeProposal(m2KeyPairs, proposalNumber); + // apiWrapper = await ApiWrapper.create(provider); await runtimePromise; }).timeout(defaultTimeout); - membershipTest(new Array()); + //membershipTest(new Array()); after(() => { apiWrapper.close(); diff --git a/tests/network-tests/src/tests/rome/utils/apiWrapper.ts b/tests/network-tests/src/tests/rome/utils/apiWrapper.ts new file mode 100644 index 0000000000..14e0215f42 --- /dev/null +++ b/tests/network-tests/src/tests/rome/utils/apiWrapper.ts @@ -0,0 +1,433 @@ +import { ApiPromise, WsProvider } from '@polkadot/api'; +import { Option, Vec, Bytes, u32 } from '@polkadot/types'; +import { Codec } from '@polkadot/types/types'; +import { KeyringPair } from '@polkadot/keyring/types'; +import { UserInfo, PaidMembershipTerms, MemberId } from '@rome/types/lib/members'; +import { Seat, VoteKind } from '@rome/types'; +import { Balance, EventRecord } from '@polkadot/types/interfaces'; +import BN = require('bn.js'); +import { SubmittableExtrinsic } from '@polkadot/api/types'; +import { Sender } from './sender'; +import { Utils } from './utils'; + +export class ApiWrapper { + private readonly api: ApiPromise; + private readonly sender: Sender; + + public static async create(provider: WsProvider): Promise { + const api = await ApiPromise.create({ provider }); + return new ApiWrapper(api); + } + + constructor(api: ApiPromise) { + this.api = api; + this.sender = new Sender(api); + } + + public close() { + this.api.disconnect(); + } + + public async buyMembership( + account: KeyringPair, + paidTermsId: number, + name: string, + expectFailure = false + ): Promise { + return this.sender.signAndSend( + this.api.tx.members.buyMembership(paidTermsId, new UserInfo({ handle: name, avatar_uri: '', about: '' })), + account, + expectFailure + ); + } + + public getMemberIds(address: string): Promise { + return this.api.query.members.memberIdsByControllerAccountId>(address); + } + + public getBalance(address: string): Promise { + return this.api.query.balances.freeBalance(address); + } + + public async transferBalance(from: KeyringPair, to: string, amount: BN): Promise { + return this.sender.signAndSend(this.api.tx.balances.transfer(to, amount), from); + } + + public getPaidMembershipTerms(paidTermsId: number): Promise> { + return this.api.query.members.paidMembershipTermsById>(paidTermsId); + } + + public getMembershipFee(paidTermsId: number): Promise { + return this.getPaidMembershipTerms(paidTermsId).then(terms => terms.unwrap().fee.toBn()); + } + + public async transferBalanceToAccounts(from: KeyringPair, to: KeyringPair[], amount: BN): Promise { + return Promise.all( + to.map(async keyPair => { + await this.transferBalance(from, keyPair.address, amount); + }) + ); + } + + private getBaseTxFee(): BN { + return this.api.createType('BalanceOf', this.api.consts.transactionPayment.transactionBaseFee).toBn(); + } + + private estimateTxFee(tx: SubmittableExtrinsic<'promise'>): BN { + const baseFee: BN = this.getBaseTxFee(); + const byteFee: BN = this.api.createType('BalanceOf', this.api.consts.transactionPayment.transactionByteFee).toBn(); + return Utils.calcTxLength(tx).mul(byteFee).add(baseFee); + } + + public estimateBuyMembershipFee(account: KeyringPair, paidTermsId: number, name: string): BN { + return this.estimateTxFee( + this.api.tx.members.buyMembership(paidTermsId, new UserInfo({ handle: name, avatar_uri: '', about: '' })) + ); + } + + public estimateApplyForCouncilFee(amount: BN): BN { + return this.estimateTxFee(this.api.tx.councilElection.apply(amount)); + } + + public estimateVoteForCouncilFee(nominee: string, salt: string, stake: BN): BN { + const hashedVote: string = Utils.hashVote(nominee, salt); + return this.estimateTxFee(this.api.tx.councilElection.vote(hashedVote, stake)); + } + + public estimateRevealVoteFee(nominee: string, salt: string): BN { + const hashedVote: string = Utils.hashVote(nominee, salt); + return this.estimateTxFee(this.api.tx.councilElection.reveal(hashedVote, nominee, salt)); + } + + public estimateProposeRuntimeUpgradeFee(stake: BN, name: string, description: string, runtime: Bytes | string): BN { + return this.estimateTxFee( + this.api.tx.proposalsCodex.createRuntimeUpgradeProposal(stake, name, description, stake, runtime) + ); + } + + public estimateRomeProposeRuntimeUpgradeFee( + stake: BN, + name: string, + description: string, + runtime: Bytes | string + ): BN { + return this.estimateTxFee(this.api.tx.proposals.createProposal(stake, name, description, runtime)); + } + + public estimateProposeTextFee(stake: BN, name: string, description: string, text: string): BN { + return this.estimateTxFee(this.api.tx.proposalsCodex.createTextProposal(stake, name, description, stake, text)); + } + + public estimateProposeSpendingFee( + title: string, + description: string, + stake: BN, + balance: BN, + destination: string + ): BN { + return this.estimateTxFee( + this.api.tx.proposalsCodex.createSpendingProposal(stake, title, description, stake, balance, destination) + ); + } + + public estimateProposeWorkingGroupMintCapacityFee(title: string, description: string, stake: BN, balance: BN): BN { + return this.estimateTxFee( + this.api.tx.proposalsCodex.createSetContentWorkingGroupMintCapacityProposal( + stake, + title, + description, + stake, + balance + ) + ); + } + + public estimateVoteForProposalFee(): BN { + return this.estimateTxFee(this.api.tx.proposalsEngine.vote(0, 0, 'Approve')); + } + + public estimateVoteForRomeRuntimeProposalFee(): BN { + return this.estimateTxFee(this.api.tx.proposals.voteOnProposal(0, 'Approve')); + } + + public newEstimate(): BN { + return new BN(100); + } + + private applyForCouncilElection(account: KeyringPair, amount: BN): Promise { + return this.sender.signAndSend(this.api.tx.councilElection.apply(amount), account, false); + } + + public batchApplyForCouncilElection(accounts: KeyringPair[], amount: BN): Promise { + return Promise.all( + accounts.map(async keyPair => { + await this.applyForCouncilElection(keyPair, amount); + }) + ); + } + + public async getCouncilElectionStake(address: string): Promise { + // TODO alter then `applicantStake` type will be introduced + return this.api.query.councilElection.applicantStakes(address).then(stake => { + const parsed = JSON.parse(stake.toString()); + return new BN(parsed.new); + }); + } + + private voteForCouncilMember(account: KeyringPair, nominee: string, salt: string, stake: BN): Promise { + const hashedVote: string = Utils.hashVote(nominee, salt); + return this.sender.signAndSend(this.api.tx.councilElection.vote(hashedVote, stake), account, false); + } + + public batchVoteForCouncilMember( + accounts: KeyringPair[], + nominees: KeyringPair[], + salt: string[], + stake: BN + ): Promise { + return Promise.all( + accounts.map(async (keyPair, index) => { + await this.voteForCouncilMember(keyPair, nominees[index].address, salt[index], stake); + }) + ); + } + + private revealVote(account: KeyringPair, commitment: string, nominee: string, salt: string): Promise { + return this.sender.signAndSend(this.api.tx.councilElection.reveal(commitment, nominee, salt), account, false); + } + + public batchRevealVote(accounts: KeyringPair[], nominees: KeyringPair[], salt: string[]): Promise { + return Promise.all( + accounts.map(async (keyPair, index) => { + const commitment = Utils.hashVote(nominees[index].address, salt[index]); + await this.revealVote(keyPair, commitment, nominees[index].address, salt[index]); + }) + ); + } + + // TODO consider using configurable genesis instead + public sudoStartAnnouncingPerion(sudo: KeyringPair, endsAtBlock: BN): Promise { + return this.sender.signAndSend( + this.api.tx.sudo.sudo(this.api.tx.councilElection.setStageAnnouncing(endsAtBlock)), + sudo, + false + ); + } + + public sudoStartVotingPerion(sudo: KeyringPair, endsAtBlock: BN): Promise { + return this.sender.signAndSend( + this.api.tx.sudo.sudo(this.api.tx.councilElection.setStageVoting(endsAtBlock)), + sudo, + false + ); + } + + public sudoStartRevealingPerion(sudo: KeyringPair, endsAtBlock: BN): Promise { + return this.sender.signAndSend( + this.api.tx.sudo.sudo(this.api.tx.councilElection.setStageRevealing(endsAtBlock)), + sudo, + false + ); + } + + public getBestBlock(): Promise { + return this.api.derive.chain.bestNumber(); + } + + public getCouncil(): Promise { + return this.api.query.council.activeCouncil>().then(seats => { + return JSON.parse(seats.toString()); + }); + } + + public getRuntime(): Promise { + return this.api.query.substrate.code(); + } + + public async proposeRuntime( + account: KeyringPair, + stake: BN, + name: string, + description: string, + runtime: Bytes | string + ): Promise { + const memberId: BN = (await this.getMemberIds(account.address))[0].toBn(); + return this.sender.signAndSend( + this.api.tx.proposalsCodex.createRuntimeUpgradeProposal(memberId, name, description, stake, runtime), + account, + false + ); + } + + public proposeRuntimeRome( + account: KeyringPair, + stake: BN, + name: string, + description: string, + runtime: Bytes | string + ): Promise { + return this.sender.signAndSend( + this.api.tx.proposals.createProposal(stake, name, description, runtime), + account, + false + ); + } + + public async proposeText( + account: KeyringPair, + stake: BN, + name: string, + description: string, + text: string + ): Promise { + const memberId: BN = (await this.getMemberIds(account.address))[0].toBn(); + return this.sender.signAndSend( + this.api.tx.proposalsCodex.createTextProposal(memberId, name, description, stake, text), + account, + false + ); + } + + public async proposeSpending( + account: KeyringPair, + title: string, + description: string, + stake: BN, + balance: BN, + destination: string + ): Promise { + const memberId: BN = (await this.getMemberIds(account.address))[0].toBn(); + return this.sender.signAndSend( + this.api.tx.proposalsCodex.createSpendingProposal(memberId, title, description, stake, balance, destination), + account, + false + ); + } + + public async proposeWorkingGroupMintCapacity( + account: KeyringPair, + title: string, + description: string, + stake: BN, + balance: BN + ): Promise { + const memberId: BN = (await this.getMemberIds(account.address))[0].toBn(); + return this.sender.signAndSend( + this.api.tx.proposalsCodex.createSetContentWorkingGroupMintCapacityProposal( + memberId, + title, + description, + stake, + balance + ), + account, + false + ); + } + + public approveProposal(account: KeyringPair, memberId: BN, proposal: BN): Promise { + return this.sender.signAndSend(this.api.tx.proposalsEngine.vote(memberId, proposal, 'Approve'), account, false); + } + + public batchApproveProposal(council: KeyringPair[], proposal: BN): Promise { + return Promise.all( + council.map(async keyPair => { + const memberId: BN = (await this.getMemberIds(keyPair.address))[0].toBn(); + await this.approveProposal(keyPair, memberId, proposal); + }) + ); + } + + public approveRomeProposal(account: KeyringPair, proposal: BN): Promise { + return this.sender.signAndSend( + this.api.tx.proposals.voteOnProposal(proposal, new VoteKind('Approve')), + account, + false + ); + } + + public batchApproveRomeProposal(council: KeyringPair[], proposal: BN): Promise { + return Promise.all( + council.map(async keyPair => { + await this.approveRomeProposal(keyPair, proposal); + }) + ); + } + + public getBlockDuration(): BN { + return this.api.createType('Moment', this.api.consts.babe.expectedBlockTime).toBn(); + } + + public expectProposalCreated(): Promise { + return new Promise(async resolve => { + await this.api.query.system.events>(events => { + events.forEach(record => { + if (record.event.method.toString() === 'ProposalCreated') { + resolve(new BN(record.event.data[1].toString())); + } + }); + }); + }); + } + + public expectRuntimeUpgraded(): Promise { + return new Promise(async resolve => { + await this.api.query.system.events>(events => { + events.forEach(record => { + if (record.event.method.toString() === 'RuntimeUpdated') { + resolve(); + } + }); + }); + }); + } + + public expectRomeRuntimeUpgraded(): Promise { + return new Promise(async resolve => { + await this.api.query.system.events>(events => { + events.forEach(record => { + if (record.event.method.toString() === 'RuntimeUpdated') { + console.log('Runtime updated!!'); + resolve(); + } + }); + }); + }); + } + + public expectProposalFinalized(): Promise { + return new Promise(async resolve => { + await this.api.query.system.events>(events => { + events.forEach(record => { + if ( + record.event.method.toString() === 'ProposalStatusUpdated' && + record.event.data[1].toString().includes('Finalized') + ) { + resolve(); + } + }); + }); + }); + } + + public getTotalIssuance(): Promise { + return this.api.query.balances.totalIssuance(); + } + + public async getProposal(id: BN) { + const proposal = await this.api.query.proposalsEngine.proposals(id); + console.log('proposal to string ' + proposal.toString()); + console.log('proposal to raw ' + proposal.toRawType()); + return; + } + + public async getRequiredProposalStake(numerator: number, denominator: number): Promise { + const issuance: number = await (await this.getTotalIssuance()).toNumber(); + const stake = (issuance * numerator) / denominator; + return new BN(stake.toFixed(0)); + } + + public getProposalCount(): Promise { + return this.api.query.proposalsEngine.proposalCount(); + } +} diff --git a/tests/network-tests/src/tests/rome/utils/sender.ts b/tests/network-tests/src/tests/rome/utils/sender.ts new file mode 100644 index 0000000000..b8e1c15499 --- /dev/null +++ b/tests/network-tests/src/tests/rome/utils/sender.ts @@ -0,0 +1,66 @@ +import BN = require('bn.js'); +import { ApiPromise } from '@polkadot/api'; +import { Index } from '@polkadot/types/interfaces'; +import { SubmittableExtrinsic } from '@polkadot/api/types'; +import { KeyringPair } from '@polkadot/keyring/types'; + +export class Sender { + private readonly api: ApiPromise; + private static nonceMap: Map = new Map(); + + constructor(api: ApiPromise) { + this.api = api; + } + + private async getNonce(address: string): Promise { + let oncahinNonce: BN = new BN(0); + if (!Sender.nonceMap.get(address)) { + oncahinNonce = await this.api.query.system.accountNonce(address); + } + let nonce: BN | undefined = Sender.nonceMap.get(address); + if (!nonce) { + nonce = oncahinNonce; + } + const nextNonce: BN = nonce.addn(1); + Sender.nonceMap.set(address, nextNonce); + return nonce; + } + + private clearNonce(address: string): void { + Sender.nonceMap.delete(address); + } + + public async signAndSend( + tx: SubmittableExtrinsic<'promise'>, + account: KeyringPair, + expectFailure = false + ): Promise { + return new Promise(async (resolve, reject) => { + const nonce: BN = await this.getNonce(account.address); + const signedTx = tx.sign(account, { nonce }); + await signedTx + .send(async result => { + if (result.status.isFinalized === true && result.events !== undefined) { + result.events.forEach(event => { + if (event.event.method === 'ExtrinsicFailed') { + if (expectFailure) { + resolve(); + } else { + reject(new Error('Extrinsic failed unexpectedly')); + } + } + }); + resolve(); + } + if (result.status.isFuture) { + console.log('nonce ' + nonce + ' for account ' + account.address + ' is in future'); + this.clearNonce(account.address); + reject(new Error('Extrinsic nonce is in future')); + } + }) + .catch(error => { + reject(error); + }); + }); + } +} diff --git a/tests/network-tests/src/tests/rome/utils/utils.ts b/tests/network-tests/src/tests/rome/utils/utils.ts new file mode 100644 index 0000000000..1b49039cb1 --- /dev/null +++ b/tests/network-tests/src/tests/rome/utils/utils.ts @@ -0,0 +1,51 @@ +import { IExtrinsic } from '@polkadot/types/types'; +import { Bytes } from '@polkadot/types'; +import { compactToU8a, stringToU8a } from '@polkadot/util'; +import { blake2AsHex } from '@polkadot/util-crypto'; +import BN = require('bn.js'); +import fs = require('fs'); +import { decodeAddress } from '@polkadot/keyring'; +import { Seat } from '@rome/types'; + +export class Utils { + private static LENGTH_ADDRESS = 32 + 1; // publicKey + prefix + private static LENGTH_ERA = 2; // assuming mortals + private static LENGTH_SIGNATURE = 64; // assuming ed25519 or sr25519 + private static LENGTH_VERSION = 1; // 0x80 & version + + public static calcTxLength = (extrinsic?: IExtrinsic | null, nonce?: BN): BN => { + return new BN( + Utils.LENGTH_VERSION + + Utils.LENGTH_ADDRESS + + Utils.LENGTH_SIGNATURE + + Utils.LENGTH_ERA + + compactToU8a(nonce || 0).length + + (extrinsic ? extrinsic.encodedLength : 0) + ); + }; + + /** hash(accountId + salt) */ + public static hashVote(accountId: string, salt: string): string { + const accountU8a = decodeAddress(accountId); + const saltU8a = stringToU8a(salt); + const voteU8a = new Uint8Array(accountU8a.length + saltU8a.length); + voteU8a.set(accountU8a); + voteU8a.set(saltU8a, accountU8a.length); + + const hash = blake2AsHex(voteU8a, 256); + // console.log('Vote hash:', hash, 'for', { accountId, salt }); + return hash; + } + + public static wait(ms: number): Promise { + return new Promise(resolve => setTimeout(resolve, ms)); + } + + public static getTotalStake(seat: Seat): BN { + return new BN(+seat.stake.toString() + seat.backers.reduce((a, baker) => a + +baker.stake.toString(), 0)); + } + + public static readRuntimeFromFile(path: string): string { + return '0x' + fs.readFileSync(path).toString('hex'); + } +} diff --git a/tests/network-tests/src/utils/apiWrapper.ts b/tests/network-tests/src/utils/apiWrapper.ts index e49d6cbf73..661a2fcc79 100644 --- a/tests/network-tests/src/utils/apiWrapper.ts +++ b/tests/network-tests/src/utils/apiWrapper.ts @@ -146,6 +146,10 @@ export class ApiWrapper { return this.estimateTxFee(this.api.tx.proposalsEngine.vote(0, 0, 'Approve')); } + public estimateVoteForRomeRuntimeProposalFee(): BN { + return this.estimateTxFee(this.api.tx.proposals.voteOnProposal(0, 'Approve')); + } + private applyForCouncilElection(account: KeyringPair, amount: BN): Promise { return this.sender.signAndSend(this.api.tx.councilElection.apply(amount), account, false); } diff --git a/tests/network-tests/src/utils/utils.ts b/tests/network-tests/src/utils/utils.ts index 84f6c00213..0f6cd79e65 100644 --- a/tests/network-tests/src/utils/utils.ts +++ b/tests/network-tests/src/utils/utils.ts @@ -1,4 +1,5 @@ import { IExtrinsic } from '@polkadot/types/types'; +import { Bytes } from '@polkadot/types'; import { compactToU8a, stringToU8a } from '@polkadot/util'; import { blake2AsHex } from '@polkadot/util-crypto'; import BN = require('bn.js'); From b7aae3b82b7d838ab3300fae3a6cd163fba67eaa Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 24 Apr 2020 17:58:23 +0300 Subject: [PATCH 237/286] =?UTF-8?q?Disable=20cargo=20check=20in=20=20?= =?UTF-8?q?=E2=80=9Ctravis.yml=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b6bd8b81f0..7418a9bad1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ matrix: before_install: - rustup component add rustfmt - - cargo fmt --all -- --check +# - cargo fmt --all -- --check - rustup component add clippy - BUILD_DUMMY_WASM_BINARY=1 cargo clippy -- -D warnings - rustup default stable From 29b5c0d48c3b80040aa8f4f653a1b342e2742552 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 24 Apr 2020 18:15:46 +0300 Subject: [PATCH 238/286] Add linter fixes --- .travis.yml | 2 +- Cargo.lock | 2 +- node/src/chain_spec.rs | 12 +++-- node/src/cli.rs | 2 +- node/src/forum_config/mod.rs | 2 +- node/src/service.rs | 6 +++ .../content-working-group/src/lib.rs | 22 ++++++--- runtime-modules/forum/src/lib.rs | 11 +++++ runtime-modules/governance/src/election.rs | 47 +++++++++++-------- runtime-modules/membership/src/members.rs | 4 +- runtime-modules/proposals/codex/src/lib.rs | 25 ++++++---- .../codex/src/proposal_types/parameters.rs | 2 +- runtime-modules/recurring-reward/src/lib.rs | 7 +++ runtime-modules/roles/src/actors.rs | 5 +- runtime-modules/storage/src/data_directory.rs | 2 +- .../src/data_object_storage_registry.rs | 8 +++- .../storage/src/data_object_type_registry.rs | 4 ++ runtime-modules/token-minting/src/lib.rs | 5 ++ runtime/Cargo.toml | 2 +- runtime/src/lib.rs | 8 ++-- runtime/src/migration.rs | 3 ++ utils/chain-spec-builder/src/main.rs | 4 +- 22 files changed, 124 insertions(+), 61 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7418a9bad1..b6bd8b81f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ matrix: before_install: - rustup component add rustfmt -# - cargo fmt --all -- --check + - cargo fmt --all -- --check - rustup component add clippy - BUILD_DUMMY_WASM_BINARY=1 cargo clippy -- -D warnings - rustup default stable diff --git a/Cargo.lock b/Cargo.lock index 33a8d26101..22e918e944 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1614,7 +1614,7 @@ dependencies = [ [[package]] name = "joystream-node-runtime" -version = "6.12.1" +version = "6.12.2" dependencies = [ "parity-scale-codec", "safe-mix", diff --git a/node/src/chain_spec.rs b/node/src/chain_spec.rs index c11a033d4c..c2a8c95907 100644 --- a/node/src/chain_spec.rs +++ b/node/src/chain_spec.rs @@ -14,6 +14,10 @@ // You should have received a copy of the GNU General Public License // along with Joystream node. If not, see . +// Clippy linter warning. +#![allow(clippy::identity_op)] // disable it because we use such syntax for a code readability + // Example: voting_period: 1 * DAY + use node_runtime::{ versioned_store::InputValidationLengthConstraint as VsInputValidation, ActorsConfig, AuthorityDiscoveryConfig, BabeConfig, Balance, BalancesConfig, ContentWorkingGroupConfig, @@ -154,7 +158,7 @@ impl Alternative { } fn new_vs_validation(min: u16, max_min_diff: u16) -> VsInputValidation { - return VsInputValidation { min, max_min_diff }; + VsInputValidation { min, max_min_diff } } pub fn chain_spec_properties() -> json::map::Map { @@ -218,9 +222,7 @@ pub fn testnet_genesis( slash_reward_fraction: Perbill::from_percent(10), ..Default::default() }), - sudo: Some(SudoConfig { - key: root_key.clone(), - }), + sudo: Some(SudoConfig { key: root_key }), babe: Some(BabeConfig { authorities: vec![], }), @@ -274,7 +276,7 @@ pub fn testnet_genesis( class_description_constraint: new_vs_validation(1, 999), }), content_wg: Some(ContentWorkingGroupConfig { - mint_capacity: 100000, + mint_capacity: 100_000, curator_opening_by_id: vec![], next_curator_opening_id: 0, curator_application_by_id: vec![], diff --git a/node/src/cli.rs b/node/src/cli.rs index 78339c7a65..9c33d231aa 100644 --- a/node/src/cli.rs +++ b/node/src/cli.rs @@ -90,7 +90,7 @@ where let exit = e .into_exit() .map_err(|_| error::Error::Other("Exit future failed.".into())); - let service = service.map_err(|err| error::Error::Service(err)); + let service = service.map_err(error::Error::Service); let select = service.select(exit).map(|_| ()).map_err(|(err, _)| err); runtime.block_on(select) }; diff --git a/node/src/forum_config/mod.rs b/node/src/forum_config/mod.rs index e72963da72..c99f69b4ce 100644 --- a/node/src/forum_config/mod.rs +++ b/node/src/forum_config/mod.rs @@ -6,5 +6,5 @@ pub mod from_serialized; use node_runtime::forum::InputValidationLengthConstraint; pub fn new_validation(min: u16, max_min_diff: u16) -> InputValidationLengthConstraint { - return InputValidationLengthConstraint { min, max_min_diff }; + InputValidationLengthConstraint { min, max_min_diff } } diff --git a/node/src/service.rs b/node/src/service.rs index 2d9a6f24b3..2242ae2fa1 100644 --- a/node/src/service.rs +++ b/node/src/service.rs @@ -16,6 +16,12 @@ #![warn(unused_extern_crates)] +// Clippy linter warning. +#![allow(clippy::type_complexity)] // disable it because this is foreign code and can be changed any time + +// Clippy linter warning. +#![allow(clippy::redundant_closure_call)] // disable it because of the substrate lib design + //! Service and ServiceFactory implementation. Specialized wrapper over substrate service. use client_db::Backend; diff --git a/runtime-modules/content-working-group/src/lib.rs b/runtime-modules/content-working-group/src/lib.rs index 903bd612ed..38aa7e386d 100755 --- a/runtime-modules/content-working-group/src/lib.rs +++ b/runtime-modules/content-working-group/src/lib.rs @@ -1,3 +1,10 @@ +// Clippy linter warning. TODO: remove after the Constaninople release +#![allow(clippy::type_complexity)] +// disable it because of possible frontend API break + +// Clippy linter warning. TODO: refactor "this function has too many argument" +#![allow(clippy::too_many_arguments)] // disable it because of possible API break + // Ensure we're `no_std` when compiling for Wasm. #![cfg_attr(not(feature = "std"), no_std)] @@ -15,6 +22,7 @@ use serde::{Deserialize, Serialize}; use codec::{Decode, Encode}; // Codec //use rstd::collections::btree_map::BTreeMap; use membership::{members, role_types}; +use rstd::borrow::ToOwned; use rstd::collections::btree_map::BTreeMap; use rstd::collections::btree_set::BTreeSet; use rstd::convert::From; @@ -310,12 +318,12 @@ impl CuratorExitSummary { pub fn new( origin: &CuratorExitInitiationOrigin, initiated_at_block_number: &BlockNumber, - rationale_text: &Vec, + rationale_text: &[u8], ) -> Self { CuratorExitSummary { origin: (*origin).clone(), initiated_at_block_number: (*initiated_at_block_number).clone(), - rationale_text: (*rationale_text).clone(), + rationale_text: rationale_text.to_owned(), } } } @@ -1190,7 +1198,7 @@ decl_module! { ChannelById::::insert(next_channel_id, new_channel); // Add id to ChannelIdByHandle under handle - ChannelIdByHandle::::insert(handle.clone(), next_channel_id); + ChannelIdByHandle::::insert(handle, next_channel_id); // Increment NextChannelId NextChannelId::::mutate(|id| *id += as One>::one()); @@ -1231,7 +1239,7 @@ decl_module! { // Construct new channel with altered properties let new_channel = Channel { owner: new_owner, - role_account: new_role_account.clone(), + role_account: new_role_account, ..channel }; @@ -2179,7 +2187,7 @@ impl Module { ), &'static str, > { - let next_channel_id = opt_channel_id.unwrap_or(NextChannelId::::get()); + let next_channel_id = opt_channel_id.unwrap_or_else(NextChannelId::::get); Self::ensure_can_register_role_on_member( member_id, @@ -2191,7 +2199,7 @@ impl Module { // TODO: convert InputConstraint ensurer routines into macroes - fn ensure_channel_handle_is_valid(handle: &Vec) -> dispatch::Result { + fn ensure_channel_handle_is_valid(handle: &[u8]) -> dispatch::Result { ChannelHandleConstraint::get().ensure_valid( handle.len(), MSG_CHANNEL_HANDLE_TOO_SHORT, @@ -2638,7 +2646,7 @@ impl Module { PrincipalId, >, exit_initiation_origin: &CuratorExitInitiationOrigin, - rationale_text: &Vec, + rationale_text: &[u8], ) { // Stop any possible recurring rewards let _did_deactivate_recurring_reward = if let Some(ref reward_relationship_id) = diff --git a/runtime-modules/forum/src/lib.rs b/runtime-modules/forum/src/lib.rs index d379d1c86d..80a73f7451 100755 --- a/runtime-modules/forum/src/lib.rs +++ b/runtime-modules/forum/src/lib.rs @@ -1,3 +1,8 @@ +// Clippy linter warning +#![allow(clippy::type_complexity)] +// disable it because of possible frontend API break +// TODO: remove post-Constaninople + // Ensure we're `no_std` when compiling for Wasm. #![cfg_attr(not(feature = "std"), no_std)] @@ -947,6 +952,9 @@ impl Module { Self::ensure_can_mutate_in_path_leaf(&category_tree_path) } + // Clippy linter warning + #[allow(clippy::ptr_arg)] // disable it because of possible frontend API break + // TODO: remove post-Constaninople fn ensure_can_mutate_in_path_leaf( category_tree_path: &CategoryTreePath, ) -> dispatch::Result { @@ -961,6 +969,9 @@ impl Module { Ok(()) } + // TODO: remove post-Constaninople + // Clippy linter warning + #[allow(clippy::ptr_arg)] // disable it because of possible frontend API break fn ensure_can_add_subcategory_path_leaf( category_tree_path: &CategoryTreePath, ) -> dispatch::Result { diff --git a/runtime-modules/governance/src/election.rs b/runtime-modules/governance/src/election.rs index 248ba2c8f6..9a4e74823b 100644 --- a/runtime-modules/governance/src/election.rs +++ b/runtime-modules/governance/src/election.rs @@ -21,6 +21,14 @@ //! //! [`set_election_parameters`]: struct.Module.html#method.set_election_parameters +// Clippy linter warning +#![allow(clippy::type_complexity)] +// disable it because of possible frontend API break +// TODO: remove post-Constaninople + +// Clippy linter warning +#![allow(clippy::redundant_closure_call)] // disable it because of the substrate lib design + use rstd::prelude::*; use srml_support::traits::{Currency, ReservableCurrency}; use srml_support::{decl_event, decl_module, decl_storage, dispatch::Result, ensure}; @@ -297,6 +305,7 @@ impl Module { if len >= applicants.len() { &[] } else { + #[allow(clippy::redundant_closure)] // disable incorrect Clippy linter warning applicants.sort_by_key(|applicant| Self::applicant_stakes(applicant)); &applicants[0..applicants.len() - len] } @@ -351,17 +360,21 @@ impl Module { } } - if new_council.len() == Self::council_size_usize() { - // all applicants in the tally will form the new council - } else if new_council.len() > Self::council_size_usize() { - // we have more than enough applicants to form the new council. - // select top staked - Self::filter_top_staked(&mut new_council, Self::council_size_usize()); - } else { - // Not enough applicants with votes to form a council. - // This may happen if we didn't add applicants with zero votes to the tally, - // or in future if we allow applicants to withdraw candidacy during voting or revealing stages. - // or council size was increased during voting, revealing stages. + match new_council.len() { + ncl if ncl == Self::council_size_usize() => { + // all applicants in the tally will form the new council + } + ncl if ncl > Self::council_size_usize() => { + // we have more than enough applicants to form the new council. + // select top staked + Self::filter_top_staked(&mut new_council, Self::council_size_usize()); + } + _ => { + // Not enough applicants with votes to form a council. + // This may happen if we didn't add applicants with zero votes to the tally, + // or in future if we allow applicants to withdraw candidacy during voting or revealing stages. + // or council size was increased during voting, revealing stages. + } } // unless we want to add more filtering criteria to what is considered a successful election @@ -380,7 +393,7 @@ impl Module { } fn teardown_election( - votes: &Vec>, T::Hash, T::AccountId>>, + votes: &[SealedVote>, T::Hash, T::AccountId>], new_council: &BTreeMap>>, unlock_ts: bool, ) { @@ -469,7 +482,7 @@ impl Module { } fn refund_voting_stakes( - sealed_votes: &Vec>, T::Hash, T::AccountId>>, + sealed_votes: &[SealedVote>, T::Hash, T::AccountId>], new_council: &BTreeMap>>, ) { for sealed_vote in sealed_votes.iter() { @@ -507,7 +520,7 @@ impl Module { } fn tally_votes( - sealed_votes: &Vec>, T::Hash, T::AccountId>>, + sealed_votes: &[SealedVote>, T::Hash, T::AccountId>], ) -> BTreeMap>> { let mut tally: BTreeMap>> = BTreeMap::new(); @@ -912,11 +925,7 @@ decl_module! { impl council::CouncilTermEnded for Module { fn council_term_ended() { if Self::auto_start() { - if Self::start_election(>::active_council()).is_ok() { - // emit ElectionStarted - } else { - // emit ElectionFailedStart - } + let _ = Self::start_election(>::active_council()); } } } diff --git a/runtime-modules/membership/src/members.rs b/runtime-modules/membership/src/members.rs index f3a5d78cc6..d23ace0f40 100644 --- a/runtime-modules/membership/src/members.rs +++ b/runtime-modules/membership/src/members.rs @@ -1,12 +1,12 @@ // Clippy linter requirement #![allow(clippy::redundant_closure_call)] // disable it because of the substrate lib design -// example: pub PaidMembershipTermsById get(paid_membership_terms_by_id) build(|config: &GenesisConfig| {} + // example: pub PaidMembershipTermsById get(paid_membership_terms_by_id) build(|config: &GenesisConfig| {} use codec::{Codec, Decode, Encode}; use common::currency::{BalanceOf, GovernanceCurrency}; -use rstd::prelude::*; use rstd::borrow::ToOwned; +use rstd::prelude::*; use sr_primitives::traits::{MaybeSerialize, Member, One, SimpleArithmetic}; use srml_support::traits::{Currency, Get}; use srml_support::{decl_event, decl_module, decl_storage, dispatch, ensure, Parameter}; diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index d56c47466d..ba39dca45f 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -34,6 +34,12 @@ //! - [governance](../substrate_governance_module/index.html) //! - [content_working_group](../substrate_content_working_group_module/index.html) //! +// Clippy linter warning. TODO: remove after the Constaninople release +#![allow(clippy::type_complexity)] +// disable it because of possible frontend API break + +// Clippy linter warning. TODO: refactor "this function has too many argument" +#![allow(clippy::too_many_arguments)] // disable it because of possible API break // Ensure we're `no_std` when compiling for Wasm. #![cfg_attr(not(feature = "std"), no_std)] @@ -336,7 +342,7 @@ decl_module! { Self::ensure_council_election_parameters_valid(&election_parameters)?; let proposal_code = - >::set_election_parameters(election_parameters.clone()); + >::set_election_parameters(election_parameters); let proposal_parameters = proposal_types::parameters::set_election_parameters_proposal::(); @@ -373,7 +379,7 @@ decl_module! { ); let proposal_code = - >::set_mint_capacity(mint_balance.clone()); + >::set_mint_capacity(mint_balance); let proposal_parameters = proposal_types::parameters::set_content_working_group_mint_capacity_proposal::(); @@ -416,7 +422,7 @@ decl_module! { ); let proposal_code = >::spend_from_council_mint( - balance.clone(), + balance, destination.clone() ); @@ -552,7 +558,7 @@ decl_module! { let proposal_code = >::set_role_parameters( Role::StorageProvider, - role_parameters.clone() + role_parameters ); let proposal_parameters = @@ -646,8 +652,7 @@ impl Module { T::MemberId, >, ) -> DispatchResult { - let account_id = - T::MembershipOriginValidator::ensure_actor_origin(origin, member_id.clone())?; + let account_id = T::MembershipOriginValidator::ensure_actor_origin(origin, member_id)?; >::ensure_create_proposal_parameters_are_valid( &proposal_parameters, @@ -656,7 +661,7 @@ impl Module { stake_balance, )?; - >::ensure_can_create_thread(member_id.clone(), &title)?; + >::ensure_can_create_thread(member_id, &title)?; let discussion_thread_id = >::create_thread(member_id, title.clone())?; @@ -829,7 +834,7 @@ impl Module { ensure!( election_parameters.min_voting_stake - <= >::from(100000u32), + <= >::from(100_000_u32), Error::InvalidCouncilElectionParameterMinVotingStake ); @@ -839,7 +844,7 @@ impl Module { ); ensure!( - election_parameters.new_term_duration <= T::BlockNumber::from(432000), + election_parameters.new_term_duration <= T::BlockNumber::from(432_000), Error::InvalidCouncilElectionParameterNewTermDuration ); @@ -880,7 +885,7 @@ impl Module { ensure!( election_parameters.min_council_stake - <= >::from(100000u32), + <= >::from(100_000_u32), Error::InvalidCouncilElectionParameterMinCouncilStake ); diff --git a/runtime-modules/proposals/codex/src/proposal_types/parameters.rs b/runtime-modules/proposals/codex/src/proposal_types/parameters.rs index 031c17de09..953c4bf30f 100644 --- a/runtime-modules/proposals/codex/src/proposal_types/parameters.rs +++ b/runtime-modules/proposals/codex/src/proposal_types/parameters.rs @@ -46,7 +46,7 @@ pub(crate) fn set_election_parameters_proposal( ) -> ProposalParameters> { ProposalParameters { voting_period: T::BlockNumber::from(72000u32), - grace_period: T::BlockNumber::from(201601u32), + grace_period: T::BlockNumber::from(201_601_u32), approval_quorum_percentage: 66, approval_threshold_percentage: 80, slashing_quorum_percentage: 60, diff --git a/runtime-modules/recurring-reward/src/lib.rs b/runtime-modules/recurring-reward/src/lib.rs index 400b3b7b54..59ba5b4eee 100755 --- a/runtime-modules/recurring-reward/src/lib.rs +++ b/runtime-modules/recurring-reward/src/lib.rs @@ -1,3 +1,10 @@ +// Clippy linter warning. TODO: remove after the Constaninople release +#![allow(clippy::type_complexity)] +// disable it because of possible frontend API break + +// Clippy linter warning. TODO: refactor the Option> +#![allow(clippy::option_option)] // disable it because of possible API break + // Ensure we're `no_std` when compiling for Wasm. #![cfg_attr(not(feature = "std"), no_std)] use rstd::prelude::*; diff --git a/runtime-modules/roles/src/actors.rs b/runtime-modules/roles/src/actors.rs index 412d99773c..93dbdaca92 100644 --- a/runtime-modules/roles/src/actors.rs +++ b/runtime-modules/roles/src/actors.rs @@ -1,6 +1,6 @@ -// Clippy linter requirement +// Clippy linter warning #![allow(clippy::redundant_closure_call)] // disable it because of the substrate lib design -// example: pub Parameters get(parameters) build(|config: &GenesisConfig| {..} + // example: pub Parameters get(parameters) build(|config: &GenesisConfig| {..} use codec::{Decode, Encode}; use common::currency::{BalanceOf, GovernanceCurrency}; @@ -17,7 +17,6 @@ use serde::{Deserialize, Serialize}; pub use membership::members::Role; - const STAKING_ID: LockIdentifier = *b"role_stk"; #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] diff --git a/runtime-modules/storage/src/data_directory.rs b/runtime-modules/storage/src/data_directory.rs index 536fe95280..ebdad8d004 100644 --- a/runtime-modules/storage/src/data_directory.rs +++ b/runtime-modules/storage/src/data_directory.rs @@ -164,7 +164,7 @@ decl_module! { fn reject_content(origin, content_id: T::ContentId) { let who = ensure_signed(origin)?; - Self::update_content_judgement(&who, content_id.clone(), LiaisonJudgement::Rejected)?; + Self::update_content_judgement(&who, content_id, LiaisonJudgement::Rejected)?; Self::deposit_event(RawEvent::ContentRejected(content_id, who)); } diff --git a/runtime-modules/storage/src/data_object_storage_registry.rs b/runtime-modules/storage/src/data_object_storage_registry.rs index b1ea0f5555..81d0453a86 100644 --- a/runtime-modules/storage/src/data_object_storage_registry.rs +++ b/runtime-modules/storage/src/data_object_storage_registry.rs @@ -1,3 +1,7 @@ +// Clippy linter requirement +#![allow(clippy::redundant_closure_call)] // disable it because of the substrate lib design + // example: pub NextRelationshipId get(next_relationship_id) build(|config: &GenesisConfig| + use crate::data_directory::Trait as DDTrait; use crate::traits::{ContentHasStorage, ContentIdExists}; use codec::{Codec, Decode, Encode}; @@ -97,14 +101,14 @@ impl ContentHasStorage for Module { // TODO deprecated fn has_storage_provider(which: &T::ContentId) -> bool { let dosr_list = Self::relationships_by_content_id(which); - return dosr_list.iter().any(|&dosr_id| { + dosr_list.iter().any(|&dosr_id| { let res = Self::relationships(dosr_id); if res.is_none() { return false; } let dosr = res.unwrap(); dosr.ready - }); + }) } // TODO deprecated diff --git a/runtime-modules/storage/src/data_object_type_registry.rs b/runtime-modules/storage/src/data_object_type_registry.rs index 6fcc751a05..642ceb4b5b 100644 --- a/runtime-modules/storage/src/data_object_type_registry.rs +++ b/runtime-modules/storage/src/data_object_type_registry.rs @@ -1,3 +1,7 @@ +// Clippy linter requirement +#![allow(clippy::redundant_closure_call)] // disable it because of the substrate lib design + // example: NextDataObjectTypeId get(next_data_object_type_id) build(|config: &GenesisConfig| + use crate::traits; use codec::{Codec, Decode, Encode}; use rstd::prelude::*; diff --git a/runtime-modules/token-minting/src/lib.rs b/runtime-modules/token-minting/src/lib.rs index 961bcfd53b..d49af593cc 100755 --- a/runtime-modules/token-minting/src/lib.rs +++ b/runtime-modules/token-minting/src/lib.rs @@ -1,3 +1,8 @@ +// Clippy linter warning +#![allow(clippy::type_complexity)] +// disable it because of possible frontend API break +// TODO: remove post-Constaninople + // Ensure we're `no_std` when compiling for Wasm. #![cfg_attr(not(feature = "std"), no_std)] diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 53ddb45dff..309fa08772 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -5,7 +5,7 @@ edition = '2018' name = 'joystream-node-runtime' # Follow convention: https://github.com/Joystream/substrate-runtime-joystream/issues/1 # {Authoring}.{Spec}.{Impl} of the RuntimeVersion -version = '6.12.1' +version = '6.12.2' [features] default = ['std'] diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 2eea0aca46..b340f90e53 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -483,7 +483,7 @@ impl versioned_store_permissions::CredentialChecker for ContentWorkingG } } - return false; + false } // Any Active Channel Owner credential if credential == AnyActiveChannelOwnerCredential::get() => { @@ -498,7 +498,7 @@ impl versioned_store_permissions::CredentialChecker for ContentWorkingG } } - return false; + false } // mapping to workging group principal id n if n >= PrincipalIdMappingStartsAtCredential::get() => { @@ -737,7 +737,7 @@ impl roles::traits::Roles for LookupRoles { .filter(|id| !>::is_account_info_expired(id)) .collect(); - if live_ids.len() == 0 { + if live_ids.is_empty() { Err("no staked account found") } else { let index = random_index(live_ids.len()); @@ -841,7 +841,7 @@ impl Default for Call { parameter_types! { pub const ProposalMaxPostEditionNumber: u32 = 0; // post update is disabled - pub const ProposalMaxThreadInARowNumber: u32 = 100000; // will not be used + pub const ProposalMaxThreadInARowNumber: u32 = 100_000; // will not be used pub const ProposalThreadTitleLengthLimit: u32 = 40; pub const ProposalPostLengthLimit: u32 = 1000; } diff --git a/runtime/src/migration.rs b/runtime/src/migration.rs index e0b144429a..ecee38fb11 100644 --- a/runtime/src/migration.rs +++ b/runtime/src/migration.rs @@ -1,3 +1,6 @@ +// Clippy linter warning +#![allow(clippy::redundant_closure_call)] // disable it because of the substrate lib design + use crate::VERSION; use sr_primitives::{print, traits::Zero}; use srml_support::{decl_event, decl_module, decl_storage}; diff --git a/utils/chain-spec-builder/src/main.rs b/utils/chain-spec-builder/src/main.rs index 015160a7aa..d8faee6e8b 100644 --- a/utils/chain-spec-builder/src/main.rs +++ b/utils/chain-spec-builder/src/main.rs @@ -152,11 +152,11 @@ fn generate_chain_spec( None, // Default::default(), ); - chain_spec.to_json(false).map_err(|err| err.to_string()) + chain_spec.to_json(false).map_err(|err| err) } fn generate_authority_keys_and_store(seeds: &[String], keystore_path: &Path) -> Result<(), String> { - for (n, seed) in seeds.into_iter().enumerate() { + for (n, seed) in seeds.iter().enumerate() { let keystore = Keystore::open(keystore_path.join(format!("auth-{}", n)), None) .map_err(|err| err.to_string())?; From fefab8fd33206da709c57d8f25ce58f7409e68c1 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Fri, 24 Apr 2020 18:22:03 +0300 Subject: [PATCH 239/286] FIx a typo --- runtime-modules/content-working-group/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime-modules/content-working-group/src/lib.rs b/runtime-modules/content-working-group/src/lib.rs index 38aa7e386d..7f3df8821a 100755 --- a/runtime-modules/content-working-group/src/lib.rs +++ b/runtime-modules/content-working-group/src/lib.rs @@ -2660,7 +2660,7 @@ impl Module { false }; - // When the curator is staked, unstaking must first be initaated, + // When the curator is staked, unstaking must first be initiated, // otherwise they can be terminated right away. // Create exit summary for this termination From c38eae6b181aa66648e87aaa978da9e7abe5eadb Mon Sep 17 00:00:00 2001 From: Gleb Urvanov Date: Sat, 25 Apr 2020 20:47:14 +0200 Subject: [PATCH 240/286] Rome to Constantinople migration test fix --- tests/network-tests/package.json | 4 ++-- .../src/tests/proposals/textProposalTest.ts | 5 ++++- .../src/tests/rome/electingCouncilTest.ts | 2 +- .../src/tests/rome/membershipCreationTest.ts | 2 +- .../src/tests/rome/romeRuntimeUpgradeTest.ts | 16 +++++----------- .../src/tests/rome/utils/apiWrapper.ts | 3 --- .../network-tests/src/tests/rome/utils/config.ts | 5 +++++ 7 files changed, 18 insertions(+), 19 deletions(-) create mode 100644 tests/network-tests/src/tests/rome/utils/config.ts diff --git a/tests/network-tests/package.json b/tests/network-tests/package.json index e7a56d58c7..16e5f9e9d6 100644 --- a/tests/network-tests/package.json +++ b/tests/network-tests/package.json @@ -4,12 +4,12 @@ "license": "GPL-3.0-only", "scripts": { "build": "tsc --build tsconfig.json", - "test": "mocha -r ts-node/register src/tests/**/*", + "test": "mocha -r ts-node/register src/tests/rome/* && mocha -r ts-node/register src/tests/proposals/*", "lint": "tslint --project tsconfig.json", "prettier": "prettier --write ./src" }, "dependencies": { - "@joystream/types": "^0.7.0", + "@joystream/types": "../joystream-apps/packages/joy-types", "@rome/types@npm:@joystream/types": "^0.7.0", "@polkadot/api": "^0.96.1", "@polkadot/keyring": "^1.7.0-beta.5", diff --git a/tests/network-tests/src/tests/proposals/textProposalTest.ts b/tests/network-tests/src/tests/proposals/textProposalTest.ts index 7eac64ced3..3e5ad9878f 100644 --- a/tests/network-tests/src/tests/proposals/textProposalTest.ts +++ b/tests/network-tests/src/tests/proposals/textProposalTest.ts @@ -7,8 +7,9 @@ import { registerJoystreamTypes } from '@joystream/types'; import { ApiWrapper } from '../../utils/apiWrapper'; import { v4 as uuid } from 'uuid'; import BN = require('bn.js'); +import { Utils } from '../../utils/utils'; -describe.skip('Text proposal network tests', () => { +describe('Text proposal network tests', () => { initConfig(); const keyring = new Keyring({ type: 'sr25519' }); const nodeUrl: string = process.env.NODE_URL!; @@ -26,6 +27,8 @@ describe.skip('Text proposal network tests', () => { registerJoystreamTypes(); const provider = new WsProvider(nodeUrl); apiWrapper = await ApiWrapper.create(provider); + + await Utils.wait(apiWrapper.getBlockDuration().muln(2.5).toNumber()); }); membershipTest(m1KeyPairs); diff --git a/tests/network-tests/src/tests/rome/electingCouncilTest.ts b/tests/network-tests/src/tests/rome/electingCouncilTest.ts index f090d27737..e4d901f5e8 100644 --- a/tests/network-tests/src/tests/rome/electingCouncilTest.ts +++ b/tests/network-tests/src/tests/rome/electingCouncilTest.ts @@ -2,7 +2,7 @@ import { membershipTest } from './membershipCreationTest'; import { KeyringPair } from '@polkadot/keyring/types'; import { ApiWrapper } from './utils/apiWrapper'; import { WsProvider, Keyring } from '@polkadot/api'; -import { initConfig } from '../../utils/config'; +import { initConfig } from './utils/config'; import BN = require('bn.js'); import { registerJoystreamTypes, Seat } from '@rome/types'; import { assert } from 'chai'; diff --git a/tests/network-tests/src/tests/rome/membershipCreationTest.ts b/tests/network-tests/src/tests/rome/membershipCreationTest.ts index c4413966f4..b96e2b0418 100644 --- a/tests/network-tests/src/tests/rome/membershipCreationTest.ts +++ b/tests/network-tests/src/tests/rome/membershipCreationTest.ts @@ -5,7 +5,7 @@ import { assert } from 'chai'; import { KeyringPair } from '@polkadot/keyring/types'; import BN = require('bn.js'); import { ApiWrapper } from './utils/apiWrapper'; -import { initConfig } from '../../utils/config'; +import { initConfig } from './utils/config'; import { v4 as uuid } from 'uuid'; export function membershipTest(nKeyPairs: KeyringPair[]) { diff --git a/tests/network-tests/src/tests/rome/romeRuntimeUpgradeTest.ts b/tests/network-tests/src/tests/rome/romeRuntimeUpgradeTest.ts index 9ff7dce4a4..eb67ae7680 100644 --- a/tests/network-tests/src/tests/rome/romeRuntimeUpgradeTest.ts +++ b/tests/network-tests/src/tests/rome/romeRuntimeUpgradeTest.ts @@ -1,9 +1,9 @@ -import { initConfig } from '../../utils/config'; +import { initConfig } from './utils/config'; import { Keyring, WsProvider } from '@polkadot/api'; import { Bytes } from '@polkadot/types'; import { KeyringPair } from '@polkadot/keyring/types'; -import { membershipTest } from '../membershipCreationTest'; -import { councilTest } from '../electingCouncilTest'; +import { membershipTest } from './membershipCreationTest'; +import { councilTest } from './electingCouncilTest'; import { registerJoystreamTypes } from '@rome/types'; import { ApiWrapper } from './utils/apiWrapper'; import BN = require('bn.js'); @@ -37,13 +37,9 @@ describe('Runtime upgrade integration tests', () => { it('Upgrading the runtime test', async () => { // Setup - console.log('7'); sudo = keyring.addFromUri(sudoUri); // const runtime: Bytes = await apiWrapper.getRuntime(); const runtime: string = Utils.readRuntimeFromFile('joystream_node_runtime.wasm'); - console.log('runtime length ' + runtime.length); - console.log('runtime strart ' + runtime.slice(0, 10)); - console.log('runtime end ' + runtime.slice(runtime.length - 10)); const description: string = 'runtime upgrade proposal which is used for API integration testing'; const runtimeProposalFee: BN = apiWrapper.estimateRomeProposeRuntimeUpgradeFee( proposalStake, @@ -59,7 +55,6 @@ describe('Runtime upgrade integration tests', () => { // Proposal creation const proposalPromise = apiWrapper.expectProposalCreated(); - console.log('proposal will be sent'); await apiWrapper.proposeRuntimeRome( m1KeyPairs[0], proposalStake, @@ -67,16 +62,15 @@ describe('Runtime upgrade integration tests', () => { 'runtime to test proposal functionality', runtime ); - console.log('proposal sent'); const proposalNumber = await proposalPromise; - console.log('proposal created'); // Approving runtime update proposal const runtimePromise = apiWrapper.expectRomeRuntimeUpgraded(); - console.log('voting'); await apiWrapper.batchApproveRomeProposal(m2KeyPairs, proposalNumber); // apiWrapper = await ApiWrapper.create(provider); await runtimePromise; + + await Utils.wait(apiWrapper.getBlockDuration().muln(2.5).toNumber()); }).timeout(defaultTimeout); //membershipTest(new Array()); diff --git a/tests/network-tests/src/tests/rome/utils/apiWrapper.ts b/tests/network-tests/src/tests/rome/utils/apiWrapper.ts index 14e0215f42..fa57bc4c9a 100644 --- a/tests/network-tests/src/tests/rome/utils/apiWrapper.ts +++ b/tests/network-tests/src/tests/rome/utils/apiWrapper.ts @@ -387,7 +387,6 @@ export class ApiWrapper { await this.api.query.system.events>(events => { events.forEach(record => { if (record.event.method.toString() === 'RuntimeUpdated') { - console.log('Runtime updated!!'); resolve(); } }); @@ -416,8 +415,6 @@ export class ApiWrapper { public async getProposal(id: BN) { const proposal = await this.api.query.proposalsEngine.proposals(id); - console.log('proposal to string ' + proposal.toString()); - console.log('proposal to raw ' + proposal.toRawType()); return; } diff --git a/tests/network-tests/src/tests/rome/utils/config.ts b/tests/network-tests/src/tests/rome/utils/config.ts new file mode 100644 index 0000000000..612aa752c5 --- /dev/null +++ b/tests/network-tests/src/tests/rome/utils/config.ts @@ -0,0 +1,5 @@ +import { config } from 'dotenv'; + +export function initConfig() { + config(); +} From 7ee50ee78943631f67d28cfcf0168ce39c1b3036 Mon Sep 17 00:00:00 2001 From: Gleb Urvanov Date: Mon, 27 Apr 2020 13:02:52 +0200 Subject: [PATCH 241/286] new yarn command introduces to run migration test --- package.json | 3 ++- tests/network-tests/package.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index cbe0e84994..ead0da298b 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,8 @@ "name": "joystream", "license": "GPL-3.0-only", "scripts": { - "test": "yarn && yarn workspaces run test" + "test": "yarn && yarn workspaces run test", + "test-migration": "yarn && yarn workspaces run test-migration" }, "workspaces": [ "tests/network-tests" diff --git a/tests/network-tests/package.json b/tests/network-tests/package.json index 16e5f9e9d6..f7f9a3a9d4 100644 --- a/tests/network-tests/package.json +++ b/tests/network-tests/package.json @@ -4,7 +4,8 @@ "license": "GPL-3.0-only", "scripts": { "build": "tsc --build tsconfig.json", - "test": "mocha -r ts-node/register src/tests/rome/* && mocha -r ts-node/register src/tests/proposals/*", + "test": "mocha -r ts-node/register src/tests/proposals/*", + "test-migration": "mocha -r ts-node/register src/tests/rome/* && mocha -r ts-node/register src/tests/proposals/*", "lint": "tslint --project tsconfig.json", "prettier": "prettier --write ./src" }, From 1e7fd057140657dd0520ae5fb2635b5a3107b473 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Mon, 27 Apr 2020 15:57:49 +0300 Subject: [PATCH 242/286] Add proposals codex config parametrs to the migration - change runtime migration - change proposals default values on genesis config creation - add a test --- node/src/chain_spec.rs | 49 +++++++---- runtime-modules/proposals/codex/src/lib.rs | 58 +++++++++++++ .../proposals/codex/src/proposal_types/mod.rs | 84 ++++++++++++++++++ .../proposals/codex/src/tests/mod.rs | 87 +++++++++++++++++++ runtime/src/lib.rs | 1 + runtime/src/migration.rs | 3 + 6 files changed, 264 insertions(+), 18 deletions(-) diff --git a/node/src/chain_spec.rs b/node/src/chain_spec.rs index 9fb1b8e160..d439877ca1 100644 --- a/node/src/chain_spec.rs +++ b/node/src/chain_spec.rs @@ -180,6 +180,9 @@ pub fn testnet_genesis( const STASH: Balance = 20 * DOLLARS; const ENDOWMENT: Balance = 100_000 * DOLLARS; + // default codex proposals config parameters + let cpcp = node_runtime::ProposalsConfigParameters::default(); + GenesisConfig { system: Some(SystemConfig { code: WASM_BINARY.to_vec(), @@ -298,24 +301,34 @@ pub fn testnet_genesis( channel_title_constraint: crate::forum_config::new_validation(5, 1024), }), proposals_codex: Some(ProposalsCodexConfig { - set_validator_count_proposal_voting_period: 43200u32, - set_validator_count_proposal_grace_period: 0u32, - runtime_upgrade_proposal_voting_period: 72000u32, - runtime_upgrade_proposal_grace_period: 72000u32, - text_proposal_voting_period: 72000u32, - text_proposal_grace_period: 0u32, - set_election_parameters_proposal_voting_period: 72000u32, - set_election_parameters_proposal_grace_period: 201601u32, - set_content_working_group_mint_capacity_proposal_voting_period: 43200u32, - set_content_working_group_mint_capacity_proposal_grace_period: 0u32, - set_lead_proposal_voting_period: 43200u32, - set_lead_proposal_grace_period: 0u32, - spending_proposal_voting_period: 72000u32, - spending_proposal_grace_period: 14400u32, - evict_storage_provider_proposal_voting_period: 43200u32, - evict_storage_provider_proposal_grace_period: 0u32, - set_storage_role_parameters_proposal_voting_period: 43200u32, - set_storage_role_parameters_proposal_grace_period: 14400u32, + set_validator_count_proposal_voting_period: cpcp + .set_validator_count_proposal_voting_period, + set_validator_count_proposal_grace_period: cpcp + .set_validator_count_proposal_grace_period, + runtime_upgrade_proposal_voting_period: cpcp.runtime_upgrade_proposal_voting_period, + runtime_upgrade_proposal_grace_period: cpcp.runtime_upgrade_proposal_grace_period, + text_proposal_voting_period: cpcp.text_proposal_voting_period, + text_proposal_grace_period: cpcp.text_proposal_grace_period, + set_election_parameters_proposal_voting_period: cpcp + .set_election_parameters_proposal_voting_period, + set_election_parameters_proposal_grace_period: cpcp + .set_election_parameters_proposal_grace_period, + set_content_working_group_mint_capacity_proposal_voting_period: cpcp + .set_content_working_group_mint_capacity_proposal_voting_period, + set_content_working_group_mint_capacity_proposal_grace_period: cpcp + .set_content_working_group_mint_capacity_proposal_grace_period, + set_lead_proposal_voting_period: cpcp.set_lead_proposal_voting_period, + set_lead_proposal_grace_period: cpcp.set_lead_proposal_voting_period, + spending_proposal_voting_period: cpcp.spending_proposal_voting_period, + spending_proposal_grace_period: cpcp.spending_proposal_grace_period, + evict_storage_provider_proposal_voting_period: cpcp + .evict_storage_provider_proposal_voting_period, + evict_storage_provider_proposal_grace_period: cpcp + .evict_storage_provider_proposal_grace_period, + set_storage_role_parameters_proposal_voting_period: cpcp + .set_storage_role_parameters_proposal_voting_period, + set_storage_role_parameters_proposal_grace_period: cpcp + .set_storage_role_parameters_proposal_grace_period, }), } } diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index e1baf68832..1e847acfeb 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -66,6 +66,7 @@ use srml_support::traits::{Currency, Get}; use srml_support::{decl_error, decl_module, decl_storage, ensure, print}; use system::{ensure_root, RawOrigin}; +pub use crate::proposal_types::ProposalsConfigParameters; pub use proposal_types::{ProposalDetails, ProposalDetailsOf, ProposalEncoder}; // Percentage of the total token issue as max mint balance value. Shared with spending @@ -938,6 +939,63 @@ impl Module { Ok(()) } + + /// Sets default config values for the proposals. + /// Should be called on the migration to the new runtime version. + pub fn set_default_config_values() { + let p = ProposalsConfigParameters::default(); + + >::put(T::BlockNumber::from( + p.set_validator_count_proposal_voting_period, + )); + >::put(T::BlockNumber::from( + p.set_validator_count_proposal_grace_period, + )); + >::put(T::BlockNumber::from( + p.runtime_upgrade_proposal_voting_period, + )); + >::put(T::BlockNumber::from( + p.runtime_upgrade_proposal_grace_period, + )); + >::put(T::BlockNumber::from(p.text_proposal_voting_period)); + >::put(T::BlockNumber::from(p.text_proposal_grace_period)); + >::put(T::BlockNumber::from( + p.set_election_parameters_proposal_voting_period, + )); + >::put(T::BlockNumber::from( + p.set_election_parameters_proposal_grace_period, + )); + >::put(T::BlockNumber::from( + p.set_content_working_group_mint_capacity_proposal_voting_period, + )); + >::put(T::BlockNumber::from( + p.set_content_working_group_mint_capacity_proposal_grace_period, + )); + >::put(T::BlockNumber::from( + p.set_lead_proposal_voting_period, + )); + >::put(T::BlockNumber::from( + p.set_lead_proposal_grace_period, + )); + >::put(T::BlockNumber::from( + p.spending_proposal_voting_period, + )); + >::put(T::BlockNumber::from( + p.spending_proposal_grace_period, + )); + >::put(T::BlockNumber::from( + p.evict_storage_provider_proposal_voting_period, + )); + >::put(T::BlockNumber::from( + p.evict_storage_provider_proposal_grace_period, + )); + >::put(T::BlockNumber::from( + p.set_storage_role_parameters_proposal_voting_period, + )); + >::put(T::BlockNumber::from( + p.set_storage_role_parameters_proposal_grace_period, + )); + } } // calculates required stake value using total issuance value and stake percentage. Truncates to diff --git a/runtime-modules/proposals/codex/src/proposal_types/mod.rs b/runtime-modules/proposals/codex/src/proposal_types/mod.rs index fc0a1ce370..bf60dcec01 100644 --- a/runtime-modules/proposals/codex/src/proposal_types/mod.rs +++ b/runtime-modules/proposals/codex/src/proposal_types/mod.rs @@ -1,3 +1,5 @@ +#![warn(missing_docs)] + pub(crate) mod parameters; use codec::{Decode, Encode}; @@ -62,3 +64,85 @@ impl Default ProposalDetails::Text(b"invalid proposal details".to_vec()) } } + +/// Contains proposal config parameters. Default values are used by migration and genesis config. +pub struct ProposalsConfigParameters { + /// 'Set validator count' proposal voting period + pub set_validator_count_proposal_voting_period: u32, + + /// 'Set validator count' proposal grace period + pub set_validator_count_proposal_grace_period: u32, + + /// 'Runtime upgrade' proposal voting period + pub runtime_upgrade_proposal_voting_period: u32, + + /// 'Runtime upgrade' proposal grace period + pub runtime_upgrade_proposal_grace_period: u32, + + /// 'Text' proposal voting period + pub text_proposal_voting_period: u32, + + /// 'Text' proposal grace period + pub text_proposal_grace_period: u32, + + /// 'Set election parameters' proposal voting period + pub set_election_parameters_proposal_voting_period: u32, + + /// 'Set election parameters' proposal grace period + pub set_election_parameters_proposal_grace_period: u32, + + /// 'Set content working group mint capacity' proposal voting period + pub set_content_working_group_mint_capacity_proposal_voting_period: u32, + + /// 'Set content working group mint capacity' proposal grace period + pub set_content_working_group_mint_capacity_proposal_grace_period: u32, + + /// 'Set lead' proposal voting period + pub set_lead_proposal_voting_period: u32, + + /// 'Set lead' proposal grace period + pub set_lead_proposal_grace_period: u32, + + /// 'Spending' proposal voting period + pub spending_proposal_voting_period: u32, + + /// 'Spending' proposal grace period + pub spending_proposal_grace_period: u32, + + /// 'Evict storage provider' proposal voting period + pub evict_storage_provider_proposal_voting_period: u32, + + /// 'Evict storage provider' proposal grace period + pub evict_storage_provider_proposal_grace_period: u32, + + /// 'Set storage role parameters' proposal voting period + pub set_storage_role_parameters_proposal_voting_period: u32, + + /// 'Set storage role parameters' proposal grace period + pub set_storage_role_parameters_proposal_grace_period: u32, +} + +impl Default for ProposalsConfigParameters { + fn default() -> Self { + ProposalsConfigParameters { + set_validator_count_proposal_voting_period: 43200u32, + set_validator_count_proposal_grace_period: 0u32, + runtime_upgrade_proposal_voting_period: 72000u32, + runtime_upgrade_proposal_grace_period: 72000u32, + text_proposal_voting_period: 72000u32, + text_proposal_grace_period: 0u32, + set_election_parameters_proposal_voting_period: 72000u32, + set_election_parameters_proposal_grace_period: 201601u32, + set_content_working_group_mint_capacity_proposal_voting_period: 43200u32, + set_content_working_group_mint_capacity_proposal_grace_period: 0u32, + set_lead_proposal_voting_period: 43200u32, + set_lead_proposal_grace_period: 0u32, + spending_proposal_voting_period: 72000u32, + spending_proposal_grace_period: 14400u32, + evict_storage_provider_proposal_voting_period: 43200u32, + evict_storage_provider_proposal_grace_period: 0u32, + set_storage_role_parameters_proposal_voting_period: 43200u32, + set_storage_role_parameters_proposal_grace_period: 14400u32, + } + } +} diff --git a/runtime-modules/proposals/codex/src/tests/mod.rs b/runtime-modules/proposals/codex/src/tests/mod.rs index 2bc3f870f4..7825a17e07 100644 --- a/runtime-modules/proposals/codex/src/tests/mod.rs +++ b/runtime-modules/proposals/codex/src/tests/mod.rs @@ -5,11 +5,13 @@ use srml_support::traits::Currency; use srml_support::StorageMap; use system::RawOrigin; +use crate::*; use crate::{BalanceOf, Error, ProposalDetails}; use proposal_engine::ProposalParameters; use roles::actors::RoleParameters; use srml_support::dispatch::DispatchResult; +use crate::proposal_types::ProposalsConfigParameters; pub use mock::*; pub(crate) fn increase_total_balance_issuance(balance: u64) { @@ -1051,3 +1053,88 @@ fn create_set_storage_role_parameters_proposal_fails_with_invalid_parameters() { ); }); } + +#[test] +fn set_default_proposal_parameters_succeeded() { + initial_test_ext().execute_with(|| { + let p = ProposalsConfigParameters::default(); + + // nothing is set + assert_eq!(>::get(), 0); + + ProposalCodex::set_default_config_values(); + + assert_eq!( + >::get(), + p.set_validator_count_proposal_voting_period as u64 + ); + assert_eq!( + >::get(), + p.set_validator_count_proposal_grace_period as u64 + ); + assert_eq!( + >::get(), + p.runtime_upgrade_proposal_voting_period as u64 + ); + assert_eq!( + >::get(), + p.runtime_upgrade_proposal_grace_period as u64 + ); + assert_eq!( + >::get(), + p.text_proposal_voting_period as u64 + ); + assert_eq!( + >::get(), + p.text_proposal_grace_period as u64 + ); + assert_eq!( + >::get(), + p.set_election_parameters_proposal_voting_period as u64 + ); + assert_eq!( + >::get(), + p.set_election_parameters_proposal_grace_period as u64 + ); + assert_eq!( + >::get(), + p.set_content_working_group_mint_capacity_proposal_voting_period as u64 + ); + assert_eq!( + >::get(), + p.set_content_working_group_mint_capacity_proposal_grace_period as u64 + ); + assert_eq!( + >::get(), + p.set_lead_proposal_voting_period as u64 + ); + assert_eq!( + >::get(), + p.set_lead_proposal_grace_period as u64 + ); + assert_eq!( + >::get(), + p.spending_proposal_voting_period as u64 + ); + assert_eq!( + >::get(), + p.spending_proposal_grace_period as u64 + ); + assert_eq!( + >::get(), + p.evict_storage_provider_proposal_voting_period as u64 + ); + assert_eq!( + >::get(), + p.evict_storage_provider_proposal_grace_period as u64 + ); + assert_eq!( + >::get(), + p.set_storage_role_parameters_proposal_voting_period as u64 + ); + assert_eq!( + >::get(), + p.set_storage_role_parameters_proposal_grace_period as u64 + ); + }); +} diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index bd2c4c1b0f..60d6fac253 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -60,6 +60,7 @@ pub use staking::StakerStatus; pub use timestamp::Call as TimestampCall; use integration::proposals::{CouncilManager, ExtrinsicProposalEncoder, MembershipOriginValidator}; +pub use proposals_codex::ProposalsConfigParameters; /// An index to a block. pub type BlockNumber = u32; diff --git a/runtime/src/migration.rs b/runtime/src/migration.rs index e0b144429a..810c95c95a 100644 --- a/runtime/src/migration.rs +++ b/runtime/src/migration.rs @@ -19,6 +19,8 @@ impl Module { minting::BalanceOf::::zero(), ); + proposals_codex::Module::::set_default_config_values(); + Self::deposit_event(RawEvent::Migrated( >::block_number(), VERSION.spec_version, @@ -33,6 +35,7 @@ pub trait Trait: + forum::Trait + sudo::Trait + governance::council::Trait + + proposals_codex::Trait { type Event: From> + Into<::Event>; } From d2a0ce85e54110a700ad818dff040d4c0073d950 Mon Sep 17 00:00:00 2001 From: Gleb Urvanov Date: Mon, 27 Apr 2020 22:11:47 +0200 Subject: [PATCH 243/286] code cleaning, minor fixes --- .../src/tests/proposals/textProposalTest.ts | 2 +- ...> workingGroupMintCapacityProposalTest.ts} | 8 +-- .../src/tests/rome/romeRuntimeUpgradeTest.ts | 4 -- tests/network-tests/src/utils/apiWrapper.ts | 65 ++----------------- 4 files changed, 8 insertions(+), 71 deletions(-) rename tests/network-tests/src/tests/proposals/{workingGroupMmintCapacityProposalTest.ts => workingGroupMintCapacityProposalTest.ts} (89%) diff --git a/tests/network-tests/src/tests/proposals/textProposalTest.ts b/tests/network-tests/src/tests/proposals/textProposalTest.ts index 3e5ad9878f..f1c2f18f6c 100644 --- a/tests/network-tests/src/tests/proposals/textProposalTest.ts +++ b/tests/network-tests/src/tests/proposals/textProposalTest.ts @@ -9,7 +9,7 @@ import { v4 as uuid } from 'uuid'; import BN = require('bn.js'); import { Utils } from '../../utils/utils'; -describe('Text proposal network tests', () => { +describe.skip('Text proposal network tests', () => { initConfig(); const keyring = new Keyring({ type: 'sr25519' }); const nodeUrl: string = process.env.NODE_URL!; diff --git a/tests/network-tests/src/tests/proposals/workingGroupMmintCapacityProposalTest.ts b/tests/network-tests/src/tests/proposals/workingGroupMintCapacityProposalTest.ts similarity index 89% rename from tests/network-tests/src/tests/proposals/workingGroupMmintCapacityProposalTest.ts rename to tests/network-tests/src/tests/proposals/workingGroupMintCapacityProposalTest.ts index 271dc1dee8..c0644492ca 100644 --- a/tests/network-tests/src/tests/proposals/workingGroupMmintCapacityProposalTest.ts +++ b/tests/network-tests/src/tests/proposals/workingGroupMintCapacityProposalTest.ts @@ -8,7 +8,7 @@ import { ApiWrapper } from '../../utils/apiWrapper'; import { v4 as uuid } from 'uuid'; import BN = require('bn.js'); -describe.skip('Mint capacity proposal network tests', () => { +describe('Mint capacity proposal network tests', () => { initConfig(); const keyring = new Keyring({ type: 'sr25519' }); const nodeUrl: string = process.env.NODE_URL!; @@ -52,9 +52,7 @@ describe.skip('Mint capacity proposal network tests', () => { await apiWrapper.transferBalanceToAccounts(sudo, m2KeyPairs, runtimeVoteFee); // Proposal creation - console.log('proposing new mint capacity'); const proposalPromise = apiWrapper.expectProposalCreated(); - console.log('sending extr with capacity ' + mintingCapacity); await apiWrapper.proposeWorkingGroupMintCapacity( m1KeyPairs[0], 'testing mint capacity' + uuid().substring(0, 8), @@ -63,12 +61,10 @@ describe.skip('Mint capacity proposal network tests', () => { mintingCapacity ); const proposalNumber = await proposalPromise; - console.log('proposed'); - //await apiWrapper.getProposal(proposalNumber); // Approving runtime update proposal console.log('block number ' + (await apiWrapper.getBestBlock())); - console.log('approving new mint capacity'); + console.log('approving new mint capacity of proposal ' + proposalNumber); const runtimePromise = apiWrapper.expectProposalFinalized(); await apiWrapper.batchApproveProposal(m2KeyPairs, proposalNumber); await runtimePromise; diff --git a/tests/network-tests/src/tests/rome/romeRuntimeUpgradeTest.ts b/tests/network-tests/src/tests/rome/romeRuntimeUpgradeTest.ts index eb67ae7680..2272d4c588 100644 --- a/tests/network-tests/src/tests/rome/romeRuntimeUpgradeTest.ts +++ b/tests/network-tests/src/tests/rome/romeRuntimeUpgradeTest.ts @@ -38,7 +38,6 @@ describe('Runtime upgrade integration tests', () => { it('Upgrading the runtime test', async () => { // Setup sudo = keyring.addFromUri(sudoUri); - // const runtime: Bytes = await apiWrapper.getRuntime(); const runtime: string = Utils.readRuntimeFromFile('joystream_node_runtime.wasm'); const description: string = 'runtime upgrade proposal which is used for API integration testing'; const runtimeProposalFee: BN = apiWrapper.estimateRomeProposeRuntimeUpgradeFee( @@ -67,14 +66,11 @@ describe('Runtime upgrade integration tests', () => { // Approving runtime update proposal const runtimePromise = apiWrapper.expectRomeRuntimeUpgraded(); await apiWrapper.batchApproveRomeProposal(m2KeyPairs, proposalNumber); - // apiWrapper = await ApiWrapper.create(provider); await runtimePromise; await Utils.wait(apiWrapper.getBlockDuration().muln(2.5).toNumber()); }).timeout(defaultTimeout); - //membershipTest(new Array()); - after(() => { apiWrapper.close(); }); diff --git a/tests/network-tests/src/utils/apiWrapper.ts b/tests/network-tests/src/utils/apiWrapper.ts index 661a2fcc79..3f3defd320 100644 --- a/tests/network-tests/src/utils/apiWrapper.ts +++ b/tests/network-tests/src/utils/apiWrapper.ts @@ -105,15 +105,6 @@ export class ApiWrapper { ); } - public estimateRomeProposeRuntimeUpgradeFee( - stake: BN, - name: string, - description: string, - runtime: Bytes | string - ): BN { - return this.estimateTxFee(this.api.tx.proposals.createProposal(stake, name, description, runtime)); - } - public estimateProposeTextFee(stake: BN, name: string, description: string, text: string): BN { return this.estimateTxFee(this.api.tx.proposalsCodex.createTextProposal(stake, name, description, stake, text)); } @@ -146,10 +137,6 @@ export class ApiWrapper { return this.estimateTxFee(this.api.tx.proposalsEngine.vote(0, 0, 'Approve')); } - public estimateVoteForRomeRuntimeProposalFee(): BN { - return this.estimateTxFee(this.api.tx.proposals.voteOnProposal(0, 'Approve')); - } - private applyForCouncilElection(account: KeyringPair, amount: BN): Promise { return this.sender.signAndSend(this.api.tx.councilElection.apply(amount), account, false); } @@ -232,7 +219,7 @@ export class ApiWrapper { public getCouncil(): Promise { return this.api.query.council.activeCouncil>().then(seats => { - return JSON.parse(seats.toString()); + return (seats as unknown) as Seat[]; }); } @@ -255,20 +242,6 @@ export class ApiWrapper { ); } - public proposeRuntimeRome( - account: KeyringPair, - stake: BN, - name: string, - description: string, - runtime: Bytes | string - ): Promise { - return this.sender.signAndSend( - this.api.tx.proposals.createProposal(stake, name, description, runtime), - account, - false - ); - } - public async proposeText( account: KeyringPair, stake: BN, @@ -334,22 +307,6 @@ export class ApiWrapper { ); } - public approveRomeProposal(account: KeyringPair, proposal: BN): Promise { - return this.sender.signAndSend( - this.api.tx.proposals.voteOnProposal(proposal, new VoteKind('Approve')), - account, - false - ); - } - - public batchApproveRomeProposal(council: KeyringPair[], proposal: BN): Promise { - return Promise.all( - council.map(async keyPair => { - await this.approveRomeProposal(keyPair, proposal); - }) - ); - } - public getBlockDuration(): BN { return this.api.createType('Moment', this.api.consts.babe.expectedBlockTime).toBn(); } @@ -358,7 +315,8 @@ export class ApiWrapper { return new Promise(async resolve => { await this.api.query.system.events>(events => { events.forEach(record => { - if (record.event.method.toString() === 'ProposalCreated') { + if (record.event.method && record.event.method.toString() === 'ProposalCreated') { + console.log('im here'); resolve(new BN(record.event.data[1].toString())); } }); @@ -378,25 +336,14 @@ export class ApiWrapper { }); } - public expectRomeRuntimeUpgraded(): Promise { - return new Promise(async resolve => { - await this.api.query.system.events>(events => { - events.forEach(record => { - if (record.event.method.toString() === 'RuntimeUpdated') { - resolve(); - } - }); - }); - }); - } - public expectProposalFinalized(): Promise { return new Promise(async resolve => { await this.api.query.system.events>(events => { events.forEach(record => { if ( + record.event.method && record.event.method.toString() === 'ProposalStatusUpdated' && - record.event.data[1].toString().includes('Finalized') + record.event.data[1].toString().includes('Executed') ) { resolve(); } @@ -411,8 +358,6 @@ export class ApiWrapper { public async getProposal(id: BN) { const proposal = await this.api.query.proposalsEngine.proposals(id); - console.log('proposal to string ' + proposal.toString()); - console.log('proposal to raw ' + proposal.toRawType()); return; } From 68a4380a527023f766fa953514a92c732d66ea61 Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Tue, 28 Apr 2020 10:50:56 +0400 Subject: [PATCH 244/286] rustfmt --- node/src/service.rs | 6 +++--- runtime-modules/proposals/discussion/src/lib.rs | 6 +++--- runtime-modules/proposals/engine/src/lib.rs | 2 +- runtime/src/lib.rs | 12 ++++++------ 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/node/src/service.rs b/node/src/service.rs index 2d9a6f24b3..7a91524580 100644 --- a/node/src/service.rs +++ b/node/src/service.rs @@ -43,9 +43,9 @@ construct_simple_protocol! { // Declare an instance of the native executor named `Executor`. Include the wasm binary as the // equivalent wasm code. native_executor_instance!( - pub Executor, - node_runtime::api::dispatch, - node_runtime::native_version + pub Executor, + node_runtime::api::dispatch, + node_runtime::native_version ); /// Starts a `ServiceBuilder` for a full service. diff --git a/runtime-modules/proposals/discussion/src/lib.rs b/runtime-modules/proposals/discussion/src/lib.rs index 19ff49ba0d..36c02c1cad 100644 --- a/runtime-modules/proposals/discussion/src/lib.rs +++ b/runtime-modules/proposals/discussion/src/lib.rs @@ -71,13 +71,13 @@ decl_event!( MemberId = MemberId, ::PostId, { - /// Emits on thread creation. + /// Emits on thread creation. ThreadCreated(ThreadId, MemberId), - /// Emits on post creation. + /// Emits on post creation. PostCreated(PostId, MemberId), - /// Emits on post update. + /// Emits on post update. PostUpdated(PostId, MemberId), } ); diff --git a/runtime-modules/proposals/engine/src/lib.rs b/runtime-modules/proposals/engine/src/lib.rs index 733f83dd3e..934b6dd9bc 100644 --- a/runtime-modules/proposals/engine/src/lib.rs +++ b/runtime-modules/proposals/engine/src/lib.rs @@ -195,7 +195,7 @@ decl_event!( ::AccountId, ::StakeId, { - /// Emits on proposal creation. + /// Emits on proposal creation. /// Params: /// - Member id of a proposer. /// - Id of a newly created proposal after it was saved in storage. diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 60d6fac253..3288b08578 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -871,11 +871,11 @@ impl proposals_codex::Trait for Runtime { } construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = opaque::Block, - UncheckedExtrinsic = UncheckedExtrinsic - { + pub enum Runtime where + Block = Block, + NodeBlock = opaque::Block, + UncheckedExtrinsic = UncheckedExtrinsic + { // Substrate System: system::{Module, Call, Storage, Config, Event}, Babe: babe::{Module, Call, Storage, Config, Inherent(Timestamp)}, @@ -917,7 +917,7 @@ construct_runtime!( ProposalsDiscussion: proposals_discussion::{Module, Call, Storage, Event}, ProposalsCodex: proposals_codex::{Module, Call, Storage, Error, Config}, // --- - } + } ); /// The address format for describing accounts. From cc0924e0ff809f783970f0c4236a6277faaf3f1f Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 28 Apr 2020 11:20:27 +0300 Subject: [PATCH 245/286] Increase runtime impl_version --- runtime/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index e3fc16b737..749f9b55a2 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -127,7 +127,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { impl_name: create_runtime_str!("joystream-node"), authoring_version: 6, spec_version: 12, - impl_version: 0, + impl_version: 1, apis: RUNTIME_API_VERSIONS, }; From 93e8a2f72a5e6021312b39dfa8287db97ac066bf Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Tue, 28 Apr 2020 15:00:44 +0400 Subject: [PATCH 246/286] migration: revet removing staked roles (storage providers, council members and curators) --- .../content-working-group/src/lib.rs | 33 --------- runtime-modules/governance/src/election.rs | 24 ------ runtime/src/lib.rs | 12 +-- runtime/src/migration.rs | 74 ++----------------- 4 files changed, 12 insertions(+), 131 deletions(-) diff --git a/runtime-modules/content-working-group/src/lib.rs b/runtime-modules/content-working-group/src/lib.rs index d9423a40bd..1884684a7e 100755 --- a/runtime-modules/content-working-group/src/lib.rs +++ b/runtime-modules/content-working-group/src/lib.rs @@ -290,9 +290,6 @@ pub enum CuratorExitInitiationOrigin { /// The curator exiting is the origin. Curator, - - /// The system is initiating exit of a curator - Root, } /// The exit stage of a curators involvement in the working group. @@ -1913,31 +1910,6 @@ decl_module! { ); } - /// Lead can terminate and active curator - pub fn terminate_curator_role_as_root( - origin, - curator_id: CuratorId, - rationale_text: Vec - ) { - - // Ensure origin is root - ensure_root(origin)?; - - // Ensuring curator actually exists and is active - let curator = Self::ensure_active_curator_exists(&curator_id)?; - - // - // == MUTATION SAFE == - // - - Self::deactivate_curator( - &curator_id, - &curator, - &CuratorExitInitiationOrigin::Root, - &rationale_text - ); - } - /// Replace the current lead. First unsets the active lead if there is one. /// If a value is provided for new_lead it will then set that new lead. /// It is responsibility of the caller to ensure the new lead can be set @@ -2697,7 +2669,6 @@ impl Module { let unstaking_period = match curator_exit_summary.origin { CuratorExitInitiationOrigin::Lead => stake_profile.termination_unstaking_period, CuratorExitInitiationOrigin::Curator => stake_profile.exit_unstaking_period, - CuratorExitInitiationOrigin::Root => stake_profile.termination_unstaking_period, }; ( @@ -2716,9 +2687,6 @@ impl Module { CuratorExitInitiationOrigin::Curator => { RawEvent::CuratorExited(curator_id.clone()) } - CuratorExitInitiationOrigin::Root => { - RawEvent::TerminatedCurator(curator_id.clone()) - } }, ) }; @@ -2869,7 +2837,6 @@ impl Module { let event = match curator_exit_summary.origin { CuratorExitInitiationOrigin::Lead => RawEvent::TerminatedCurator(curator_id), CuratorExitInitiationOrigin::Curator => RawEvent::CuratorExited(curator_id), - CuratorExitInitiationOrigin::Root => RawEvent::TerminatedCurator(curator_id), }; Self::deposit_event(event); diff --git a/runtime-modules/governance/src/election.rs b/runtime-modules/governance/src/election.rs index 7c8b9ce357..c8de43c912 100644 --- a/runtime-modules/governance/src/election.rs +++ b/runtime-modules/governance/src/election.rs @@ -228,30 +228,6 @@ impl Module { } } - pub fn stop_election_and_dissolve_council() -> Result { - // Stop running election - if Self::is_election_running() { - // cannot fail since we checked that election is running and we are using root - // origin. - Self::force_stop_election(system::RawOrigin::Root.into())?; - } - - // Return stakes from the council seat to their stake holders - Self::initialize_transferable_stakes(>::active_council()); - Self::unlock_transferable_stakes(); - Self::clear_transferable_stakes(); - - // Clear the council seats - // Cannot fail when passing root origin - council::Module::::set_council(system::RawOrigin::Root.into(), vec![])?; - council::TermEndsAt::::put(system::Module::::block_number()); - - // Start a new election after clearing the council - Self::start_election(vec![])?; - - Ok(()) - } - // PRIVATE MUTABLES /// Starts an election. Will fail if an election is already running diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index b14e2d4a83..f7a521374d 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -871,11 +871,11 @@ impl proposals_codex::Trait for Runtime { } construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = opaque::Block, - UncheckedExtrinsic = UncheckedExtrinsic - { + pub enum Runtime where + Block = Block, + NodeBlock = opaque::Block, + UncheckedExtrinsic = UncheckedExtrinsic + { // Substrate System: system::{Module, Call, Storage, Config, Event}, Babe: babe::{Module, Call, Storage, Config, Inherent(Timestamp)}, @@ -917,7 +917,7 @@ construct_runtime!( ProposalsDiscussion: proposals_discussion::{Module, Call, Storage, Event}, ProposalsCodex: proposals_codex::{Module, Call, Storage, Error, Config}, // --- - } + } ); /// The address format for describing accounts. diff --git a/runtime/src/migration.rs b/runtime/src/migration.rs index cc2c05a146..6cb3f9bc5d 100644 --- a/runtime/src/migration.rs +++ b/runtime/src/migration.rs @@ -30,13 +30,6 @@ impl Module { ); }); - // Reset Council - governance::election::Module::::stop_election_and_dissolve_council() - .err() - .map(|err| { - debug::warn!("Failed to dissolve council during migration: {:?}", err); - }); - // Reset working group mint capacity content_working_group::Module::::set_mint_capacity( system::RawOrigin::Root.into(), @@ -50,66 +43,6 @@ impl Module { ); }); - // Deactivate active curators - let termination_reason = "resetting curators".as_bytes().to_vec(); - - for (curator_id, ref curator) in content_working_group::CuratorById::::enumerate() { - // Skip non-active curators - if curator.stage != content_working_group::CuratorRoleStage::Active { - continue; - } - - content_working_group::Module::::terminate_curator_role_as_root( - system::RawOrigin::Root.into(), - curator_id, - termination_reason.clone(), - ) - .err() - .map(|err| { - debug::warn!( - "Failed to terminate curator {:?} during migration: {:?}", - curator_id, - err - ); - }); - } - - // Deactivate all storage providers, except Joystream providers (member id 0 in Rome runtime) - let joystream_providers = - roles::actors::AccountIdsByMemberId::::get(T::MemberId::from(0)); - - // Is there an intersect() like call to check if vector contains some elements from - // another vector?.. below implementation just seems - // silly to have to do in a filter predicate. - let storage_providers_to_remove: Vec = - roles::actors::Module::::actor_account_ids() - .into_iter() - .filter(|account| { - for provider in joystream_providers.as_slice() { - if *account == *provider { - return false; - } - } - return true; - }) - .collect(); - - for provider in storage_providers_to_remove { - roles::actors::Module::::remove_actor(system::RawOrigin::Root.into(), provider) - .err() - .map(|err| { - debug::warn!( - "Failed to remove storage provider during migration: {:?}", - err - ); - }); - } - - // Remove any pending storage entry requests, no stake is lost because only a fee is paid - // to make a request. - let no_requests: roles::actors::Requests = vec![]; - roles::actors::RoleEntryRequests::::put(no_requests); - // Set Storage Role reward to zero if let Some(parameters) = roles::actors::Parameters::::get(roles::actors::Role::StorageProvider) @@ -130,6 +63,7 @@ impl Module { ); }); } + proposals_codex::Module::::set_default_config_values(); Self::deposit_event(RawEvent::Migrated( @@ -140,7 +74,11 @@ impl Module { } pub trait Trait: - system::Trait + governance::election::Trait + content_working_group::Trait + roles::actors::Trait + proposals_codex::Trait + system::Trait + + governance::election::Trait + + content_working_group::Trait + + roles::actors::Trait + + proposals_codex::Trait { type Event: From> + Into<::Event>; } From e9f8eb737a1a1b014b3bfe8a2e48a6ab28971b74 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 28 Apr 2020 14:29:17 +0300 Subject: [PATCH 247/286] Update rust version to 1.43.0 - update travis.yml - apply new fmt - fix new linter issues (unused imports) --- .travis.yml | 2 +- node/src/chain_spec.rs | 1 - node/src/service.rs | 6 +++--- runtime-modules/common/src/currency.rs | 1 - runtime-modules/forum/src/lib.rs | 1 - runtime-modules/hiring/src/lib.rs | 2 -- runtime-modules/membership/src/members.rs | 1 - runtime-modules/proposals/discussion/src/lib.rs | 6 +++--- runtime-modules/proposals/engine/src/lib.rs | 2 +- runtime-modules/recurring-reward/src/lib.rs | 1 - runtime-modules/roles/src/traits.rs | 1 - runtime-modules/stake/src/lib.rs | 1 - runtime-modules/token-minting/src/lib.rs | 2 -- .../versioned-store-permissions/src/lib.rs | 1 - runtime-modules/versioned-store/src/lib.rs | 1 - runtime/src/lib.rs | 17 ++++++----------- runtime/src/migration.rs | 2 -- 17 files changed, 14 insertions(+), 34 deletions(-) diff --git a/.travis.yml b/.travis.yml index b6bd8b81f0..8a76eb12cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: rust rust: - - 1.42.0 + - 1.43.0 matrix: include: diff --git a/node/src/chain_spec.rs b/node/src/chain_spec.rs index d551bc9da6..7d663a7176 100644 --- a/node/src/chain_spec.rs +++ b/node/src/chain_spec.rs @@ -34,7 +34,6 @@ use babe_primitives::AuthorityId as BabeId; use grandpa_primitives::AuthorityId as GrandpaId; use im_online::sr25519::AuthorityId as ImOnlineId; use serde_json as json; -use substrate_service; type AccountPublic = ::Signer; diff --git a/node/src/service.rs b/node/src/service.rs index 2242ae2fa1..703bb6f5f2 100644 --- a/node/src/service.rs +++ b/node/src/service.rs @@ -49,9 +49,9 @@ construct_simple_protocol! { // Declare an instance of the native executor named `Executor`. Include the wasm binary as the // equivalent wasm code. native_executor_instance!( - pub Executor, - node_runtime::api::dispatch, - node_runtime::native_version + pub Executor, + node_runtime::api::dispatch, + node_runtime::native_version ); /// Starts a `ServiceBuilder` for a full service. diff --git a/runtime-modules/common/src/currency.rs b/runtime-modules/common/src/currency.rs index ac0e8551ae..50d9ebaef0 100644 --- a/runtime-modules/common/src/currency.rs +++ b/runtime-modules/common/src/currency.rs @@ -1,6 +1,5 @@ use sr_primitives::traits::Convert; use srml_support::traits::{Currency, LockableCurrency, ReservableCurrency}; -use system; pub trait GovernanceCurrency: system::Trait + Sized { type Currency: Currency diff --git a/runtime-modules/forum/src/lib.rs b/runtime-modules/forum/src/lib.rs index 80a73f7451..b9f619fc7f 100755 --- a/runtime-modules/forum/src/lib.rs +++ b/runtime-modules/forum/src/lib.rs @@ -106,7 +106,6 @@ const ERROR_CATEGORY_CANNOT_BE_UNARCHIVED_WHEN_DELETED: &str = //#[cfg(any(feature = "std", test))] //use sr_primitives::{StorageOverlay, ChildrenStorageOverlay}; -use system; use system::{ensure_root, ensure_signed}; /// Represents a user in this forum. diff --git a/runtime-modules/hiring/src/lib.rs b/runtime-modules/hiring/src/lib.rs index 8230d28612..fc7b48a9fa 100755 --- a/runtime-modules/hiring/src/lib.rs +++ b/runtime-modules/hiring/src/lib.rs @@ -27,7 +27,6 @@ use mockall::*; use stake::{InitiateUnstakingError, Stake, StakeActionError, StakingError, Trait as StakeTrait}; use codec::Codec; -use system; use runtime_primitives::traits::Zero; use runtime_primitives::traits::{MaybeSerialize, Member, One, SimpleArithmetic}; @@ -52,7 +51,6 @@ mod mock; mod test; pub use hiring::*; -use stake; /// Main trait of hiring substrate module pub trait Trait: system::Trait + stake::Trait + Sized { diff --git a/runtime-modules/membership/src/members.rs b/runtime-modules/membership/src/members.rs index d23ace0f40..af1908361c 100644 --- a/runtime-modules/membership/src/members.rs +++ b/runtime-modules/membership/src/members.rs @@ -12,7 +12,6 @@ use srml_support::traits::{Currency, Get}; use srml_support::{decl_event, decl_module, decl_storage, dispatch, ensure, Parameter}; use system::{self, ensure_root, ensure_signed}; -use timestamp; pub use super::role_types::*; diff --git a/runtime-modules/proposals/discussion/src/lib.rs b/runtime-modules/proposals/discussion/src/lib.rs index 19ff49ba0d..36c02c1cad 100644 --- a/runtime-modules/proposals/discussion/src/lib.rs +++ b/runtime-modules/proposals/discussion/src/lib.rs @@ -71,13 +71,13 @@ decl_event!( MemberId = MemberId, ::PostId, { - /// Emits on thread creation. + /// Emits on thread creation. ThreadCreated(ThreadId, MemberId), - /// Emits on post creation. + /// Emits on post creation. PostCreated(PostId, MemberId), - /// Emits on post update. + /// Emits on post update. PostUpdated(PostId, MemberId), } ); diff --git a/runtime-modules/proposals/engine/src/lib.rs b/runtime-modules/proposals/engine/src/lib.rs index 733f83dd3e..934b6dd9bc 100644 --- a/runtime-modules/proposals/engine/src/lib.rs +++ b/runtime-modules/proposals/engine/src/lib.rs @@ -195,7 +195,7 @@ decl_event!( ::AccountId, ::StakeId, { - /// Emits on proposal creation. + /// Emits on proposal creation. /// Params: /// - Member id of a proposer. /// - Id of a newly created proposal after it was saved in storage. diff --git a/runtime-modules/recurring-reward/src/lib.rs b/runtime-modules/recurring-reward/src/lib.rs index 59ba5b4eee..df39fb0d09 100755 --- a/runtime-modules/recurring-reward/src/lib.rs +++ b/runtime-modules/recurring-reward/src/lib.rs @@ -14,7 +14,6 @@ use runtime_primitives::traits::{MaybeSerialize, Member, One, SimpleArithmetic, use srml_support::{decl_module, decl_storage, ensure, Parameter}; use minting::{self, BalanceOf}; -use system; mod mock; mod tests; diff --git a/runtime-modules/roles/src/traits.rs b/runtime-modules/roles/src/traits.rs index 86e2e45790..876a5d9e2c 100644 --- a/runtime-modules/roles/src/traits.rs +++ b/runtime-modules/roles/src/traits.rs @@ -1,5 +1,4 @@ use crate::actors; -use system; // Roles pub trait Roles { diff --git a/runtime-modules/stake/src/lib.rs b/runtime-modules/stake/src/lib.rs index 4345b2342e..572175ef3c 100755 --- a/runtime-modules/stake/src/lib.rs +++ b/runtime-modules/stake/src/lib.rs @@ -12,7 +12,6 @@ use srml_support::traits::{Currency, ExistenceRequirement, Get, Imbalance, Withd use srml_support::{decl_module, decl_storage, ensure, Parameter}; use rstd::collections::btree_map::BTreeMap; -use system; mod errors; pub use errors::*; diff --git a/runtime-modules/token-minting/src/lib.rs b/runtime-modules/token-minting/src/lib.rs index d49af593cc..1604762b02 100755 --- a/runtime-modules/token-minting/src/lib.rs +++ b/runtime-modules/token-minting/src/lib.rs @@ -20,8 +20,6 @@ mod tests; pub use mint::*; -use system; - pub trait Trait: system::Trait { /// The currency to mint. type Currency: Currency; diff --git a/runtime-modules/versioned-store-permissions/src/lib.rs b/runtime-modules/versioned-store-permissions/src/lib.rs index 643f4e072f..69ba3d50f2 100755 --- a/runtime-modules/versioned-store-permissions/src/lib.rs +++ b/runtime-modules/versioned-store-permissions/src/lib.rs @@ -6,7 +6,6 @@ use rstd::collections::btree_map::BTreeMap; use rstd::prelude::*; use runtime_primitives::traits::{MaybeSerialize, Member, SimpleArithmetic}; use srml_support::{decl_module, decl_storage, dispatch, ensure, Parameter}; -use system; // EntityId, ClassId -> should be configured on versioned_store::Trait pub use versioned_store::{ClassId, ClassPropertyValue, EntityId, Property, PropertyValue}; diff --git a/runtime-modules/versioned-store/src/lib.rs b/runtime-modules/versioned-store/src/lib.rs index 44ba76242c..310750080e 100755 --- a/runtime-modules/versioned-store/src/lib.rs +++ b/runtime-modules/versioned-store/src/lib.rs @@ -18,7 +18,6 @@ use codec::{Decode, Encode}; use rstd::collections::btree_set::BTreeSet; use rstd::prelude::*; use srml_support::{decl_event, decl_module, decl_storage, dispatch, ensure}; -use system; mod example; mod mock; diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 749f9b55a2..5a3bceb939 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -412,16 +412,11 @@ use governance::{council, election}; use membership::members; use storage::{data_directory, data_object_storage_registry, data_object_type_registry}; pub use versioned_store; -use versioned_store_permissions; pub use content_working_group as content_wg; mod migration; -use hiring; -use minting; -use recurringrewards; use roles::actors; use service_discovery::discovery; -use stake; /// Alias for ContentId, used in various places. pub type ContentId = primitives::H256; @@ -871,11 +866,11 @@ impl proposals_codex::Trait for Runtime { } construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = opaque::Block, - UncheckedExtrinsic = UncheckedExtrinsic - { + pub enum Runtime where + Block = Block, + NodeBlock = opaque::Block, + UncheckedExtrinsic = UncheckedExtrinsic + { // Substrate System: system::{Module, Call, Storage, Config, Event}, Babe: babe::{Module, Call, Storage, Config, Inherent(Timestamp)}, @@ -917,7 +912,7 @@ construct_runtime!( ProposalsDiscussion: proposals_discussion::{Module, Call, Storage, Event}, ProposalsCodex: proposals_codex::{Module, Call, Storage, Error, Config}, // --- - } + } ); /// The address format for describing accounts. diff --git a/runtime/src/migration.rs b/runtime/src/migration.rs index 004f8be682..c05acfd655 100644 --- a/runtime/src/migration.rs +++ b/runtime/src/migration.rs @@ -4,8 +4,6 @@ use crate::VERSION; use sr_primitives::{print, traits::Zero}; use srml_support::{decl_event, decl_module, decl_storage}; -use sudo; -use system; impl Module { fn runtime_upgraded() { From 79f9ef3ecb0d7ad88e22bb1f01eff5c1f6b1585a Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Tue, 28 Apr 2020 16:24:11 +0400 Subject: [PATCH 248/286] runtime: migration linter and fmt fixes --- runtime/src/migration.rs | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/runtime/src/migration.rs b/runtime/src/migration.rs index 8797f33915..b7ac479177 100644 --- a/runtime/src/migration.rs +++ b/runtime/src/migration.rs @@ -23,47 +23,43 @@ impl Module { // Runtime Upgrade Code for going from Rome to Constantinople // Create the Council mint. If it fails, we can't do anything about it here. - governance::council::Module::::create_new_council_mint(minting::BalanceOf::::zero()) - .err() - .map(|err| { - debug::warn!( - "Failed to create a mint for council during migration: {:?}", - err - ); - }); + if let Err(err) = governance::council::Module::::create_new_council_mint( + minting::BalanceOf::::zero(), + ) { + debug::warn!( + "Failed to create a mint for council during migration: {:?}", + err + ); + } // Reset working group mint capacity - content_working_group::Module::::set_mint_capacity( + if let Err(err) = content_working_group::Module::::set_mint_capacity( system::RawOrigin::Root.into(), minting::BalanceOf::::zero(), - ) - .err() - .map(|err| { + ) { debug::warn!( "Failed to reset mint for working group during migration: {:?}", err ); - }); + } // Set Storage Role reward to zero if let Some(parameters) = roles::actors::Parameters::::get(roles::actors::Role::StorageProvider) { - roles::actors::Module::::set_role_parameters( + if let Err(err) = roles::actors::Module::::set_role_parameters( system::RawOrigin::Root.into(), roles::actors::Role::StorageProvider, roles::actors::RoleParameters { reward: BalanceOf::::zero(), ..parameters }, - ) - .err() - .map(|err| { + ) { debug::warn!( "Failed to set zero reward for storage role during migration: {:?}", err ); - }); + } } proposals_codex::Module::::set_default_config_values(); From 2c7252f40ea3418e8b1cec135ca96b16d3332102 Mon Sep 17 00:00:00 2001 From: Gleb Urvanov Date: Tue, 28 Apr 2020 15:14:21 +0200 Subject: [PATCH 249/286] make batch balance transfer sequential --- .../src/tests/proposals/textProposalTest.ts | 6 ++---- .../workingGroupMintCapacityProposalTest.ts | 2 -- .../src/tests/rome/romeRuntimeUpgradeTest.ts | 4 +--- tests/network-tests/src/utils/apiWrapper.ts | 12 +++++------- 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/tests/network-tests/src/tests/proposals/textProposalTest.ts b/tests/network-tests/src/tests/proposals/textProposalTest.ts index f1c2f18f6c..8cfbfb72c0 100644 --- a/tests/network-tests/src/tests/proposals/textProposalTest.ts +++ b/tests/network-tests/src/tests/proposals/textProposalTest.ts @@ -9,12 +9,12 @@ import { v4 as uuid } from 'uuid'; import BN = require('bn.js'); import { Utils } from '../../utils/utils'; -describe.skip('Text proposal network tests', () => { +describe('Text proposal network tests', () => { initConfig(); const keyring = new Keyring({ type: 'sr25519' }); const nodeUrl: string = process.env.NODE_URL!; const sudoUri: string = process.env.SUDO_ACCOUNT_URI!; - const defaultTimeout: number = 120000; + const defaultTimeout: number = 180000; const m1KeyPairs: KeyringPair[] = new Array(); const m2KeyPairs: KeyringPair[] = new Array(); @@ -27,8 +27,6 @@ describe.skip('Text proposal network tests', () => { registerJoystreamTypes(); const provider = new WsProvider(nodeUrl); apiWrapper = await ApiWrapper.create(provider); - - await Utils.wait(apiWrapper.getBlockDuration().muln(2.5).toNumber()); }); membershipTest(m1KeyPairs); diff --git a/tests/network-tests/src/tests/proposals/workingGroupMintCapacityProposalTest.ts b/tests/network-tests/src/tests/proposals/workingGroupMintCapacityProposalTest.ts index c0644492ca..1551d9d387 100644 --- a/tests/network-tests/src/tests/proposals/workingGroupMintCapacityProposalTest.ts +++ b/tests/network-tests/src/tests/proposals/workingGroupMintCapacityProposalTest.ts @@ -63,8 +63,6 @@ describe('Mint capacity proposal network tests', () => { const proposalNumber = await proposalPromise; // Approving runtime update proposal - console.log('block number ' + (await apiWrapper.getBestBlock())); - console.log('approving new mint capacity of proposal ' + proposalNumber); const runtimePromise = apiWrapper.expectProposalFinalized(); await apiWrapper.batchApproveProposal(m2KeyPairs, proposalNumber); await runtimePromise; diff --git a/tests/network-tests/src/tests/rome/romeRuntimeUpgradeTest.ts b/tests/network-tests/src/tests/rome/romeRuntimeUpgradeTest.ts index 2272d4c588..f6e2e3181e 100644 --- a/tests/network-tests/src/tests/rome/romeRuntimeUpgradeTest.ts +++ b/tests/network-tests/src/tests/rome/romeRuntimeUpgradeTest.ts @@ -15,7 +15,7 @@ describe('Runtime upgrade integration tests', () => { const nodeUrl: string = process.env.NODE_URL!; const sudoUri: string = process.env.SUDO_ACCOUNT_URI!; const proposalStake: BN = new BN(+process.env.RUNTIME_UPGRADE_PROPOSAL_STAKE!); - const defaultTimeout: number = 120000; + const defaultTimeout: number = 180000; const m1KeyPairs: KeyringPair[] = new Array(); const m2KeyPairs: KeyringPair[] = new Array(); @@ -67,8 +67,6 @@ describe('Runtime upgrade integration tests', () => { const runtimePromise = apiWrapper.expectRomeRuntimeUpgraded(); await apiWrapper.batchApproveRomeProposal(m2KeyPairs, proposalNumber); await runtimePromise; - - await Utils.wait(apiWrapper.getBlockDuration().muln(2.5).toNumber()); }).timeout(defaultTimeout); after(() => { diff --git a/tests/network-tests/src/utils/apiWrapper.ts b/tests/network-tests/src/utils/apiWrapper.ts index 3f3defd320..c296d85b3f 100644 --- a/tests/network-tests/src/utils/apiWrapper.ts +++ b/tests/network-tests/src/utils/apiWrapper.ts @@ -61,12 +61,11 @@ export class ApiWrapper { return this.getPaidMembershipTerms(paidTermsId).then(terms => terms.unwrap().fee.toBn()); } - public async transferBalanceToAccounts(from: KeyringPair, to: KeyringPair[], amount: BN): Promise { - return Promise.all( - to.map(async keyPair => { - await this.transferBalance(from, keyPair.address, amount); - }) - ); + public async transferBalanceToAccounts(from: KeyringPair, to: KeyringPair[], amount: BN): Promise { + for (let i = 0; i < to.length; i++) { + await this.transferBalance(from, to[i].address, amount); + } + return; } private getBaseTxFee(): BN { @@ -316,7 +315,6 @@ export class ApiWrapper { await this.api.query.system.events>(events => { events.forEach(record => { if (record.event.method && record.event.method.toString() === 'ProposalCreated') { - console.log('im here'); resolve(new BN(record.event.data[1].toString())); } }); From cd1bf82eff1dc868655b666729910bed8c19b51b Mon Sep 17 00:00:00 2001 From: Gleb Urvanov Date: Tue, 28 Apr 2020 17:46:36 +0200 Subject: [PATCH 250/286] proposal tests skipped --- tests/network-tests/src/tests/proposals/textProposalTest.ts | 3 +-- .../tests/proposals/workingGroupMintCapacityProposalTest.ts | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/network-tests/src/tests/proposals/textProposalTest.ts b/tests/network-tests/src/tests/proposals/textProposalTest.ts index 8cfbfb72c0..7fb8eb8755 100644 --- a/tests/network-tests/src/tests/proposals/textProposalTest.ts +++ b/tests/network-tests/src/tests/proposals/textProposalTest.ts @@ -7,9 +7,8 @@ import { registerJoystreamTypes } from '@joystream/types'; import { ApiWrapper } from '../../utils/apiWrapper'; import { v4 as uuid } from 'uuid'; import BN = require('bn.js'); -import { Utils } from '../../utils/utils'; -describe('Text proposal network tests', () => { +describe.skip('Text proposal network tests', () => { initConfig(); const keyring = new Keyring({ type: 'sr25519' }); const nodeUrl: string = process.env.NODE_URL!; diff --git a/tests/network-tests/src/tests/proposals/workingGroupMintCapacityProposalTest.ts b/tests/network-tests/src/tests/proposals/workingGroupMintCapacityProposalTest.ts index 1551d9d387..0c97143cfc 100644 --- a/tests/network-tests/src/tests/proposals/workingGroupMintCapacityProposalTest.ts +++ b/tests/network-tests/src/tests/proposals/workingGroupMintCapacityProposalTest.ts @@ -8,7 +8,7 @@ import { ApiWrapper } from '../../utils/apiWrapper'; import { v4 as uuid } from 'uuid'; import BN = require('bn.js'); -describe('Mint capacity proposal network tests', () => { +describe.skip('Mint capacity proposal network tests', () => { initConfig(); const keyring = new Keyring({ type: 'sr25519' }); const nodeUrl: string = process.env.NODE_URL!; From 3f25c78f81443979b8fbb39ace9fe1767d00b359 Mon Sep 17 00:00:00 2001 From: Gleb Urvanov Date: Tue, 28 Apr 2020 18:23:03 +0200 Subject: [PATCH 251/286] rome constantinople test finished, new proposals moved to separate branch --- tests/network-tests/package.json | 4 +- .../electingCouncilTest.ts | 8 +- .../membershipCreationTest.ts | 4 +- .../tests/proposals/spendingProposalTest.ts | 75 ----------------- .../src/tests/proposals/textProposalTest.ts | 68 ---------------- .../src/tests/proposals/updateRuntimeTest.ts | 81 ------------------- .../workingGroupMintCapacityProposalTest.ts | 74 ----------------- tests/network-tests/src/utils/apiWrapper.ts | 4 +- 8 files changed, 10 insertions(+), 308 deletions(-) rename tests/network-tests/src/tests/{ => constantinople}/electingCouncilTest.ts (96%) rename tests/network-tests/src/tests/{ => constantinople}/membershipCreationTest.ts (97%) delete mode 100644 tests/network-tests/src/tests/proposals/spendingProposalTest.ts delete mode 100644 tests/network-tests/src/tests/proposals/textProposalTest.ts delete mode 100644 tests/network-tests/src/tests/proposals/updateRuntimeTest.ts delete mode 100644 tests/network-tests/src/tests/proposals/workingGroupMintCapacityProposalTest.ts diff --git a/tests/network-tests/package.json b/tests/network-tests/package.json index f7f9a3a9d4..76e87a2530 100644 --- a/tests/network-tests/package.json +++ b/tests/network-tests/package.json @@ -4,8 +4,8 @@ "license": "GPL-3.0-only", "scripts": { "build": "tsc --build tsconfig.json", - "test": "mocha -r ts-node/register src/tests/proposals/*", - "test-migration": "mocha -r ts-node/register src/tests/rome/* && mocha -r ts-node/register src/tests/proposals/*", + "test": "mocha -r ts-node/register src/tests/constantinople/*", + "test-migration": "mocha -r ts-node/register src/tests/rome/* && mocha -r ts-node/register src/tests/constantinople/*", "lint": "tslint --project tsconfig.json", "prettier": "prettier --write ./src" }, diff --git a/tests/network-tests/src/tests/electingCouncilTest.ts b/tests/network-tests/src/tests/constantinople/electingCouncilTest.ts similarity index 96% rename from tests/network-tests/src/tests/electingCouncilTest.ts rename to tests/network-tests/src/tests/constantinople/electingCouncilTest.ts index 25338d8fad..7f1c4e3d64 100644 --- a/tests/network-tests/src/tests/electingCouncilTest.ts +++ b/tests/network-tests/src/tests/constantinople/electingCouncilTest.ts @@ -1,13 +1,13 @@ import { membershipTest } from './membershipCreationTest'; import { KeyringPair } from '@polkadot/keyring/types'; -import { ApiWrapper } from '../utils/apiWrapper'; +import { ApiWrapper } from '../../utils/apiWrapper'; import { WsProvider, Keyring } from '@polkadot/api'; -import { initConfig } from '../utils/config'; +import { initConfig } from '../../utils/config'; import BN = require('bn.js'); import { registerJoystreamTypes, Seat } from '@joystream/types'; import { assert } from 'chai'; import { v4 as uuid } from 'uuid'; -import { Utils } from '../utils/utils'; +import { Utils } from '../../utils/utils'; export function councilTest(m1KeyPairs: KeyringPair[], m2KeyPairs: KeyringPair[]) { initConfig(); @@ -118,7 +118,7 @@ export function councilTest(m1KeyPairs: KeyringPair[], m2KeyPairs: KeyringPair[] }); } -describe.skip('Council integration tests', () => { +describe('Council integration tests', () => { const m1KeyPairs: KeyringPair[] = new Array(); const m2KeyPairs: KeyringPair[] = new Array(); membershipTest(m1KeyPairs); diff --git a/tests/network-tests/src/tests/membershipCreationTest.ts b/tests/network-tests/src/tests/constantinople/membershipCreationTest.ts similarity index 97% rename from tests/network-tests/src/tests/membershipCreationTest.ts rename to tests/network-tests/src/tests/constantinople/membershipCreationTest.ts index 19eb4f056e..ca5ba1cda2 100644 --- a/tests/network-tests/src/tests/membershipCreationTest.ts +++ b/tests/network-tests/src/tests/constantinople/membershipCreationTest.ts @@ -4,8 +4,8 @@ import { Keyring } from '@polkadot/keyring'; import { assert } from 'chai'; import { KeyringPair } from '@polkadot/keyring/types'; import BN = require('bn.js'); -import { ApiWrapper } from '../utils/apiWrapper'; -import { initConfig } from '../utils/config'; +import { ApiWrapper } from '../../utils/apiWrapper'; +import { initConfig } from '../../utils/config'; import { v4 as uuid } from 'uuid'; export function membershipTest(nKeyPairs: KeyringPair[]) { diff --git a/tests/network-tests/src/tests/proposals/spendingProposalTest.ts b/tests/network-tests/src/tests/proposals/spendingProposalTest.ts deleted file mode 100644 index 2e96d926af..0000000000 --- a/tests/network-tests/src/tests/proposals/spendingProposalTest.ts +++ /dev/null @@ -1,75 +0,0 @@ -import { initConfig } from '../../utils/config'; -import { Keyring, WsProvider } from '@polkadot/api'; -import { KeyringPair } from '@polkadot/keyring/types'; -import { membershipTest } from '../membershipCreationTest'; -import { councilTest } from '../electingCouncilTest'; -import { registerJoystreamTypes } from '@joystream/types'; -import { ApiWrapper } from '../../utils/apiWrapper'; -import { v4 as uuid } from 'uuid'; -import BN = require('bn.js'); - -describe.skip('Spending proposal network tests', () => { - initConfig(); - const keyring = new Keyring({ type: 'sr25519' }); - const nodeUrl: string = process.env.NODE_URL!; - const sudoUri: string = process.env.SUDO_ACCOUNT_URI!; - const spendingBalance: BN = new BN(+process.env.SPENDING_BALANCE!); - const defaultTimeout: number = 120000; - - const m1KeyPairs: KeyringPair[] = new Array(); - const m2KeyPairs: KeyringPair[] = new Array(); - - let apiWrapper: ApiWrapper; - let sudo: KeyringPair; - - before(async function () { - this.timeout(defaultTimeout); - registerJoystreamTypes(); - const provider = new WsProvider(nodeUrl); - apiWrapper = await ApiWrapper.create(provider); - }); - - membershipTest(m1KeyPairs); - membershipTest(m2KeyPairs); - councilTest(m1KeyPairs, m2KeyPairs); - - it('Spending proposal test', async () => { - // Setup - sudo = keyring.addFromUri(sudoUri); - const description: string = 'spending proposal which is used for API network testing with some mock data'; - const runtimeVoteFee: BN = apiWrapper.estimateVoteForProposalFee(); - - // Topping the balances - const proposalStake: BN = await apiWrapper.getRequiredProposalStake(25, 10000); - const runtimeProposalFee: BN = apiWrapper.estimateProposeSpendingFee( - description, - description, - proposalStake, - spendingBalance, - sudo.address - ); - await apiWrapper.transferBalance(sudo, m1KeyPairs[0].address, runtimeProposalFee.add(proposalStake)); - await apiWrapper.transferBalanceToAccounts(sudo, m2KeyPairs, runtimeVoteFee); - - // Proposal creation - const proposalPromise = apiWrapper.expectProposalCreated(); - await apiWrapper.proposeSpending( - m1KeyPairs[0], - 'testing spending' + uuid().substring(0, 8), - 'spending to test proposal functionality' + uuid().substring(0, 8), - proposalStake, - spendingBalance, - sudo.address - ); - const proposalNumber = await proposalPromise; - - // Approving runtime update proposal - const runtimePromise = apiWrapper.expectProposalFinalized(); - await apiWrapper.batchApproveProposal(m2KeyPairs, proposalNumber); - await runtimePromise; - }).timeout(defaultTimeout); - - after(() => { - apiWrapper.close(); - }); -}); diff --git a/tests/network-tests/src/tests/proposals/textProposalTest.ts b/tests/network-tests/src/tests/proposals/textProposalTest.ts deleted file mode 100644 index 7fb8eb8755..0000000000 --- a/tests/network-tests/src/tests/proposals/textProposalTest.ts +++ /dev/null @@ -1,68 +0,0 @@ -import { initConfig } from '../../utils/config'; -import { Keyring, WsProvider } from '@polkadot/api'; -import { KeyringPair } from '@polkadot/keyring/types'; -import { membershipTest } from '../membershipCreationTest'; -import { councilTest } from '../electingCouncilTest'; -import { registerJoystreamTypes } from '@joystream/types'; -import { ApiWrapper } from '../../utils/apiWrapper'; -import { v4 as uuid } from 'uuid'; -import BN = require('bn.js'); - -describe.skip('Text proposal network tests', () => { - initConfig(); - const keyring = new Keyring({ type: 'sr25519' }); - const nodeUrl: string = process.env.NODE_URL!; - const sudoUri: string = process.env.SUDO_ACCOUNT_URI!; - const defaultTimeout: number = 180000; - - const m1KeyPairs: KeyringPair[] = new Array(); - const m2KeyPairs: KeyringPair[] = new Array(); - - let apiWrapper: ApiWrapper; - let sudo: KeyringPair; - - before(async function () { - this.timeout(defaultTimeout); - registerJoystreamTypes(); - const provider = new WsProvider(nodeUrl); - apiWrapper = await ApiWrapper.create(provider); - }); - - membershipTest(m1KeyPairs); - membershipTest(m2KeyPairs); - councilTest(m1KeyPairs, m2KeyPairs); - - it('Text proposal test', async () => { - // Setup - sudo = keyring.addFromUri(sudoUri); - const proposalTitle: string = 'Testing proposal ' + uuid().substring(0, 8); - const description: string = 'Testing text proposal ' + uuid().substring(0, 8); - const proposalText: string = 'Text of the testing proposal ' + uuid().substring(0, 8); - const runtimeVoteFee: BN = apiWrapper.estimateVoteForProposalFee(); - await apiWrapper.transferBalanceToAccounts(sudo, m2KeyPairs, runtimeVoteFee); - - // Proposal stake calculation - const proposalStake: BN = await apiWrapper.getRequiredProposalStake(25, 10000); - const runtimeProposalFee: BN = apiWrapper.estimateProposeTextFee( - proposalStake, - description, - description, - proposalText - ); - await apiWrapper.transferBalance(sudo, m1KeyPairs[0].address, runtimeProposalFee.add(proposalStake)); - - // Proposal creation - const proposalPromise = apiWrapper.expectProposalCreated(); - await apiWrapper.proposeText(m1KeyPairs[0], proposalStake, proposalTitle, description, proposalText); - const proposalNumber = await proposalPromise; - - // Approving runtime update proposal - const textProposalPromise = apiWrapper.expectProposalFinalized(); - await apiWrapper.batchApproveProposal(m2KeyPairs, proposalNumber); - await textProposalPromise; - }).timeout(defaultTimeout); - - after(() => { - apiWrapper.close(); - }); -}); diff --git a/tests/network-tests/src/tests/proposals/updateRuntimeTest.ts b/tests/network-tests/src/tests/proposals/updateRuntimeTest.ts deleted file mode 100644 index 31aa70d05e..0000000000 --- a/tests/network-tests/src/tests/proposals/updateRuntimeTest.ts +++ /dev/null @@ -1,81 +0,0 @@ -import { initConfig } from '../../utils/config'; -import { Keyring, WsProvider } from '@polkadot/api'; -import { Bytes } from '@polkadot/types'; -import { KeyringPair } from '@polkadot/keyring/types'; -import { membershipTest } from '../membershipCreationTest'; -import { councilTest } from '../electingCouncilTest'; -import { registerJoystreamTypes } from '@joystream/types'; -import { ApiWrapper } from '../../utils/apiWrapper'; -import { v4 as uuid } from 'uuid'; -import BN = require('bn.js'); - -describe.skip('Runtime upgrade networt tests', () => { - initConfig(); - const keyring = new Keyring({ type: 'sr25519' }); - const nodeUrl: string = process.env.NODE_URL!; - const sudoUri: string = process.env.SUDO_ACCOUNT_URI!; - const defaultTimeout: number = 120000; - - const m1KeyPairs: KeyringPair[] = new Array(); - const m2KeyPairs: KeyringPair[] = new Array(); - - let apiWrapper: ApiWrapper; - let sudo: KeyringPair; - - before(async function () { - this.timeout(defaultTimeout); - registerJoystreamTypes(); - const provider = new WsProvider(nodeUrl); - apiWrapper = await ApiWrapper.create(provider); - }); - - membershipTest(m1KeyPairs); - membershipTest(m2KeyPairs); - councilTest(m1KeyPairs, m2KeyPairs); - - it('Upgrading the runtime test', async () => { - // Setup - sudo = keyring.addFromUri(sudoUri); - const runtime: Bytes = await apiWrapper.getRuntime(); - const description: string = 'runtime upgrade proposal which is used for API network testing'; - const runtimeVoteFee: BN = apiWrapper.estimateVoteForProposalFee(); - - // Topping the balances - const proposalStake: BN = await apiWrapper.getRequiredProposalStake(1, 100); - const runtimeProposalFee: BN = apiWrapper.estimateProposeRuntimeUpgradeFee( - proposalStake, - description, - description, - runtime - ); - await apiWrapper.transferBalance(sudo, m1KeyPairs[0].address, runtimeProposalFee.add(proposalStake)); - await apiWrapper.transferBalanceToAccounts(sudo, m2KeyPairs, runtimeVoteFee); - - // Proposal creation - console.log('proposing new runtime'); - const proposalPromise = apiWrapper.expectProposalCreated(); - console.log('sending extr'); - await apiWrapper.proposeRuntime( - m1KeyPairs[0], - proposalStake, - 'testing runtime' + uuid().substring(0, 8), - 'runtime to test proposal functionality' + uuid().substring(0, 8), - runtime - ); - const proposalNumber = await proposalPromise; - console.log('proposed'); - - // Approving runtime update proposal - console.log('block number ' + apiWrapper.getBestBlock()); - console.log('approving new runtime'); - const runtimePromise = apiWrapper.expectProposalFinalized(); - await apiWrapper.batchApproveProposal(m2KeyPairs, proposalNumber); - await runtimePromise; - }).timeout(defaultTimeout); - - membershipTest(new Array()); - - after(() => { - apiWrapper.close(); - }); -}); diff --git a/tests/network-tests/src/tests/proposals/workingGroupMintCapacityProposalTest.ts b/tests/network-tests/src/tests/proposals/workingGroupMintCapacityProposalTest.ts deleted file mode 100644 index 0c97143cfc..0000000000 --- a/tests/network-tests/src/tests/proposals/workingGroupMintCapacityProposalTest.ts +++ /dev/null @@ -1,74 +0,0 @@ -import { initConfig } from '../../utils/config'; -import { Keyring, WsProvider } from '@polkadot/api'; -import { KeyringPair } from '@polkadot/keyring/types'; -import { membershipTest } from '../membershipCreationTest'; -import { councilTest } from '../electingCouncilTest'; -import { registerJoystreamTypes } from '@joystream/types'; -import { ApiWrapper } from '../../utils/apiWrapper'; -import { v4 as uuid } from 'uuid'; -import BN = require('bn.js'); - -describe.skip('Mint capacity proposal network tests', () => { - initConfig(); - const keyring = new Keyring({ type: 'sr25519' }); - const nodeUrl: string = process.env.NODE_URL!; - const sudoUri: string = process.env.SUDO_ACCOUNT_URI!; - const mintingCapacity: BN = new BN(+process.env.MINTING_CAPACITY!); - const defaultTimeout: number = 120000; - - const m1KeyPairs: KeyringPair[] = new Array(); - const m2KeyPairs: KeyringPair[] = new Array(); - - let apiWrapper: ApiWrapper; - let sudo: KeyringPair; - - before(async function () { - this.timeout(defaultTimeout); - registerJoystreamTypes(); - const provider = new WsProvider(nodeUrl); - apiWrapper = await ApiWrapper.create(provider); - }); - - membershipTest(m1KeyPairs); - membershipTest(m2KeyPairs); - councilTest(m1KeyPairs, m2KeyPairs); - - // TODO implement the test - it('Mint capacity proposal test', async () => { - // Setup - sudo = keyring.addFromUri(sudoUri); - const description: string = 'spending proposal which is used for API network testing'; - const runtimeVoteFee: BN = apiWrapper.estimateVoteForProposalFee(); - - // Topping the balances - const proposalStake: BN = await apiWrapper.getRequiredProposalStake(25, 10000); - const runtimeProposalFee: BN = apiWrapper.estimateProposeWorkingGroupMintCapacityFee( - description, - description, - proposalStake, - mintingCapacity - ); - await apiWrapper.transferBalance(sudo, m1KeyPairs[0].address, runtimeProposalFee.add(proposalStake)); - await apiWrapper.transferBalanceToAccounts(sudo, m2KeyPairs, runtimeVoteFee); - - // Proposal creation - const proposalPromise = apiWrapper.expectProposalCreated(); - await apiWrapper.proposeWorkingGroupMintCapacity( - m1KeyPairs[0], - 'testing mint capacity' + uuid().substring(0, 8), - 'mint capacity to test proposal functionality' + uuid().substring(0, 8), - proposalStake, - mintingCapacity - ); - const proposalNumber = await proposalPromise; - - // Approving runtime update proposal - const runtimePromise = apiWrapper.expectProposalFinalized(); - await apiWrapper.batchApproveProposal(m2KeyPairs, proposalNumber); - await runtimePromise; - }).timeout(defaultTimeout); - - after(() => { - apiWrapper.close(); - }); -}); diff --git a/tests/network-tests/src/utils/apiWrapper.ts b/tests/network-tests/src/utils/apiWrapper.ts index c296d85b3f..2ce8fd680b 100644 --- a/tests/network-tests/src/utils/apiWrapper.ts +++ b/tests/network-tests/src/utils/apiWrapper.ts @@ -62,8 +62,8 @@ export class ApiWrapper { } public async transferBalanceToAccounts(from: KeyringPair, to: KeyringPair[], amount: BN): Promise { - for (let i = 0; i < to.length; i++) { - await this.transferBalance(from, to[i].address, amount); + for (const keyPair of to) { + await this.transferBalance(from, keyPair.address, amount); } return; } From c4a253fcb5b23d6288be302f159b207877ac8265 Mon Sep 17 00:00:00 2001 From: Gleb Urvanov Date: Tue, 28 Apr 2020 18:35:17 +0200 Subject: [PATCH 252/286] path to runtime parameterized --- tests/network-tests/.env | 4 +++- tests/network-tests/src/tests/rome/romeRuntimeUpgradeTest.ts | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/network-tests/.env b/tests/network-tests/.env index c3c3a62e65..00ee4bf8c5 100644 --- a/tests/network-tests/.env +++ b/tests/network-tests/.env @@ -17,4 +17,6 @@ SPENDING_BALANCE = 1000 # Minting capacity for content working group minting capacity test. MINTING_CAPACITY = 100020 # Stake amount for Rome runtime upgrade proposal -RUNTIME_UPGRADE_PROPOSAL_STAKE = 100000 \ No newline at end of file +RUNTIME_UPGRADE_PROPOSAL_STAKE = 100000 +# Constantinople runtime path +RUNTIME_WASM_PATH = ../../target/release/wbuild/joystream-node-runtime/joystream_node_runtime.compact.wasm \ No newline at end of file diff --git a/tests/network-tests/src/tests/rome/romeRuntimeUpgradeTest.ts b/tests/network-tests/src/tests/rome/romeRuntimeUpgradeTest.ts index f6e2e3181e..0c1c0f265a 100644 --- a/tests/network-tests/src/tests/rome/romeRuntimeUpgradeTest.ts +++ b/tests/network-tests/src/tests/rome/romeRuntimeUpgradeTest.ts @@ -15,6 +15,7 @@ describe('Runtime upgrade integration tests', () => { const nodeUrl: string = process.env.NODE_URL!; const sudoUri: string = process.env.SUDO_ACCOUNT_URI!; const proposalStake: BN = new BN(+process.env.RUNTIME_UPGRADE_PROPOSAL_STAKE!); + const runtimePath: string = process.env.RUNTIME_WASM_PATH!; const defaultTimeout: number = 180000; const m1KeyPairs: KeyringPair[] = new Array(); @@ -38,7 +39,7 @@ describe('Runtime upgrade integration tests', () => { it('Upgrading the runtime test', async () => { // Setup sudo = keyring.addFromUri(sudoUri); - const runtime: string = Utils.readRuntimeFromFile('joystream_node_runtime.wasm'); + const runtime: string = Utils.readRuntimeFromFile(runtimePath); const description: string = 'runtime upgrade proposal which is used for API integration testing'; const runtimeProposalFee: BN = apiWrapper.estimateRomeProposeRuntimeUpgradeFee( proposalStake, From 46f46b1f7a18f983de71e9d3e2ca6cc563fc170e Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Wed, 29 Apr 2020 15:12:44 +0400 Subject: [PATCH 253/286] git-hooks: npm husky --- devops/git-hooks/pre-commit | 5 +++++ devops/git-hooks/pre-push | 10 ++++++++++ package.json | 11 ++++++++++- 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100755 devops/git-hooks/pre-commit create mode 100755 devops/git-hooks/pre-push diff --git a/devops/git-hooks/pre-commit b/devops/git-hooks/pre-commit new file mode 100755 index 0000000000..b8bc924550 --- /dev/null +++ b/devops/git-hooks/pre-commit @@ -0,0 +1,5 @@ +#!/bin/sh +set -e + +echo 'cargo fmt --all -- --check' +cargo fmt --all -- --check \ No newline at end of file diff --git a/devops/git-hooks/pre-push b/devops/git-hooks/pre-push new file mode 100755 index 0000000000..b9ffbcb184 --- /dev/null +++ b/devops/git-hooks/pre-push @@ -0,0 +1,10 @@ +#!/bin/sh +set -e + +export BUILD_DUMMY_WASM_BINARY=1 + +echo '+cargo test --all' +cargo test --all + +echo '+cargo clippy --all -- -D warnings' +cargo clippy --all -- -D warnings \ No newline at end of file diff --git a/package.json b/package.json index cbe0e84994..236fe2699c 100644 --- a/package.json +++ b/package.json @@ -7,5 +7,14 @@ }, "workspaces": [ "tests/network-tests" - ] + ], + "devDependencies": { + "husky": "^4.2.5" + }, + "husky": { + "hooks": { + "pre-commit": "devops/git-hooks/pre-commit", + "pre-push": "devops/git-hooks/pre-push" + } + } } From e2a950a505041bbdc58e52a80e982e7c3af73808 Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Wed, 29 Apr 2020 15:43:35 +0400 Subject: [PATCH 254/286] tweak setup.sh, no need to use && when we have set -e --- setup.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/setup.sh b/setup.sh index 32157661a0..9260f9f155 100755 --- a/setup.sh +++ b/setup.sh @@ -7,8 +7,9 @@ set -e # - rustup - rust insaller # - rust compiler and toolchains # - skips installing substrate and subkey -curl https://getsubstrate.io -sSf | bash -s -- --fast \ - && rustup component add rustfmt +curl https://getsubstrate.io -sSf | bash -s -- --fast + +rustup component add rustfmt clippy # TODO: Install additional tools... -# - b2sum \ No newline at end of file +# - b2sum From 1df93be5c9010c394ed98f5abb007b8964a89d7d Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Mon, 4 May 2020 12:52:30 +0300 Subject: [PATCH 255/286] Update proposals general parameters --- runtime/src/lib.rs | 4 ++-- runtime/src/test/proposals_integration.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 5a3bceb939..befc3299d1 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -808,8 +808,8 @@ impl discovery::Trait for Runtime { } parameter_types! { - pub const ProposalCancellationFee: u64 = 5; - pub const ProposalRejectionFee: u64 = 3; + pub const ProposalCancellationFee: u64 = 10000; + pub const ProposalRejectionFee: u64 = 5000; pub const ProposalTitleMaxLength: u32 = 40; pub const ProposalDescriptionMaxLength: u32 = 3000; pub const ProposalMaxActiveProposalLimit: u32 = 5; diff --git a/runtime/src/test/proposals_integration.rs b/runtime/src/test/proposals_integration.rs index 88f1dda18d..68b9478b87 100644 --- a/runtime/src/test/proposals_integration.rs +++ b/runtime/src/test/proposals_integration.rs @@ -269,7 +269,7 @@ fn proposal_cancellation_with_slashes_with_balance_checks_succeeds() { setup_members(2); let member_id = 0; // newly created member_id - let stake_amount = 200u128; + let stake_amount = 20000u128; let parameters = ProposalParameters { voting_period: 3, approval_quorum_percentage: 50, @@ -285,7 +285,7 @@ fn proposal_cancellation_with_slashes_with_balance_checks_succeeds() { .with_stake(stake_amount) .with_proposer(member_id); - let account_balance = 500; + let account_balance = 500000; let _imbalance = ::Currency::deposit_creating(&account_id, account_balance); From 62e254d64c4694dfe1db2ec938f3befd6fc1ff59 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Mon, 4 May 2020 13:27:29 +0300 Subject: [PATCH 256/286] Update stake parameters for all codex proposals --- .../codex/src/proposal_types/parameters.rs | 34 +++++++++---------- .../proposals/codex/src/tests/mod.rs | 26 +++++++------- runtime/src/test/proposals_integration.rs | 16 ++++----- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/runtime-modules/proposals/codex/src/proposal_types/parameters.rs b/runtime-modules/proposals/codex/src/proposal_types/parameters.rs index 72b07169c7..754d5dfe07 100644 --- a/runtime-modules/proposals/codex/src/proposal_types/parameters.rs +++ b/runtime-modules/proposals/codex/src/proposal_types/parameters.rs @@ -1,4 +1,4 @@ -use crate::{get_required_stake_by_fraction, BalanceOf, Module, ProposalParameters}; +use crate::{BalanceOf, Module, ProposalParameters}; // Proposal parameters for the 'Set validator count' proposal pub(crate) fn set_validator_count_proposal( @@ -10,7 +10,7 @@ pub(crate) fn set_validator_count_proposal( approval_threshold_percentage: 80, slashing_quorum_percentage: 60, slashing_threshold_percentage: 80, - required_stake: Some(get_required_stake_by_fraction::(25, 10000)), + required_stake: Some(>::from(100_000_u32)), } } @@ -24,7 +24,7 @@ pub(crate) fn runtime_upgrade_proposal( approval_threshold_percentage: 100, slashing_quorum_percentage: 60, slashing_threshold_percentage: 80, - required_stake: Some(get_required_stake_by_fraction::(1, 100)), + required_stake: Some(>::from(1_000_000_u32)), } } @@ -33,11 +33,11 @@ pub(crate) fn text_proposal() -> ProposalParameters>::text_proposal_voting_period(), grace_period: >::text_proposal_grace_period(), - approval_quorum_percentage: 66, + approval_quorum_percentage: 60, approval_threshold_percentage: 80, slashing_quorum_percentage: 60, slashing_threshold_percentage: 80, - required_stake: Some(get_required_stake_by_fraction::(25, 10000)), + required_stake: Some(>::from(25000u32)), } } @@ -51,7 +51,7 @@ pub(crate) fn set_election_parameters_proposal( approval_threshold_percentage: 80, slashing_quorum_percentage: 60, slashing_threshold_percentage: 80, - required_stake: Some(get_required_stake_by_fraction::(75, 10000)), + required_stake: Some(>::from(200_000_u32)), } } @@ -62,11 +62,11 @@ pub(crate) fn set_content_working_group_mint_capacity_proposal( voting_period: >::set_content_working_group_mint_capacity_proposal_voting_period( ), grace_period: >::set_content_working_group_mint_capacity_proposal_grace_period(), - approval_quorum_percentage: 50, + approval_quorum_percentage: 60, approval_threshold_percentage: 75, slashing_quorum_percentage: 60, slashing_threshold_percentage: 80, - required_stake: Some(get_required_stake_by_fraction::(25, 10000)), + required_stake: Some(>::from(50000u32)), } } @@ -76,11 +76,11 @@ pub(crate) fn spending_proposal( ProposalParameters { voting_period: >::spending_proposal_voting_period(), grace_period: >::spending_proposal_grace_period(), - approval_quorum_percentage: 66, + approval_quorum_percentage: 60, approval_threshold_percentage: 80, slashing_quorum_percentage: 60, slashing_threshold_percentage: 80, - required_stake: Some(get_required_stake_by_fraction::(25, 10000)), + required_stake: Some(>::from(25000u32)), } } @@ -90,11 +90,11 @@ pub(crate) fn set_lead_proposal( ProposalParameters { voting_period: >::set_lead_proposal_voting_period(), grace_period: >::set_lead_proposal_grace_period(), - approval_quorum_percentage: 66, - approval_threshold_percentage: 80, + approval_quorum_percentage: 60, + approval_threshold_percentage: 75, slashing_quorum_percentage: 60, slashing_threshold_percentage: 80, - required_stake: Some(get_required_stake_by_fraction::(25, 10000)), + required_stake: Some(>::from(50000u32)), } } @@ -108,7 +108,7 @@ pub(crate) fn evict_storage_provider_proposal( approval_threshold_percentage: 75, slashing_quorum_percentage: 60, slashing_threshold_percentage: 80, - required_stake: Some(get_required_stake_by_fraction::(1, 1000)), + required_stake: Some(>::from(25000u32)), } } @@ -118,17 +118,17 @@ pub(crate) fn set_storage_role_parameters_proposal( ProposalParameters { voting_period: >::set_storage_role_parameters_proposal_voting_period(), grace_period: >::set_storage_role_parameters_proposal_grace_period(), - approval_quorum_percentage: 75, + approval_quorum_percentage: 66, approval_threshold_percentage: 80, slashing_quorum_percentage: 60, slashing_threshold_percentage: 80, - required_stake: Some(get_required_stake_by_fraction::(25, 10000)), + required_stake: Some(>::from(100_000_u32)), } } #[cfg(test)] mod test { - use crate::proposal_types::parameters::get_required_stake_by_fraction; + use crate::get_required_stake_by_fraction; use crate::tests::{increase_total_balance_issuance, initial_test_ext, Test}; pub use sr_primitives::Perbill; diff --git a/runtime-modules/proposals/codex/src/tests/mod.rs b/runtime-modules/proposals/codex/src/tests/mod.rs index 7825a17e07..1b99702ded 100644 --- a/runtime-modules/proposals/codex/src/tests/mod.rs +++ b/runtime-modules/proposals/codex/src/tests/mod.rs @@ -134,7 +134,7 @@ fn create_text_proposal_common_checks_succeed() { 1, b"title".to_vec(), b"body".to_vec(), - Some(>::from(1250u32)), + Some(>::from(25000u32)), b"text".to_vec(), ) }, @@ -180,7 +180,7 @@ fn create_text_proposal_codex_call_fails_with_incorrect_text_size() { #[test] fn create_runtime_upgrade_common_checks_succeed() { initial_test_ext().execute_with(|| { - increase_total_balance_issuance(500000); + increase_total_balance_issuance_using_account_id(1, 5000000); let proposal_fixture = ProposalTestFixture { insufficient_rights_call: || { @@ -219,7 +219,7 @@ fn create_runtime_upgrade_common_checks_succeed() { 1, b"title".to_vec(), b"body".to_vec(), - Some(>::from(5000u32)), + Some(>::from(1_000_000_u32)), b"wasm".to_vec(), ) }, @@ -265,7 +265,7 @@ fn create_upgrade_runtime_proposal_codex_call_fails_with_incorrect_wasm_size() { #[test] fn create_set_election_parameters_proposal_common_checks_succeed() { initial_test_ext().execute_with(|| { - increase_total_balance_issuance(500000); + increase_total_balance_issuance_using_account_id(1, 500000); let proposal_fixture = ProposalTestFixture { insufficient_rights_call: || { @@ -304,7 +304,7 @@ fn create_set_election_parameters_proposal_common_checks_succeed() { 1, b"title".to_vec(), b"body".to_vec(), - Some(>::from(3750u32)), + Some(>::from(200_000_u32)), get_valid_election_parameters(), ) }, @@ -527,7 +527,7 @@ fn create_set_content_working_group_mint_capacity_proposal_common_checks_succeed 1, b"title".to_vec(), b"body".to_vec(), - Some(>::from(1250u32)), + Some(>::from(50000u32)), 10, ) }, @@ -583,7 +583,7 @@ fn create_spending_proposal_common_checks_succeed() { 1, b"title".to_vec(), b"body".to_vec(), - Some(>::from(1250u32)), + Some(>::from(25000u32)), 100, 2, ) @@ -696,7 +696,7 @@ fn create_set_lead_proposal_common_checks_succeed() { 1, b"title".to_vec(), b"body".to_vec(), - Some(>::from(1250u32)), + Some(>::from(50000u32)), Some((20, 10)), ) }, @@ -749,7 +749,7 @@ fn create_evict_storage_provider_proposal_common_checks_succeed() { 1, b"title".to_vec(), b"body".to_vec(), - Some(>::from(500u32)), + Some(>::from(25000u32)), 1, ) }, @@ -763,7 +763,7 @@ fn create_evict_storage_provider_proposal_common_checks_succeed() { #[test] fn create_set_validator_count_proposal_common_checks_succeed() { initial_test_ext().execute_with(|| { - increase_total_balance_issuance(500000); + increase_total_balance_issuance_using_account_id(1, 500000); let proposal_fixture = ProposalTestFixture { insufficient_rights_call: || { @@ -802,7 +802,7 @@ fn create_set_validator_count_proposal_common_checks_succeed() { 1, b"title".to_vec(), b"body".to_vec(), - Some(>::from(1250u32)), + Some(>::from(100_000_u32)), 4, ) }, @@ -847,7 +847,7 @@ fn create_set_validator_count_proposal_failed_with_invalid_validator_count() { #[test] fn create_set_storage_role_parameters_proposal_common_checks_succeed() { initial_test_ext().execute_with(|| { - increase_total_balance_issuance(500000); + increase_total_balance_issuance_using_account_id(1, 500000); let proposal_fixture = ProposalTestFixture { insufficient_rights_call: || { @@ -886,7 +886,7 @@ fn create_set_storage_role_parameters_proposal_common_checks_succeed() { 1, b"title".to_vec(), b"body".to_vec(), - Some(>::from(1250u32)), + Some(>::from(100_000_u32)), RoleParameters::default(), ) }, diff --git a/runtime/src/test/proposals_integration.rs b/runtime/src/test/proposals_integration.rs index 68b9478b87..9b75b4033e 100644 --- a/runtime/src/test/proposals_integration.rs +++ b/runtime/src/test/proposals_integration.rs @@ -462,7 +462,7 @@ fn text_proposal_execution_succeeds() { member_id as u64, b"title".to_vec(), b"body".to_vec(), - Some(>::from(1250u32)), + Some(>::from(25000u32)), b"text".to_vec(), ) }, @@ -486,7 +486,7 @@ fn set_lead_proposal_execution_succeeds() { member_id as u64, b"title".to_vec(), b"body".to_vec(), - Some(>::from(1250u32)), + Some(>::from(50000u32)), Some((member_id as u64, account_id.into())), ) }, @@ -519,7 +519,7 @@ fn spending_proposal_execution_succeeds() { member_id as u64, b"title".to_vec(), b"body".to_vec(), - Some(>::from(1250u32)), + Some(>::from(25_000_u32)), new_balance, target_account_id.clone().into(), ) @@ -561,7 +561,7 @@ fn set_content_working_group_mint_capacity_execution_succeeds() { member_id as u64, b"title".to_vec(), b"body".to_vec(), - Some(>::from(1250u32)), + Some(>::from(50000u32)), new_balance, ) }, @@ -599,7 +599,7 @@ fn set_election_parameters_proposal_execution_succeeds() { member_id as u64, b"title".to_vec(), b"body".to_vec(), - Some(>::from(3750u32)), + Some(>::from(200_000_u32)), election_parameters, ) }, @@ -648,7 +648,7 @@ fn evict_storage_provider_proposal_execution_succeeds() { member_id as u64, b"title".to_vec(), b"body".to_vec(), - Some(>::from(500u32)), + Some(>::from(25000u32)), target_account.into(), ) }, @@ -686,7 +686,7 @@ fn set_storage_role_parameters_proposal_execution_succeeds() { member_id as u64, b"title".to_vec(), b"body".to_vec(), - Some(>::from(1250u32)), + Some(>::from(100_000_u32)), target_role_parameters.clone(), ) }, @@ -717,7 +717,7 @@ fn set_validator_count_proposal_execution_succeeds() { member_id as u64, b"title".to_vec(), b"body".to_vec(), - Some(>::from(1250u32)), + Some(>::from(100_000_u32)), new_validator_count, ) }, From d7ff7109252489dcc655360933636e9dd1918bc4 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Mon, 4 May 2020 13:39:22 +0300 Subject: [PATCH 257/286] Update set_wg_mint_capacity proposal limits --- runtime-modules/proposals/codex/src/lib.rs | 10 +++++----- runtime-modules/proposals/codex/src/tests/mod.rs | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index ee50ad6cf1..58a5ddd302 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -80,6 +80,10 @@ pub use proposal_types::{ProposalDetails, ProposalDetailsOf, ProposalEncoder}; // proposal max balance percentage. const COUNCIL_MINT_MAX_BALANCE_PERCENT: u32 = 2; +// 'Set working group mint capacity' proposal limit +const CONTENT_WORKING_GROUP_MINT_CAPACITY_MAX_VALUE: u32 = 1000000; + + /// 'Proposals codex' substrate module Trait pub trait Trait: system::Trait @@ -440,12 +444,8 @@ decl_module! { stake_balance: Option>, mint_balance: BalanceOfMint, ) { - - let max_mint_capacity: u32 = get_required_stake_by_fraction::(1, 100) - .try_into() - .unwrap_or_default() as u32; ensure!( - mint_balance < >::from(max_mint_capacity), + mint_balance <= >::from(CONTENT_WORKING_GROUP_MINT_CAPACITY_MAX_VALUE), Error::InvalidStorageWorkingGroupMintCapacity ); diff --git a/runtime-modules/proposals/codex/src/tests/mod.rs b/runtime-modules/proposals/codex/src/tests/mod.rs index 1b99702ded..03c3b81dc2 100644 --- a/runtime-modules/proposals/codex/src/tests/mod.rs +++ b/runtime-modules/proposals/codex/src/tests/mod.rs @@ -469,7 +469,7 @@ fn create_set_election_parameters_call_fails_with_incorrect_parameters() { #[test] fn create_working_group_mint_capacity_proposal_fails_with_invalid_parameters() { initial_test_ext().execute_with(|| { - increase_total_balance_issuance(500000); + increase_total_balance_issuance_using_account_id(1, 500000); assert_eq!( ProposalCodex::create_set_content_working_group_mint_capacity_proposal( @@ -477,8 +477,8 @@ fn create_working_group_mint_capacity_proposal_fails_with_invalid_parameters() { 1, b"title".to_vec(), b"body".to_vec(), - Some(>::from(1250u32)), - 5001, + Some(>::from(50000u32)), + (crate::CONTENT_WORKING_GROUP_MINT_CAPACITY_MAX_VALUE + 1) as u64, ), Err(Error::InvalidStorageWorkingGroupMintCapacity) ); From 98941efcfc3d17daf82e2393f246bd39a6251ab8 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Mon, 4 May 2020 16:16:37 +0300 Subject: [PATCH 258/286] =?UTF-8?q?Change=20=E2=80=98set=20role=20paramete?= =?UTF-8?q?rs=E2=80=99=20proposal=20limits?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- runtime-modules/proposals/codex/src/lib.rs | 26 +++++-------------- .../proposals/codex/src/tests/mod.rs | 15 ++++++----- 2 files changed, 15 insertions(+), 26 deletions(-) diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index 58a5ddd302..2a2a061354 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -81,8 +81,7 @@ pub use proposal_types::{ProposalDetails, ProposalDetailsOf, ProposalEncoder}; const COUNCIL_MINT_MAX_BALANCE_PERCENT: u32 = 2; // 'Set working group mint capacity' proposal limit -const CONTENT_WORKING_GROUP_MINT_CAPACITY_MAX_VALUE: u32 = 1000000; - +const CONTENT_WORKING_GROUP_MINT_CAPACITY_MAX_VALUE: u32 = 1_000_000; /// 'Proposals codex' substrate module Trait pub trait Trait: @@ -741,12 +740,12 @@ impl Module { role_parameters: &RoleParameters, T::BlockNumber>, ) -> Result<(), Error> { ensure!( - role_parameters.min_actors <= 5, + role_parameters.min_actors < 2, Error::InvalidStorageRoleParameterMinActors ); ensure!( - role_parameters.max_actors >= 5, + role_parameters.max_actors >= 2, Error::InvalidStorageRoleParameterMaxActors ); @@ -810,12 +809,8 @@ impl Module { Error::InvalidStorageRoleParameterMinStake ); - let max_min_stake: u32 = get_required_stake_by_fraction::(1, 100) - .try_into() - .unwrap_or_default() as u32; - ensure!( - role_parameters.min_stake < >::from(max_min_stake), + role_parameters.min_stake <= >::from(10_000_000), Error::InvalidStorageRoleParameterMinStake ); @@ -824,13 +819,8 @@ impl Module { Error::InvalidStorageRoleParameterEntryRequestFee ); - let max_entry_request_fee: u32 = get_required_stake_by_fraction::(1, 100) - .try_into() - .unwrap_or_default() as u32; - ensure!( - role_parameters.entry_request_fee - < >::from(max_entry_request_fee), + role_parameters.entry_request_fee <= >::from(100_000), Error::InvalidStorageRoleParameterEntryRequestFee ); @@ -839,12 +829,8 @@ impl Module { Error::InvalidStorageRoleParameterReward ); - let max_reward: u32 = get_required_stake_by_fraction::(1, 1000) - .try_into() - .unwrap_or_default() as u32; - ensure!( - role_parameters.reward < >::from(max_reward), + role_parameters.reward < >::from(1000), Error::InvalidStorageRoleParameterReward ); diff --git a/runtime-modules/proposals/codex/src/tests/mod.rs b/runtime-modules/proposals/codex/src/tests/mod.rs index 03c3b81dc2..68819271bb 100644 --- a/runtime-modules/proposals/codex/src/tests/mod.rs +++ b/runtime-modules/proposals/codex/src/tests/mod.rs @@ -848,7 +848,10 @@ fn create_set_validator_count_proposal_failed_with_invalid_validator_count() { fn create_set_storage_role_parameters_proposal_common_checks_succeed() { initial_test_ext().execute_with(|| { increase_total_balance_issuance_using_account_id(1, 500000); - + let role_parameters = RoleParameters{ + min_actors: 3, + ..RoleParameters::default() + }; let proposal_fixture = ProposalTestFixture { insufficient_rights_call: || { ProposalCodex::create_set_storage_role_parameters_proposal( @@ -857,7 +860,7 @@ fn create_set_storage_role_parameters_proposal_common_checks_succeed() { b"title".to_vec(), b"body".to_vec(), None, - RoleParameters::default(), + role_parameters.clone(), ) }, empty_stake_call: || { @@ -867,7 +870,7 @@ fn create_set_storage_role_parameters_proposal_common_checks_succeed() { b"title".to_vec(), b"body".to_vec(), None, - RoleParameters::default(), + role_parameters.clone(), ) }, invalid_stake_call: || { @@ -877,7 +880,7 @@ fn create_set_storage_role_parameters_proposal_common_checks_succeed() { b"title".to_vec(), b"body".to_vec(), Some(>::from(5000u32)), - RoleParameters::default(), + role_parameters.clone(), ) }, successful_call: || { @@ -887,12 +890,12 @@ fn create_set_storage_role_parameters_proposal_common_checks_succeed() { b"title".to_vec(), b"body".to_vec(), Some(>::from(100_000_u32)), - RoleParameters::default(), + role_parameters.clone(), ) }, proposal_parameters: crate::proposal_types::parameters::set_storage_role_parameters_proposal::(), - proposal_details: ProposalDetails::SetStorageRoleParameters(RoleParameters::default()), + proposal_details: ProposalDetails::SetStorageRoleParameters(role_parameters), }; proposal_fixture.check_all(); }); From 9b864b6a2f6917711ba328ddb59fc76faea6c8b9 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Mon, 4 May 2020 17:41:53 +0300 Subject: [PATCH 259/286] Export proposals constants to the API metadata --- runtime-modules/proposals/codex/src/lib.rs | 6 ++++++ runtime-modules/proposals/discussion/src/lib.rs | 12 ++++++++++++ runtime-modules/proposals/engine/src/lib.rs | 15 +++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index ee50ad6cf1..f7d405412f 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -340,6 +340,12 @@ decl_module! { /// Predefined errors type Error = Error; + /// Exports max allowed text proposal length const. + const TextProposalMaxLength: u32 = T::TextProposalMaxLength::get(); + + /// Exports max wasm code length of the runtime upgrade proposal const. + const RuntimeUpgradeWasmProposalMaxLength: u32 = T::RuntimeUpgradeWasmProposalMaxLength::get(); + /// Create 'Text (signal)' proposal type. pub fn create_text_proposal( origin, diff --git a/runtime-modules/proposals/discussion/src/lib.rs b/runtime-modules/proposals/discussion/src/lib.rs index 36c02c1cad..0c7e1348b1 100644 --- a/runtime-modules/proposals/discussion/src/lib.rs +++ b/runtime-modules/proposals/discussion/src/lib.rs @@ -190,6 +190,18 @@ decl_module! { /// Emits an event. Default substrate implementation. fn deposit_event() = default; + /// Exports post edition number limit const. + const MaxPostEditionNumber: u32 = T::MaxPostEditionNumber::get(); + + /// Exports thread title length limit const. + const ThreadTitleLengthLimit: u32 = T::ThreadTitleLengthLimit::get(); + + /// Exports post length limit const. + const PostLengthLimit: u32 = T::PostLengthLimit::get(); + + /// Exports max thread by same author in a row number limit const. + const MaxThreadInARowNumber: u32 = T::MaxThreadInARowNumber::get(); + /// Adds a post with author origin check. pub fn add_post( origin, diff --git a/runtime-modules/proposals/engine/src/lib.rs b/runtime-modules/proposals/engine/src/lib.rs index 934b6dd9bc..936e501ac2 100644 --- a/runtime-modules/proposals/engine/src/lib.rs +++ b/runtime-modules/proposals/engine/src/lib.rs @@ -315,6 +315,21 @@ decl_module! { /// Emits an event. Default substrate implementation. fn deposit_event() = default; + /// Exports const - the fee is applied when cancel the proposal. A fee would be slashed (burned). + const CancellationFee: BalanceOf = T::CancellationFee::get(); + + /// Exports const - the fee is applied when the proposal gets rejected. A fee would be slashed (burned). + const RejectionFee: BalanceOf = T::RejectionFee::get(); + + /// Exports const - max allowed proposal title length. + const TitleMaxLength: u32 = T::TitleMaxLength::get(); + + /// Exports const - max allowed proposal description length. + const DescriptionMaxLength: u32 = T::DescriptionMaxLength::get(); + + /// Exports const - max simultaneous active proposals number. + const MaxActiveProposalLimit: u32 = T::MaxActiveProposalLimit::get(); + /// Vote extrinsic. Conditions: origin must allow votes. pub fn vote(origin, voter_id: MemberId, proposal_id: T::ProposalId, vote: VoteKind) { T::VoterOriginValidator::ensure_actor_origin( From fa300afcc2c5422008385052e44f4684fbc3ea38 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Mon, 4 May 2020 18:48:32 +0300 Subject: [PATCH 260/286] =?UTF-8?q?Fix=20tests=20for=20the=20=E2=80=99set?= =?UTF-8?q?=20role=20parameters=E2=80=99=20proposal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proposals/codex/src/tests/mod.rs | 58 ++++++++++--------- runtime/src/test/proposals_integration.rs | 9 ++- 2 files changed, 38 insertions(+), 29 deletions(-) diff --git a/runtime-modules/proposals/codex/src/tests/mod.rs b/runtime-modules/proposals/codex/src/tests/mod.rs index 68819271bb..7c96d6392f 100644 --- a/runtime-modules/proposals/codex/src/tests/mod.rs +++ b/runtime-modules/proposals/codex/src/tests/mod.rs @@ -848,8 +848,8 @@ fn create_set_validator_count_proposal_failed_with_invalid_validator_count() { fn create_set_storage_role_parameters_proposal_common_checks_succeed() { initial_test_ext().execute_with(|| { increase_total_balance_issuance_using_account_id(1, 500000); - let role_parameters = RoleParameters{ - min_actors: 3, + let role_parameters = RoleParameters { + min_actors: 1, ..RoleParameters::default() }; let proposal_fixture = ProposalTestFixture { @@ -911,7 +911,7 @@ fn assert_failed_set_storage_parameters_call( 1, b"title".to_vec(), b"body".to_vec(), - Some(>::from(500u32)), + Some(>::from(100_000_u32)), role_parameters, ), Err(error) @@ -921,30 +921,34 @@ fn assert_failed_set_storage_parameters_call( #[test] fn create_set_storage_role_parameters_proposal_fails_with_invalid_parameters() { initial_test_ext().execute_with(|| { - increase_total_balance_issuance(500000); + increase_total_balance_issuance_using_account_id(1, 500000); - let mut role_parameters = RoleParameters::default(); - role_parameters.min_actors = 6; + let working_role_parameters = RoleParameters { + min_actors: 1, + ..RoleParameters::default() + }; + let mut role_parameters = working_role_parameters.clone(); + role_parameters.min_actors = 2; assert_failed_set_storage_parameters_call( role_parameters, Error::InvalidStorageRoleParameterMinActors, ); - role_parameters = RoleParameters::default(); - role_parameters.max_actors = 4; + role_parameters = working_role_parameters.clone(); + role_parameters.max_actors = 1; assert_failed_set_storage_parameters_call( role_parameters, Error::InvalidStorageRoleParameterMaxActors, ); - role_parameters = RoleParameters::default(); + role_parameters = working_role_parameters.clone(); role_parameters.max_actors = 100; assert_failed_set_storage_parameters_call( role_parameters, Error::InvalidStorageRoleParameterMaxActors, ); - role_parameters = RoleParameters::default(); + role_parameters = working_role_parameters.clone(); role_parameters.reward_period = 599; assert_failed_set_storage_parameters_call( role_parameters, @@ -957,99 +961,99 @@ fn create_set_storage_role_parameters_proposal_fails_with_invalid_parameters() { Error::InvalidStorageRoleParameterRewardPeriod, ); - role_parameters = RoleParameters::default(); + role_parameters = working_role_parameters.clone(); role_parameters.bonding_period = 599; assert_failed_set_storage_parameters_call( role_parameters, Error::InvalidStorageRoleParameterBondingPeriod, ); - role_parameters = RoleParameters::default(); + role_parameters = working_role_parameters.clone(); role_parameters.bonding_period = 28801; assert_failed_set_storage_parameters_call( role_parameters, Error::InvalidStorageRoleParameterBondingPeriod, ); - role_parameters = RoleParameters::default(); + role_parameters = working_role_parameters.clone(); role_parameters.unbonding_period = 599; assert_failed_set_storage_parameters_call( role_parameters, Error::InvalidStorageRoleParameterUnbondingPeriod, ); - role_parameters = RoleParameters::default(); + role_parameters = working_role_parameters.clone(); role_parameters.unbonding_period = 28801; assert_failed_set_storage_parameters_call( role_parameters, Error::InvalidStorageRoleParameterUnbondingPeriod, ); - role_parameters = RoleParameters::default(); + role_parameters = working_role_parameters.clone(); role_parameters.min_service_period = 599; assert_failed_set_storage_parameters_call( role_parameters, Error::InvalidStorageRoleParameterMinServicePeriod, ); - role_parameters = RoleParameters::default(); + role_parameters = working_role_parameters.clone(); role_parameters.min_service_period = 28801; assert_failed_set_storage_parameters_call( role_parameters, Error::InvalidStorageRoleParameterMinServicePeriod, ); - role_parameters = RoleParameters::default(); + role_parameters = working_role_parameters.clone(); role_parameters.startup_grace_period = 599; assert_failed_set_storage_parameters_call( role_parameters, Error::InvalidStorageRoleParameterStartupGracePeriod, ); - role_parameters = RoleParameters::default(); + role_parameters = working_role_parameters.clone(); role_parameters.startup_grace_period = 28801; assert_failed_set_storage_parameters_call( role_parameters, Error::InvalidStorageRoleParameterStartupGracePeriod, ); - role_parameters = RoleParameters::default(); + role_parameters = working_role_parameters.clone(); role_parameters.min_stake = 0; assert_failed_set_storage_parameters_call( role_parameters, Error::InvalidStorageRoleParameterMinStake, ); - role_parameters = RoleParameters::default(); - role_parameters.min_stake = 5001; + role_parameters = working_role_parameters.clone(); + role_parameters.min_stake = 10000001; assert_failed_set_storage_parameters_call( role_parameters, Error::InvalidStorageRoleParameterMinStake, ); - role_parameters = RoleParameters::default(); + role_parameters = working_role_parameters.clone(); role_parameters.entry_request_fee = 0; assert_failed_set_storage_parameters_call( role_parameters, Error::InvalidStorageRoleParameterEntryRequestFee, ); - role_parameters = RoleParameters::default(); - role_parameters.entry_request_fee = 5001; + role_parameters = working_role_parameters.clone(); + role_parameters.entry_request_fee = 100001; assert_failed_set_storage_parameters_call( role_parameters, Error::InvalidStorageRoleParameterEntryRequestFee, ); - role_parameters = RoleParameters::default(); + role_parameters = working_role_parameters.clone(); role_parameters.reward = 0; assert_failed_set_storage_parameters_call( role_parameters, Error::InvalidStorageRoleParameterReward, ); - role_parameters = RoleParameters::default(); - role_parameters.reward = 501; + role_parameters = working_role_parameters; + role_parameters.reward = 1001; assert_failed_set_storage_parameters_call( role_parameters, Error::InvalidStorageRoleParameterReward, diff --git a/runtime/src/test/proposals_integration.rs b/runtime/src/test/proposals_integration.rs index 9b75b4033e..7cba3adf0c 100644 --- a/runtime/src/test/proposals_integration.rs +++ b/runtime/src/test/proposals_integration.rs @@ -668,14 +668,19 @@ fn set_storage_role_parameters_proposal_execution_succeeds() { let member_id = 1; let account_id: [u8; 32] = [member_id; 32]; + let default_role_parameters = RoleParameters { + min_actors: 1, + ..RoleParameters::default() + }; + >::insert( Role::StorageProvider, - RoleParameters::default(), + default_role_parameters.clone(), ); let target_role_parameters = RoleParameters { startup_grace_period: 700, - ..RoleParameters::default() + ..default_role_parameters }; let codex_extrinsic_test_fixture = CodexProposalTestFixture { From 818c82d99c0f7fe16bbd6497c7e2b237845d6b69 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Mon, 4 May 2020 18:56:06 +0300 Subject: [PATCH 261/286] =?UTF-8?q?Update=20=E2=80=98set=20validator=20cou?= =?UTF-8?q?nt=E2=80=99=20proposal=20limits?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- runtime-modules/proposals/codex/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index 2a2a061354..d8d9d1c6c8 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -585,7 +585,7 @@ decl_module! { ); ensure!( - new_validator_count <= 1000, // max validator count + new_validator_count <= 100, // max validator count Error::InvalidValidatorCount ); From f6a80870fe60b615cd630197fc31bfda12752bea Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Mon, 4 May 2020 19:10:04 +0300 Subject: [PATCH 262/286] =?UTF-8?q?Update=20=E2=80=98spending=E2=80=99=20p?= =?UTF-8?q?roposal=20limits?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- runtime-modules/proposals/codex/src/lib.rs | 32 +------------------ .../codex/src/proposal_types/parameters.rs | 30 ----------------- .../proposals/codex/src/tests/mod.rs | 2 +- 3 files changed, 2 insertions(+), 62 deletions(-) diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index d8d9d1c6c8..aadaf11d08 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -61,13 +61,10 @@ use governance::election_params::ElectionParameters; use proposal_engine::ProposalParameters; use roles::actors::RoleParameters; use rstd::clone::Clone; -use rstd::convert::TryInto; use rstd::prelude::*; use rstd::str::from_utf8; use rstd::vec::Vec; -use sr_primitives::traits::SaturatedConversion; use sr_primitives::traits::{One, Zero}; -use sr_primitives::Perbill; use srml_support::dispatch::DispatchResult; use srml_support::traits::{Currency, Get}; use srml_support::{decl_error, decl_module, decl_storage, ensure, print}; @@ -76,10 +73,6 @@ use system::{ensure_root, RawOrigin}; pub use crate::proposal_types::ProposalsConfigParameters; pub use proposal_types::{ProposalDetails, ProposalDetailsOf, ProposalEncoder}; -// Percentage of the total token issue as max mint balance value. Shared with spending -// proposal max balance percentage. -const COUNCIL_MINT_MAX_BALANCE_PERCENT: u32 = 2; - // 'Set working group mint capacity' proposal limit const CONTENT_WORKING_GROUP_MINT_CAPACITY_MAX_VALUE: u32 = 1_000_000; @@ -477,16 +470,8 @@ decl_module! { destination: T::AccountId, ) { ensure!(balance != BalanceOfMint::::zero(), Error::InvalidSpendingProposalBalance); - - let max_balance: u32 = get_required_stake_by_fraction::( - COUNCIL_MINT_MAX_BALANCE_PERCENT, - 100 - ) - .try_into() - .unwrap_or_default() as u32; - ensure!( - balance < >::from(max_balance), + balance <= >::from(2_000_000_u32), Error::InvalidSpendingProposalBalance ); @@ -989,18 +974,3 @@ impl Module { )); } } - -// calculates required stake value using total issuance value and stake percentage. Truncates to -// lowest integer value. Value fraction is defined by numerator and denominator. -pub(crate) fn get_required_stake_by_fraction( - numerator: u32, - denominator: u32, -) -> BalanceOf { - let total_issuance: u128 = >::total_issuance().try_into().unwrap_or(0) as u128; - let required_stake = - Perbill::from_rational_approximation(numerator, denominator) * total_issuance; - - let balance: BalanceOf = required_stake.saturated_into(); - - balance -} diff --git a/runtime-modules/proposals/codex/src/proposal_types/parameters.rs b/runtime-modules/proposals/codex/src/proposal_types/parameters.rs index 754d5dfe07..b75d68ae21 100644 --- a/runtime-modules/proposals/codex/src/proposal_types/parameters.rs +++ b/runtime-modules/proposals/codex/src/proposal_types/parameters.rs @@ -125,33 +125,3 @@ pub(crate) fn set_storage_role_parameters_proposal( required_stake: Some(>::from(100_000_u32)), } } - -#[cfg(test)] -mod test { - use crate::get_required_stake_by_fraction; - use crate::tests::{increase_total_balance_issuance, initial_test_ext, Test}; - - pub use sr_primitives::Perbill; - - #[test] - fn calculate_get_required_stake_by_fraction_with_zero_issuance() { - initial_test_ext() - .execute_with(|| assert_eq!(get_required_stake_by_fraction::(5, 7), 0)); - } - - #[test] - fn calculate_stake_by_percentage_for_defined_issuance_succeeds() { - initial_test_ext().execute_with(|| { - increase_total_balance_issuance(50000); - assert_eq!(get_required_stake_by_fraction::(1, 1000), 50) - }); - } - - #[test] - fn calculate_stake_by_percentage_for_defined_issuance_with_fraction_loss() { - initial_test_ext().execute_with(|| { - increase_total_balance_issuance(1111); - assert_eq!(get_required_stake_by_fraction::(3, 1000), 3); - }); - } -} diff --git a/runtime-modules/proposals/codex/src/tests/mod.rs b/runtime-modules/proposals/codex/src/tests/mod.rs index 7c96d6392f..1ea0ab553c 100644 --- a/runtime-modules/proposals/codex/src/tests/mod.rs +++ b/runtime-modules/proposals/codex/src/tests/mod.rs @@ -620,7 +620,7 @@ fn create_spending_proposal_call_fails_with_incorrect_balance() { b"title".to_vec(), b"body".to_vec(), Some(>::from(1250u32)), - 1001, + 2000001, 2, ), Err(Error::InvalidSpendingProposalBalance) From ae3c187c531fabb255f502bfbb4c289c2d050fe4 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Mon, 4 May 2020 19:23:49 +0300 Subject: [PATCH 263/286] =?UTF-8?q?Update=20=E2=80=98set=20election=20para?= =?UTF-8?q?meters=E2=80=99=20proposal=20limits?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- runtime-modules/proposals/codex/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index aadaf11d08..973f91d840 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -879,7 +879,7 @@ impl Module { ); ensure!( - election_parameters.revealing_period <= T::BlockNumber::from(43200), + election_parameters.revealing_period <= T::BlockNumber::from(28800), Error::InvalidCouncilElectionParameterRevealingPeriod ); @@ -889,7 +889,7 @@ impl Module { ); ensure!( - election_parameters.voting_period <= T::BlockNumber::from(43200), + election_parameters.voting_period <= T::BlockNumber::from(28800), Error::InvalidCouncilElectionParameterVotingPeriod ); From 04e8a341754a25d95f191be7ae06476bc1d38039 Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Tue, 5 May 2020 16:37:45 +0300 Subject: [PATCH 264/286] Introduce proposal limits named constants - introduce proposal limits named constants in the codex module --- runtime-modules/proposals/codex/src/lib.rs | 184 ++++++++++++++++----- 1 file changed, 146 insertions(+), 38 deletions(-) diff --git a/runtime-modules/proposals/codex/src/lib.rs b/runtime-modules/proposals/codex/src/lib.rs index 4b5960f15d..beb4e7b8b7 100644 --- a/runtime-modules/proposals/codex/src/lib.rs +++ b/runtime-modules/proposals/codex/src/lib.rs @@ -64,7 +64,7 @@ use rstd::clone::Clone; use rstd::prelude::*; use rstd::str::from_utf8; use rstd::vec::Vec; -use sr_primitives::traits::{One, Zero}; +use sr_primitives::traits::Zero; use srml_support::dispatch::DispatchResult; use srml_support::traits::{Currency, Get}; use srml_support::{decl_error, decl_module, decl_storage, ensure, print}; @@ -75,6 +75,80 @@ pub use proposal_types::{ProposalDetails, ProposalDetailsOf, ProposalEncoder}; // 'Set working group mint capacity' proposal limit const CONTENT_WORKING_GROUP_MINT_CAPACITY_MAX_VALUE: u32 = 1_000_000; +// Max allowed value for 'spending' proposal +const MAX_SPENDING_PROPOSAL_VALUE: u32 = 2_000_000_u32; +// Max validator count for the 'set validator count' proposal +const MAX_VALIDATOR_COUNT: u32 = 100; +// min_actors min value for the 'set storage role parameters' proposal +const ROLE_PARAMETERS_MIN_ACTORS_MAX_VALUE: u32 = 2; +// max_actors min value for the 'set storage role parameters' proposal +const ROLE_PARAMETERS_MAX_ACTORS_MIN_VALUE: u32 = 2; +// max_actors max value for the 'set storage role parameters' proposal +const ROLE_PARAMETERS_MAX_ACTORS_MAX_VALUE: u32 = 100; +// reward_period min value for the 'set storage role parameters' proposal +const ROLE_PARAMETERS_REWARD_PERIOD_MIN_VALUE: u32 = 600; +// reward_period max value for the 'set storage role parameters' proposal +const ROLE_PARAMETERS_REWARD_PERIOD_MAX_VALUE: u32 = 3600; +// bonding_period min value for the 'set storage role parameters' proposal +const ROLE_PARAMETERS_BONDING_PERIOD_MIN_VALUE: u32 = 600; +// bonding_period max value for the 'set storage role parameters' proposal +const ROLE_PARAMETERS_BONDING_PERIOD_MAX_VALUE: u32 = 28800; +// unbonding_period min value for the 'set storage role parameters' proposal +const ROLE_PARAMETERS_UNBONDING_PERIOD_MIN_VALUE: u32 = 600; +// unbonding_period max value for the 'set storage role parameters' proposal +const ROLE_PARAMETERS_UNBONDING_PERIOD_MAX_VALUE: u32 = 28800; +// min_service_period min value for the 'set storage role parameters' proposal +const ROLE_PARAMETERS_MIN_SERVICE_PERIOD_MIN_VALUE: u32 = 600; +// min_service_period max value for the 'set storage role parameters' proposal +const ROLE_PARAMETERS_MIN_SERVICE_PERIOD_MAX_VALUE: u32 = 28800; +// startup_grace_period min value for the 'set storage role parameters' proposal +const ROLE_PARAMETERS_STARTUP_GRACE_PERIOD_MIN_VALUE: u32 = 600; +// startup_grace_period max value for the 'set storage role parameters' proposal +const ROLE_PARAMETERS_STARTUP_GRACE_PERIOD_MAX_VALUE: u32 = 28800; +// min_stake min value for the 'set storage role parameters' proposal +const ROLE_PARAMETERS_MIN_STAKE_MIN_VALUE: u32 = 0; +// min_stake max value for the 'set storage role parameters' proposal +const ROLE_PARAMETERS_MIN_STAKE_MAX_VALUE: u32 = 10_000_000; +// entry_request_fee min value for the 'set storage role parameters' proposal +const ROLE_PARAMETERS_ENTRY_REQUEST_FEE_MIN_VALUE: u32 = 0; +// entry_request_fee max value for the 'set storage role parameters' proposal +const ROLE_PARAMETERS_ENTRY_REQUEST_FEE_MAX_VALUE: u32 = 100_000; +// reward min value for the 'set storage role parameters' proposal +const ROLE_PARAMETERS_REWARD_MIN_VALUE: u32 = 0; +// reward max value for the 'set storage role parameters' proposal +const ROLE_PARAMETERS_REWARD_MAX_VALUE: u32 = 1000; +// council_size min value for the 'set election parameters' proposal +const ELECTION_PARAMETERS_COUNCIL_SIZE_MIN_VALUE: u32 = 4; +// council_size max value for the 'set election parameters' proposal +const ELECTION_PARAMETERS_COUNCIL_SIZE_MAX_VALUE: u32 = 20; +// candidacy_limit min value for the 'set election parameters' proposal +const ELECTION_PARAMETERS_CANDIDACY_LIMIT_MIN_VALUE: u32 = 25; +// candidacy_limit max value for the 'set election parameters' proposal +const ELECTION_PARAMETERS_CANDIDACY_LIMIT_MAX_VALUE: u32 = 100; +// min_voting_stake min value for the 'set election parameters' proposal +const ELECTION_PARAMETERS_MIN_STAKE_MIN_VALUE: u32 = 1; +// min_voting_stake max value for the 'set election parameters' proposal +const ELECTION_PARAMETERS_MIN_STAKE_MAX_VALUE: u32 = 100_000_u32; +// new_term_duration min value for the 'set election parameters' proposal +const ELECTION_PARAMETERS_NEW_TERM_DURATION_MIN_VALUE: u32 = 14400; +// new_term_duration max value for the 'set election parameters' proposal +const ELECTION_PARAMETERS_NEW_TERM_DURATION_MAX_VALUE: u32 = 432_000; +// revealing_period min value for the 'set election parameters' proposal +const ELECTION_PARAMETERS_REVEALING_PERIOD_MIN_VALUE: u32 = 14400; +// revealing_period max value for the 'set election parameters' proposal +const ELECTION_PARAMETERS_REVEALING_PERIOD_MAX_VALUE: u32 = 28800; +// voting_period min value for the 'set election parameters' proposal +const ELECTION_PARAMETERS_VOTING_PERIOD_MIN_VALUE: u32 = 14400; +// voting_period max value for the 'set election parameters' proposal +const ELECTION_PARAMETERS_VOTING_PERIOD_MAX_VALUE: u32 = 28800; +// announcing_period min value for the 'set election parameters' proposal +const ELECTION_PARAMETERS_ANNOUNCING_PERIOD_MIN_VALUE: u32 = 14400; +// announcing_period max value for the 'set election parameters' proposal +const ELECTION_PARAMETERS_ANNOUNCING_PERIOD_MAX_VALUE: u32 = 43200; +// min_council_stake min value for the 'set election parameters' proposal +const ELECTION_PARAMETERS_MIN_COUNCIL_STAKE_MIN_VALUE: u32 = 1; +// min_council_stake max value for the 'set election parameters' proposal +const ELECTION_PARAMETERS_MIN_COUNCIL_STAKE_MAX_VALUE: u32 = 100_000_u32; /// 'Proposals codex' substrate module Trait pub trait Trait: @@ -477,7 +551,7 @@ decl_module! { ) { ensure!(balance != BalanceOfMint::::zero(), Error::InvalidSpendingProposalBalance); ensure!( - balance <= >::from(2_000_000_u32), + balance <= >::from(MAX_SPENDING_PROPOSAL_VALUE), Error::InvalidSpendingProposalBalance ); @@ -576,7 +650,7 @@ decl_module! { ); ensure!( - new_validator_count <= 100, // max validator count + new_validator_count <= MAX_VALIDATOR_COUNT, Error::InvalidValidatorCount ); @@ -731,97 +805,117 @@ impl Module { role_parameters: &RoleParameters, T::BlockNumber>, ) -> Result<(), Error> { ensure!( - role_parameters.min_actors < 2, + role_parameters.min_actors < ROLE_PARAMETERS_MIN_ACTORS_MAX_VALUE, Error::InvalidStorageRoleParameterMinActors ); ensure!( - role_parameters.max_actors >= 2, + role_parameters.max_actors >= ROLE_PARAMETERS_MAX_ACTORS_MIN_VALUE, Error::InvalidStorageRoleParameterMaxActors ); ensure!( - role_parameters.max_actors < 100, + role_parameters.max_actors < ROLE_PARAMETERS_MAX_ACTORS_MAX_VALUE, Error::InvalidStorageRoleParameterMaxActors ); ensure!( - role_parameters.reward_period >= T::BlockNumber::from(600), + role_parameters.reward_period + >= T::BlockNumber::from(ROLE_PARAMETERS_REWARD_PERIOD_MIN_VALUE), Error::InvalidStorageRoleParameterRewardPeriod ); ensure!( - role_parameters.reward_period <= T::BlockNumber::from(3600), + role_parameters.reward_period + <= T::BlockNumber::from(ROLE_PARAMETERS_REWARD_PERIOD_MAX_VALUE), Error::InvalidStorageRoleParameterRewardPeriod ); ensure!( - role_parameters.bonding_period >= T::BlockNumber::from(600), + role_parameters.bonding_period + >= T::BlockNumber::from(ROLE_PARAMETERS_BONDING_PERIOD_MIN_VALUE), Error::InvalidStorageRoleParameterBondingPeriod ); ensure!( - role_parameters.bonding_period <= T::BlockNumber::from(28800), + role_parameters.bonding_period + <= T::BlockNumber::from(ROLE_PARAMETERS_BONDING_PERIOD_MAX_VALUE), Error::InvalidStorageRoleParameterBondingPeriod ); ensure!( - role_parameters.unbonding_period >= T::BlockNumber::from(600), + role_parameters.unbonding_period + >= T::BlockNumber::from(ROLE_PARAMETERS_UNBONDING_PERIOD_MIN_VALUE), Error::InvalidStorageRoleParameterUnbondingPeriod ); ensure!( - role_parameters.unbonding_period <= T::BlockNumber::from(28800), + role_parameters.unbonding_period + <= T::BlockNumber::from(ROLE_PARAMETERS_UNBONDING_PERIOD_MAX_VALUE), Error::InvalidStorageRoleParameterUnbondingPeriod ); ensure!( - role_parameters.min_service_period >= T::BlockNumber::from(600), + role_parameters.min_service_period + >= T::BlockNumber::from(ROLE_PARAMETERS_MIN_SERVICE_PERIOD_MIN_VALUE), Error::InvalidStorageRoleParameterMinServicePeriod ); ensure!( - role_parameters.min_service_period <= T::BlockNumber::from(28800), + role_parameters.min_service_period + <= T::BlockNumber::from(ROLE_PARAMETERS_MIN_SERVICE_PERIOD_MAX_VALUE), Error::InvalidStorageRoleParameterMinServicePeriod ); ensure!( - role_parameters.startup_grace_period >= T::BlockNumber::from(600), + role_parameters.startup_grace_period + >= T::BlockNumber::from(ROLE_PARAMETERS_STARTUP_GRACE_PERIOD_MIN_VALUE), Error::InvalidStorageRoleParameterStartupGracePeriod ); ensure!( - role_parameters.startup_grace_period <= T::BlockNumber::from(28800), + role_parameters.startup_grace_period + <= T::BlockNumber::from(ROLE_PARAMETERS_STARTUP_GRACE_PERIOD_MAX_VALUE), Error::InvalidStorageRoleParameterStartupGracePeriod ); ensure!( - role_parameters.min_stake > >::from(0u32), + role_parameters.min_stake + > >::from(ROLE_PARAMETERS_MIN_STAKE_MIN_VALUE), Error::InvalidStorageRoleParameterMinStake ); ensure!( - role_parameters.min_stake <= >::from(10_000_000), + role_parameters.min_stake + <= >::from(ROLE_PARAMETERS_MIN_STAKE_MAX_VALUE), Error::InvalidStorageRoleParameterMinStake ); ensure!( - role_parameters.entry_request_fee > >::from(0u32), + role_parameters.entry_request_fee + > >::from( + ROLE_PARAMETERS_ENTRY_REQUEST_FEE_MIN_VALUE + ), Error::InvalidStorageRoleParameterEntryRequestFee ); ensure!( - role_parameters.entry_request_fee <= >::from(100_000), + role_parameters.entry_request_fee + <= >::from( + ROLE_PARAMETERS_ENTRY_REQUEST_FEE_MAX_VALUE + ), Error::InvalidStorageRoleParameterEntryRequestFee ); ensure!( - role_parameters.reward > >::from(0u32), + role_parameters.reward + > >::from(ROLE_PARAMETERS_REWARD_MIN_VALUE), Error::InvalidStorageRoleParameterReward ); ensure!( - role_parameters.reward < >::from(1000), + role_parameters.reward + < >::from(ROLE_PARAMETERS_REWARD_MAX_VALUE), Error::InvalidStorageRoleParameterReward ); @@ -839,84 +933,98 @@ impl Module { election_parameters: &ElectionParameters, T::BlockNumber>, ) -> Result<(), Error> { ensure!( - election_parameters.council_size >= 4, + election_parameters.council_size >= ELECTION_PARAMETERS_COUNCIL_SIZE_MIN_VALUE, Error::InvalidCouncilElectionParameterCouncilSize ); ensure!( - election_parameters.council_size <= 20, + election_parameters.council_size <= ELECTION_PARAMETERS_COUNCIL_SIZE_MAX_VALUE, Error::InvalidCouncilElectionParameterCouncilSize ); ensure!( - election_parameters.candidacy_limit >= 25, + election_parameters.candidacy_limit >= ELECTION_PARAMETERS_CANDIDACY_LIMIT_MIN_VALUE, Error::InvalidCouncilElectionParameterCandidacyLimit ); ensure!( - election_parameters.candidacy_limit <= 100, + election_parameters.candidacy_limit <= ELECTION_PARAMETERS_CANDIDACY_LIMIT_MAX_VALUE, Error::InvalidCouncilElectionParameterCandidacyLimit ); ensure!( - election_parameters.min_voting_stake >= >::one(), + election_parameters.min_voting_stake + >= >::from(ELECTION_PARAMETERS_MIN_STAKE_MIN_VALUE), Error::InvalidCouncilElectionParameterMinVotingStake ); ensure!( election_parameters.min_voting_stake - <= >::from(100_000_u32), + <= >::from(ELECTION_PARAMETERS_MIN_STAKE_MAX_VALUE), Error::InvalidCouncilElectionParameterMinVotingStake ); ensure!( - election_parameters.new_term_duration >= T::BlockNumber::from(14400), + election_parameters.new_term_duration + >= T::BlockNumber::from(ELECTION_PARAMETERS_NEW_TERM_DURATION_MIN_VALUE), Error::InvalidCouncilElectionParameterNewTermDuration ); ensure!( - election_parameters.new_term_duration <= T::BlockNumber::from(432_000), + election_parameters.new_term_duration + <= T::BlockNumber::from(ELECTION_PARAMETERS_NEW_TERM_DURATION_MAX_VALUE), Error::InvalidCouncilElectionParameterNewTermDuration ); ensure!( - election_parameters.revealing_period >= T::BlockNumber::from(14400), + election_parameters.revealing_period + >= T::BlockNumber::from(ELECTION_PARAMETERS_REVEALING_PERIOD_MIN_VALUE), Error::InvalidCouncilElectionParameterRevealingPeriod ); ensure!( - election_parameters.revealing_period <= T::BlockNumber::from(28800), + election_parameters.revealing_period + <= T::BlockNumber::from(ELECTION_PARAMETERS_REVEALING_PERIOD_MAX_VALUE), Error::InvalidCouncilElectionParameterRevealingPeriod ); ensure!( - election_parameters.voting_period >= T::BlockNumber::from(14400), + election_parameters.voting_period + >= T::BlockNumber::from(ELECTION_PARAMETERS_VOTING_PERIOD_MIN_VALUE), Error::InvalidCouncilElectionParameterVotingPeriod ); ensure!( - election_parameters.voting_period <= T::BlockNumber::from(28800), + election_parameters.voting_period + <= T::BlockNumber::from(ELECTION_PARAMETERS_VOTING_PERIOD_MAX_VALUE), Error::InvalidCouncilElectionParameterVotingPeriod ); ensure!( - election_parameters.announcing_period >= T::BlockNumber::from(14400), + election_parameters.announcing_period + >= T::BlockNumber::from(ELECTION_PARAMETERS_ANNOUNCING_PERIOD_MIN_VALUE), Error::InvalidCouncilElectionParameterAnnouncingPeriod ); ensure!( - election_parameters.announcing_period <= T::BlockNumber::from(43200), + election_parameters.announcing_period + <= T::BlockNumber::from(ELECTION_PARAMETERS_ANNOUNCING_PERIOD_MAX_VALUE), Error::InvalidCouncilElectionParameterAnnouncingPeriod ); ensure!( - election_parameters.min_council_stake >= >::one(), + election_parameters.min_council_stake + >= >::from( + ELECTION_PARAMETERS_MIN_COUNCIL_STAKE_MIN_VALUE + ), Error::InvalidCouncilElectionParameterMinCouncilStake ); ensure!( election_parameters.min_council_stake - <= >::from(100_000_u32), + <= >::from( + ELECTION_PARAMETERS_MIN_COUNCIL_STAKE_MAX_VALUE + ), Error::InvalidCouncilElectionParameterMinCouncilStake ); From 71eaf9c526b2bc3d47e00bf3ead17f661e4983dd Mon Sep 17 00:00:00 2001 From: Shamil Gadelshin Date: Wed, 6 May 2020 11:24:36 +0300 Subject: [PATCH 265/286] Update min_actors from RoleParameters MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - set the value to “1” because of new requirements --- runtime-modules/roles/src/actors.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime-modules/roles/src/actors.rs b/runtime-modules/roles/src/actors.rs index 93dbdaca92..d4aa0c321b 100644 --- a/runtime-modules/roles/src/actors.rs +++ b/runtime-modules/roles/src/actors.rs @@ -67,7 +67,7 @@ impl, BlockNumber: From> Default for RoleParameters Date: Thu, 7 May 2020 13:04:29 +0400 Subject: [PATCH 266/286] increase the MaximumBlockWeight to 1_000_000_000 --- runtime/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index befc3299d1..4b25052576 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -176,7 +176,7 @@ pub fn native_version() -> NativeVersion { parameter_types! { pub const BlockHashCount: BlockNumber = 250; - pub const MaximumBlockWeight: Weight = 1_000_000; + pub const MaximumBlockWeight: Weight = 1_000_000_000; pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75); pub const MaximumBlockLength: u32 = 5 * 1024 * 1024; pub const Version: RuntimeVersion = VERSION; From 6bdfaea1ce877d6faf7f7e0cc700c785d29e2c39 Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Fri, 8 May 2020 10:36:07 +0400 Subject: [PATCH 267/286] migration: do not reset any existing rewards --- runtime/src/migration.rs | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/runtime/src/migration.rs b/runtime/src/migration.rs index b7ac479177..b915dd8c8c 100644 --- a/runtime/src/migration.rs +++ b/runtime/src/migration.rs @@ -32,36 +32,7 @@ impl Module { ); } - // Reset working group mint capacity - if let Err(err) = content_working_group::Module::::set_mint_capacity( - system::RawOrigin::Root.into(), - minting::BalanceOf::::zero(), - ) { - debug::warn!( - "Failed to reset mint for working group during migration: {:?}", - err - ); - } - - // Set Storage Role reward to zero - if let Some(parameters) = - roles::actors::Parameters::::get(roles::actors::Role::StorageProvider) - { - if let Err(err) = roles::actors::Module::::set_role_parameters( - system::RawOrigin::Root.into(), - roles::actors::Role::StorageProvider, - roles::actors::RoleParameters { - reward: BalanceOf::::zero(), - ..parameters - }, - ) { - debug::warn!( - "Failed to set zero reward for storage role during migration: {:?}", - err - ); - } - } - + // Initialise the proposal system various periods proposals_codex::Module::::set_default_config_values(); Self::deposit_event(RawEvent::Migrated( From b479b88b38e00720839d8c8be2c247466df10438 Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Fri, 8 May 2020 12:16:54 +0400 Subject: [PATCH 268/286] linter fixes --- runtime/src/migration.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/runtime/src/migration.rs b/runtime/src/migration.rs index b915dd8c8c..f8e21256e1 100644 --- a/runtime/src/migration.rs +++ b/runtime/src/migration.rs @@ -2,7 +2,6 @@ #![allow(clippy::redundant_closure_call)] // disable it because of the substrate lib design use crate::VERSION; -use common::currency::BalanceOf; use rstd::prelude::*; use sr_primitives::{print, traits::Zero}; use srml_support::{debug, decl_event, decl_module, decl_storage}; From b5b36a2cd2904826e34e2edaaeafe9912e9089b5 Mon Sep 17 00:00:00 2001 From: Gleb Urvanov Date: Mon, 11 May 2020 14:26:03 +0200 Subject: [PATCH 269/286] review feedback applied --- tests/network-tests/package.json | 2 +- .../constantinople/electingCouncilTest.ts | 6 +- .../constantinople/membershipCreationTest.ts | 4 +- .../constantinople}/utils/apiWrapper.ts | 0 .../constantinople}/utils/config.ts | 0 .../constantinople}/utils/sender.ts | 0 .../{ => tests/constantinople}/utils/utils.ts | 0 .../src/tests/rome/romeRuntimeUpgradeTest.ts | 11 ++- .../src/tests/rome/utils/apiWrapper.ts | 74 ++----------------- .../src/tests/rome/utils/utils.ts | 5 +- 10 files changed, 20 insertions(+), 82 deletions(-) rename tests/network-tests/src/{ => tests/constantinople}/utils/apiWrapper.ts (100%) rename tests/network-tests/src/{ => tests/constantinople}/utils/config.ts (100%) rename tests/network-tests/src/{ => tests/constantinople}/utils/sender.ts (100%) rename tests/network-tests/src/{ => tests/constantinople}/utils/utils.ts (100%) diff --git a/tests/network-tests/package.json b/tests/network-tests/package.json index 76e87a2530..7ddbae95c9 100644 --- a/tests/network-tests/package.json +++ b/tests/network-tests/package.json @@ -10,7 +10,7 @@ "prettier": "prettier --write ./src" }, "dependencies": { - "@joystream/types": "../joystream-apps/packages/joy-types", + "@joystream/types": "", "@rome/types@npm:@joystream/types": "^0.7.0", "@polkadot/api": "^0.96.1", "@polkadot/keyring": "^1.7.0-beta.5", diff --git a/tests/network-tests/src/tests/constantinople/electingCouncilTest.ts b/tests/network-tests/src/tests/constantinople/electingCouncilTest.ts index 7f1c4e3d64..5950ef7204 100644 --- a/tests/network-tests/src/tests/constantinople/electingCouncilTest.ts +++ b/tests/network-tests/src/tests/constantinople/electingCouncilTest.ts @@ -1,13 +1,13 @@ import { membershipTest } from './membershipCreationTest'; import { KeyringPair } from '@polkadot/keyring/types'; -import { ApiWrapper } from '../../utils/apiWrapper'; +import { ApiWrapper } from './utils/apiWrapper'; import { WsProvider, Keyring } from '@polkadot/api'; -import { initConfig } from '../../utils/config'; +import { initConfig } from './utils/config'; import BN = require('bn.js'); import { registerJoystreamTypes, Seat } from '@joystream/types'; import { assert } from 'chai'; import { v4 as uuid } from 'uuid'; -import { Utils } from '../../utils/utils'; +import { Utils } from './utils/utils'; export function councilTest(m1KeyPairs: KeyringPair[], m2KeyPairs: KeyringPair[]) { initConfig(); diff --git a/tests/network-tests/src/tests/constantinople/membershipCreationTest.ts b/tests/network-tests/src/tests/constantinople/membershipCreationTest.ts index ca5ba1cda2..9e13e53333 100644 --- a/tests/network-tests/src/tests/constantinople/membershipCreationTest.ts +++ b/tests/network-tests/src/tests/constantinople/membershipCreationTest.ts @@ -4,8 +4,8 @@ import { Keyring } from '@polkadot/keyring'; import { assert } from 'chai'; import { KeyringPair } from '@polkadot/keyring/types'; import BN = require('bn.js'); -import { ApiWrapper } from '../../utils/apiWrapper'; -import { initConfig } from '../../utils/config'; +import { ApiWrapper } from './utils/apiWrapper'; +import { initConfig } from './utils/config'; import { v4 as uuid } from 'uuid'; export function membershipTest(nKeyPairs: KeyringPair[]) { diff --git a/tests/network-tests/src/utils/apiWrapper.ts b/tests/network-tests/src/tests/constantinople/utils/apiWrapper.ts similarity index 100% rename from tests/network-tests/src/utils/apiWrapper.ts rename to tests/network-tests/src/tests/constantinople/utils/apiWrapper.ts diff --git a/tests/network-tests/src/utils/config.ts b/tests/network-tests/src/tests/constantinople/utils/config.ts similarity index 100% rename from tests/network-tests/src/utils/config.ts rename to tests/network-tests/src/tests/constantinople/utils/config.ts diff --git a/tests/network-tests/src/utils/sender.ts b/tests/network-tests/src/tests/constantinople/utils/sender.ts similarity index 100% rename from tests/network-tests/src/utils/sender.ts rename to tests/network-tests/src/tests/constantinople/utils/sender.ts diff --git a/tests/network-tests/src/utils/utils.ts b/tests/network-tests/src/tests/constantinople/utils/utils.ts similarity index 100% rename from tests/network-tests/src/utils/utils.ts rename to tests/network-tests/src/tests/constantinople/utils/utils.ts diff --git a/tests/network-tests/src/tests/rome/romeRuntimeUpgradeTest.ts b/tests/network-tests/src/tests/rome/romeRuntimeUpgradeTest.ts index 0c1c0f265a..1ed8c7c8af 100644 --- a/tests/network-tests/src/tests/rome/romeRuntimeUpgradeTest.ts +++ b/tests/network-tests/src/tests/rome/romeRuntimeUpgradeTest.ts @@ -1,6 +1,5 @@ import { initConfig } from './utils/config'; import { Keyring, WsProvider } from '@polkadot/api'; -import { Bytes } from '@polkadot/types'; import { KeyringPair } from '@polkadot/keyring/types'; import { membershipTest } from './membershipCreationTest'; import { councilTest } from './electingCouncilTest'; @@ -41,13 +40,13 @@ describe('Runtime upgrade integration tests', () => { sudo = keyring.addFromUri(sudoUri); const runtime: string = Utils.readRuntimeFromFile(runtimePath); const description: string = 'runtime upgrade proposal which is used for API integration testing'; - const runtimeProposalFee: BN = apiWrapper.estimateRomeProposeRuntimeUpgradeFee( + const runtimeProposalFee: BN = apiWrapper.estimateProposeRuntimeUpgradeFee( proposalStake, description, description, runtime ); - const runtimeVoteFee: BN = apiWrapper.estimateVoteForRomeRuntimeProposalFee(); + const runtimeVoteFee: BN = apiWrapper.estimateVoteForRuntimeProposalFee(); // Topping the balances await apiWrapper.transferBalance(sudo, m1KeyPairs[0].address, runtimeProposalFee.add(proposalStake)); @@ -55,7 +54,7 @@ describe('Runtime upgrade integration tests', () => { // Proposal creation const proposalPromise = apiWrapper.expectProposalCreated(); - await apiWrapper.proposeRuntimeRome( + await apiWrapper.proposeRuntime( m1KeyPairs[0], proposalStake, 'testing runtime', @@ -65,8 +64,8 @@ describe('Runtime upgrade integration tests', () => { const proposalNumber = await proposalPromise; // Approving runtime update proposal - const runtimePromise = apiWrapper.expectRomeRuntimeUpgraded(); - await apiWrapper.batchApproveRomeProposal(m2KeyPairs, proposalNumber); + const runtimePromise = apiWrapper.expectRuntimeUpgraded(); + await apiWrapper.batchApproveProposal(m2KeyPairs, proposalNumber); await runtimePromise; }).timeout(defaultTimeout); diff --git a/tests/network-tests/src/tests/rome/utils/apiWrapper.ts b/tests/network-tests/src/tests/rome/utils/apiWrapper.ts index fa57bc4c9a..983908fc7d 100644 --- a/tests/network-tests/src/tests/rome/utils/apiWrapper.ts +++ b/tests/network-tests/src/tests/rome/utils/apiWrapper.ts @@ -99,18 +99,7 @@ export class ApiWrapper { return this.estimateTxFee(this.api.tx.councilElection.reveal(hashedVote, nominee, salt)); } - public estimateProposeRuntimeUpgradeFee(stake: BN, name: string, description: string, runtime: Bytes | string): BN { - return this.estimateTxFee( - this.api.tx.proposalsCodex.createRuntimeUpgradeProposal(stake, name, description, stake, runtime) - ); - } - - public estimateRomeProposeRuntimeUpgradeFee( - stake: BN, - name: string, - description: string, - runtime: Bytes | string - ): BN { + public estimateProposeRuntimeUpgradeFee(stake: BN, name: string, description: string, runtime: string): BN { return this.estimateTxFee(this.api.tx.proposals.createProposal(stake, name, description, runtime)); } @@ -142,11 +131,7 @@ export class ApiWrapper { ); } - public estimateVoteForProposalFee(): BN { - return this.estimateTxFee(this.api.tx.proposalsEngine.vote(0, 0, 'Approve')); - } - - public estimateVoteForRomeRuntimeProposalFee(): BN { + public estimateVoteForRuntimeProposalFee(): BN { return this.estimateTxFee(this.api.tx.proposals.voteOnProposal(0, 'Approve')); } @@ -244,27 +229,12 @@ export class ApiWrapper { return this.api.query.substrate.code(); } - public async proposeRuntime( + public proposeRuntime( account: KeyringPair, stake: BN, name: string, description: string, - runtime: Bytes | string - ): Promise { - const memberId: BN = (await this.getMemberIds(account.address))[0].toBn(); - return this.sender.signAndSend( - this.api.tx.proposalsCodex.createRuntimeUpgradeProposal(memberId, name, description, stake, runtime), - account, - false - ); - } - - public proposeRuntimeRome( - account: KeyringPair, - stake: BN, - name: string, - description: string, - runtime: Bytes | string + runtime: string ): Promise { return this.sender.signAndSend( this.api.tx.proposals.createProposal(stake, name, description, runtime), @@ -325,20 +295,7 @@ export class ApiWrapper { ); } - public approveProposal(account: KeyringPair, memberId: BN, proposal: BN): Promise { - return this.sender.signAndSend(this.api.tx.proposalsEngine.vote(memberId, proposal, 'Approve'), account, false); - } - - public batchApproveProposal(council: KeyringPair[], proposal: BN): Promise { - return Promise.all( - council.map(async keyPair => { - const memberId: BN = (await this.getMemberIds(keyPair.address))[0].toBn(); - await this.approveProposal(keyPair, memberId, proposal); - }) - ); - } - - public approveRomeProposal(account: KeyringPair, proposal: BN): Promise { + public approveProposal(account: KeyringPair, proposal: BN): Promise { return this.sender.signAndSend( this.api.tx.proposals.voteOnProposal(proposal, new VoteKind('Approve')), account, @@ -346,10 +303,10 @@ export class ApiWrapper { ); } - public batchApproveRomeProposal(council: KeyringPair[], proposal: BN): Promise { + public batchApproveProposal(council: KeyringPair[], proposal: BN): Promise { return Promise.all( council.map(async keyPair => { - await this.approveRomeProposal(keyPair, proposal); + await this.approveProposal(keyPair, proposal); }) ); } @@ -382,18 +339,6 @@ export class ApiWrapper { }); } - public expectRomeRuntimeUpgraded(): Promise { - return new Promise(async resolve => { - await this.api.query.system.events>(events => { - events.forEach(record => { - if (record.event.method.toString() === 'RuntimeUpdated') { - resolve(); - } - }); - }); - }); - } - public expectProposalFinalized(): Promise { return new Promise(async resolve => { await this.api.query.system.events>(events => { @@ -413,11 +358,6 @@ export class ApiWrapper { return this.api.query.balances.totalIssuance(); } - public async getProposal(id: BN) { - const proposal = await this.api.query.proposalsEngine.proposals(id); - return; - } - public async getRequiredProposalStake(numerator: number, denominator: number): Promise { const issuance: number = await (await this.getTotalIssuance()).toNumber(); const stake = (issuance * numerator) / denominator; diff --git a/tests/network-tests/src/tests/rome/utils/utils.ts b/tests/network-tests/src/tests/rome/utils/utils.ts index 1b49039cb1..1e646ad025 100644 --- a/tests/network-tests/src/tests/rome/utils/utils.ts +++ b/tests/network-tests/src/tests/rome/utils/utils.ts @@ -1,6 +1,5 @@ import { IExtrinsic } from '@polkadot/types/types'; -import { Bytes } from '@polkadot/types'; -import { compactToU8a, stringToU8a } from '@polkadot/util'; +import { compactToU8a, stringToU8a, u8aToHex } from '@polkadot/util'; import { blake2AsHex } from '@polkadot/util-crypto'; import BN = require('bn.js'); import fs = require('fs'); @@ -46,6 +45,6 @@ export class Utils { } public static readRuntimeFromFile(path: string): string { - return '0x' + fs.readFileSync(path).toString('hex'); + return u8aToHex(fs.readFileSync(path)); } } From 76184ff72e1b6910c21edf1b4bbb2ee807576dae Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Thu, 14 May 2020 11:03:15 +0400 Subject: [PATCH 270/286] runtime: make proposal discussion types ThreadId and PostId u64 like forum Addresses https://github.com/Joystream/apps/issues/434 --- .../proposals/codex/src/tests/mock.rs | 4 ++-- .../proposals/discussion/src/lib.rs | 8 ++++---- .../proposals/discussion/src/tests/mock.rs | 4 ++-- .../proposals/discussion/src/tests/mod.rs | 20 +++++++++---------- runtime/src/lib.rs | 4 ++-- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/runtime-modules/proposals/codex/src/tests/mock.rs b/runtime-modules/proposals/codex/src/tests/mock.rs index 1566fc9c1e..adebe2ca20 100644 --- a/runtime-modules/proposals/codex/src/tests/mock.rs +++ b/runtime-modules/proposals/codex/src/tests/mock.rs @@ -141,8 +141,8 @@ parameter_types! { impl proposal_discussion::Trait for Test { type Event = (); type PostAuthorOriginValidator = (); - type ThreadId = u32; - type PostId = u32; + type ThreadId = u64; + type PostId = u64; type MaxPostEditionNumber = MaxPostEditionNumber; type ThreadTitleLengthLimit = ThreadTitleLengthLimit; type PostLengthLimit = PostLengthLimit; diff --git a/runtime-modules/proposals/discussion/src/lib.rs b/runtime-modules/proposals/discussion/src/lib.rs index 0c7e1348b1..faada10586 100644 --- a/runtime-modules/proposals/discussion/src/lib.rs +++ b/runtime-modules/proposals/discussion/src/lib.rs @@ -95,10 +95,10 @@ pub trait Trait: system::Trait + membership::members::Trait { >; /// Discussion thread Id type - type ThreadId: From + Into + Parameter + Default + Copy; + type ThreadId: From + Into + Parameter + Default + Copy; /// Post Id type - type PostId: From + Parameter + Default + Copy; + type PostId: From + Parameter + Default + Copy; /// Defines post edition number limit. type MaxPostEditionNumber: Get; @@ -166,14 +166,14 @@ decl_storage! { Thread, T::BlockNumber>; /// Count of all threads that have been created. - pub ThreadCount get(fn thread_count): u32; + pub ThreadCount get(fn thread_count): u64; /// Map thread id and post id to corresponding post. pub PostThreadIdByPostId: double_map T::ThreadId, twox_128(T::PostId) => Post, T::BlockNumber, T::ThreadId>; /// Count of all posts that have been created. - pub PostCount get(fn post_count): u32; + pub PostCount get(fn post_count): u64; /// Last author thread counter (part of the antispam mechanism) pub LastThreadAuthorCounter get(fn last_thread_author_counter): diff --git a/runtime-modules/proposals/discussion/src/tests/mock.rs b/runtime-modules/proposals/discussion/src/tests/mock.rs index 347d43a892..e94e62d4f1 100644 --- a/runtime-modules/proposals/discussion/src/tests/mock.rs +++ b/runtime-modules/proposals/discussion/src/tests/mock.rs @@ -87,8 +87,8 @@ impl membership::members::Trait for Test { impl crate::Trait for Test { type Event = TestEvent; type PostAuthorOriginValidator = (); - type ThreadId = u32; - type PostId = u32; + type ThreadId = u64; + type PostId = u64; type MaxPostEditionNumber = MaxPostEditionNumber; type ThreadTitleLengthLimit = ThreadTitleLengthLimit; type PostLengthLimit = PostLengthLimit; diff --git a/runtime-modules/proposals/discussion/src/tests/mod.rs b/runtime-modules/proposals/discussion/src/tests/mod.rs index ab5edeb7f8..a3d1b7edf8 100644 --- a/runtime-modules/proposals/discussion/src/tests/mod.rs +++ b/runtime-modules/proposals/discussion/src/tests/mod.rs @@ -8,7 +8,7 @@ use system::{EventRecord, Phase}; struct EventFixture; impl EventFixture { - fn assert_events(expected_raw_events: Vec>) { + fn assert_events(expected_raw_events: Vec>) { let expected_events = expected_raw_events .iter() .map(|ev| EventRecord { @@ -23,13 +23,13 @@ impl EventFixture { } struct TestPostEntry { - pub post_id: u32, + pub post_id: u64, pub text: Vec, pub edition_number: u32, } struct TestThreadEntry { - pub thread_id: u32, + pub thread_id: u64, pub title: Vec, } @@ -81,7 +81,7 @@ impl DiscussionFixture { DiscussionFixture { title, ..self } } - fn create_discussion_and_assert(&self, result: Result) -> Option { + fn create_discussion_and_assert(&self, result: Result) -> Option { let create_discussion_result = Discussions::create_thread(self.author_id, self.title.clone()); @@ -94,13 +94,13 @@ impl DiscussionFixture { struct PostFixture { pub text: Vec, pub origin: RawOrigin, - pub thread_id: u32, - pub post_id: Option, + pub thread_id: u64, + pub post_id: Option, pub author_id: u64, } impl PostFixture { - fn default_for_thread(thread_id: u32) -> Self { + fn default_for_thread(thread_id: u64) -> Self { PostFixture { text: b"text".to_vec(), author_id: 1, @@ -122,18 +122,18 @@ impl PostFixture { PostFixture { author_id, ..self } } - fn change_thread_id(self, thread_id: u32) -> Self { + fn change_thread_id(self, thread_id: u64) -> Self { PostFixture { thread_id, ..self } } - fn change_post_id(self, post_id: u32) -> Self { + fn change_post_id(self, post_id: u64) -> Self { PostFixture { post_id: Some(post_id), ..self } } - fn add_post_and_assert(&mut self, result: Result<(), Error>) -> Option { + fn add_post_and_assert(&mut self, result: Result<(), Error>) -> Option { let add_post_result = Discussions::add_post( self.origin.clone().into(), self.author_id, diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index befc3299d1..4bf236fcf2 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -845,8 +845,8 @@ parameter_types! { impl proposals_discussion::Trait for Runtime { type Event = Event; type PostAuthorOriginValidator = MembershipOriginValidator; - type ThreadId = u32; - type PostId = u32; + type ThreadId = u64; + type PostId = u64; type MaxPostEditionNumber = ProposalMaxPostEditionNumber; type ThreadTitleLengthLimit = ProposalThreadTitleLengthLimit; type PostLengthLimit = ProposalPostLengthLimit; From 1991c56354def511ff7d9bf2ded1b414e70ed983 Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Thu, 14 May 2020 12:49:20 +0400 Subject: [PATCH 271/286] runtime: forum make ThreadId and PostId types configurable on Trait --- node/src/forum_config/from_serialized.rs | 11 +-- runtime-modules/forum/src/lib.rs | 91 ++++++++++++++---------- runtime-modules/forum/src/mock.rs | 27 ++++--- runtime/src/lib.rs | 12 +++- 4 files changed, 89 insertions(+), 52 deletions(-) diff --git a/node/src/forum_config/from_serialized.rs b/node/src/forum_config/from_serialized.rs index 06b0ee0b4c..0d907562ad 100644 --- a/node/src/forum_config/from_serialized.rs +++ b/node/src/forum_config/from_serialized.rs @@ -1,7 +1,7 @@ use super::new_validation; use node_runtime::{ - forum::{Category, CategoryId, Post, PostId, Thread, ThreadId}, - AccountId, BlockNumber, ForumConfig, Moment, + forum::{Category, CategoryId, Post, Thread}, + AccountId, BlockNumber, ForumConfig, Moment, PostId, ThreadId, }; use serde::Deserialize; use serde_json::Result; @@ -9,8 +9,11 @@ use serde_json::Result; #[derive(Deserialize)] struct ForumData { categories: Vec<(CategoryId, Category)>, - posts: Vec<(PostId, Post)>, - threads: Vec<(ThreadId, Thread)>, + posts: Vec<( + PostId, + Post, + )>, + threads: Vec<(ThreadId, Thread)>, } fn parse_forum_json() -> Result { diff --git a/runtime-modules/forum/src/lib.rs b/runtime-modules/forum/src/lib.rs index b9f619fc7f..c98c8719a0 100755 --- a/runtime-modules/forum/src/lib.rs +++ b/runtime-modules/forum/src/lib.rs @@ -12,8 +12,9 @@ use serde_derive::{Deserialize, Serialize}; use rstd::borrow::ToOwned; use rstd::prelude::*; -use codec::{Decode, Encode}; -use srml_support::{decl_event, decl_module, decl_storage, dispatch, ensure}; +use codec::{Codec, Decode, Encode}; +use runtime_primitives::traits::{MaybeSerialize, Member, One, SimpleArithmetic}; +use srml_support::{decl_event, decl_module, decl_storage, dispatch, ensure, Parameter}; mod mock; mod tests; @@ -156,13 +157,10 @@ pub struct PostTextChange { text: Vec, } -/// Represents a post identifier -pub type PostId = u64; - /// Represents a thread post #[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))] #[derive(Encode, Decode, Default, Clone, PartialEq, Eq)] -pub struct Post { +pub struct Post { /// Post identifier id: PostId, @@ -192,13 +190,10 @@ pub struct Post { author_id: AccountId, } -/// Represents a thread identifier -pub type ThreadId = u64; - /// Represents a thread #[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))] #[derive(Encode, Decode, Default, Clone, PartialEq, Eq)] -pub struct Thread { +pub struct Thread { /// Thread identifier id: ThreadId, @@ -238,7 +233,7 @@ pub struct Thread { author_id: AccountId, } -impl Thread { +impl Thread { fn num_posts_ever_created(&self) -> u32 { self.num_unmoderated_posts + self.num_moderated_posts } @@ -321,6 +316,26 @@ pub trait Trait: system::Trait + timestamp::Trait + Sized { type Event: From> + Into<::Event>; type MembershipRegistry: ForumUserRegistry; + + /// Thread Id type + type ThreadId: Parameter + + Member + + SimpleArithmetic + + Codec + + Default + + Copy + + MaybeSerialize + + PartialEq; + + /// Post Id type + type PostId: Parameter + + Member + + SimpleArithmetic + + Codec + + Default + + Copy + + MaybeSerialize + + PartialEq; } decl_storage! { @@ -333,16 +348,16 @@ decl_storage! { pub NextCategoryId get(next_category_id) config(): CategoryId; /// Map thread identifier to corresponding thread. - pub ThreadById get(thread_by_id) config(): map ThreadId => Thread; + pub ThreadById get(thread_by_id) config(): map T::ThreadId => Thread; /// Thread identifier value to be used for next Thread in threadById. - pub NextThreadId get(next_thread_id) config(): ThreadId; + pub NextThreadId get(next_thread_id) config(): T::ThreadId; /// Map post identifier to corresponding post. - pub PostById get(post_by_id) config(): map PostId => Post; + pub PostById get(post_by_id) config(): map T::PostId => Post; /// Post identifier value to be used for for next post created. - pub NextPostId get(next_post_id) config(): PostId; + pub NextPostId get(next_post_id) config(): T::PostId; /// Account of forum sudo. pub ForumSudo get(forum_sudo) config(): Option; @@ -386,6 +401,8 @@ decl_event!( pub enum Event where ::AccountId, + ::ThreadId, + ::PostId, { /// A category was introduced CategoryCreated(CategoryId), @@ -632,7 +649,7 @@ decl_module! { } /// Moderate thread - fn moderate_thread(origin, thread_id: ThreadId, rationale: Vec) -> dispatch::Result { + fn moderate_thread(origin, thread_id: T::ThreadId, rationale: Vec) -> dispatch::Result { // Check that its a valid signature let who = ensure_signed(origin)?; @@ -683,7 +700,7 @@ decl_module! { } /// Edit post text - fn add_post(origin, thread_id: ThreadId, text: Vec) -> dispatch::Result { + fn add_post(origin, thread_id: T::ThreadId, text: Vec) -> dispatch::Result { /* * Update SPEC with new errors, @@ -720,7 +737,7 @@ decl_module! { } /// Edit post text - fn edit_post_text(origin, post_id: PostId, new_text: Vec) -> dispatch::Result { + fn edit_post_text(origin, post_id: T::PostId, new_text: Vec) -> dispatch::Result { /* Edit spec. - forum member guard missing @@ -767,7 +784,7 @@ decl_module! { } /// Moderate post - fn moderate_post(origin, post_id: PostId, rationale: Vec) -> dispatch::Result { + fn moderate_post(origin, post_id: T::PostId, rationale: Vec) -> dispatch::Result { // Check that its a valid signature let who = ensure_signed(origin)?; @@ -867,8 +884,9 @@ impl Module { } fn ensure_post_is_mutable( - post_id: PostId, - ) -> Result, &'static str> { + post_id: T::PostId, + ) -> Result, &'static str> + { // Make sure post exists let post = Self::ensure_post_exists(post_id)?; @@ -882,8 +900,9 @@ impl Module { } fn ensure_post_exists( - post_id: PostId, - ) -> Result, &'static str> { + post_id: T::PostId, + ) -> Result, &'static str> + { if >::exists(post_id) { Ok(>::get(post_id)) } else { @@ -892,8 +911,8 @@ impl Module { } fn ensure_thread_is_mutable( - thread_id: ThreadId, - ) -> Result, &'static str> { + thread_id: T::ThreadId, + ) -> Result, &'static str> { // Make sure thread exists let thread = Self::ensure_thread_exists(thread_id)?; @@ -907,8 +926,8 @@ impl Module { } fn ensure_thread_exists( - thread_id: ThreadId, - ) -> Result, &'static str> { + thread_id: T::ThreadId, + ) -> Result, &'static str> { if >::exists(thread_id) { Ok(>::get(thread_id)) } else { @@ -1045,12 +1064,12 @@ impl Module { category_id: CategoryId, title: &[u8], author_id: &T::AccountId, - ) -> Thread { + ) -> Thread { // Get category let category = >::get(category_id); // Create and add new thread - let new_thread_id = NextThreadId::get(); + let new_thread_id = NextThreadId::::get(); let new_thread = Thread { id: new_thread_id, @@ -1068,8 +1087,8 @@ impl Module { >::insert(new_thread_id, new_thread.clone()); // Update next thread id - NextThreadId::mutate(|n| { - *n += 1; + NextThreadId::::mutate(|n| { + *n += One::one(); }); // Update unmoderated thread count in corresponding category @@ -1083,15 +1102,15 @@ impl Module { /// Creates and ads a new post ot the given thread, and makes all required state updates /// `thread_id` must be valid fn add_new_post( - thread_id: ThreadId, + thread_id: T::ThreadId, text: &[u8], author_id: &T::AccountId, - ) -> Post { + ) -> Post { // Get thread let thread = >::get(thread_id); // Make and add initial post - let new_post_id = NextPostId::get(); + let new_post_id = NextPostId::::get(); let new_post = Post { id: new_post_id, @@ -1108,8 +1127,8 @@ impl Module { >::insert(new_post_id, new_post.clone()); // Update next post id - NextPostId::mutate(|n| { - *n += 1; + NextPostId::::mutate(|n| { + *n += One::one(); }); // Update unmoderated post count of thread diff --git a/runtime-modules/forum/src/mock.rs b/runtime-modules/forum/src/mock.rs index 38a5416ad6..103279af8b 100644 --- a/runtime-modules/forum/src/mock.rs +++ b/runtime-modules/forum/src/mock.rs @@ -100,6 +100,8 @@ impl timestamp::Trait for Runtime { impl Trait for Runtime { type Event = (); type MembershipRegistry = registry::TestMembershipRegistryModule; + type ThreadId = u64; + type PostId = u64; } #[derive(Clone)] @@ -123,9 +125,9 @@ pub const NOT_MEMBER_ORIGIN: OriginType = OriginType::Signed(222); pub const INVLAID_CATEGORY_ID: CategoryId = 333; -pub const INVLAID_THREAD_ID: ThreadId = 444; +pub const INVLAID_THREAD_ID: RuntimeThreadId = 444; -pub const INVLAID_POST_ID: ThreadId = 555; +pub const INVLAID_POST_ID: RuntimePostId = 555; pub fn generate_text(len: usize) -> Vec { vec![b'x'; len] @@ -228,7 +230,7 @@ impl CreateThreadFixture { pub struct CreatePostFixture { pub origin: OriginType, - pub thread_id: ThreadId, + pub thread_id: RuntimeThreadId, pub text: Vec, pub result: dispatch::Result, } @@ -285,7 +287,7 @@ pub fn assert_create_thread( pub fn assert_create_post( forum_sudo: OriginType, - thread_id: ThreadId, + thread_id: RuntimeThreadId, expected_result: dispatch::Result, ) { CreatePostFixture { @@ -312,7 +314,7 @@ pub fn create_root_category(forum_sudo: OriginType) -> CategoryId { pub fn create_root_category_and_thread( forum_sudo: OriginType, -) -> (OriginType, CategoryId, ThreadId) { +) -> (OriginType, CategoryId, RuntimeThreadId) { let member_origin = create_forum_member(); let category_id = create_root_category(forum_sudo); let thread_id = TestForumModule::next_thread_id(); @@ -331,7 +333,7 @@ pub fn create_root_category_and_thread( pub fn create_root_category_and_thread_and_post( forum_sudo: OriginType, -) -> (OriginType, CategoryId, ThreadId, PostId) { +) -> (OriginType, CategoryId, RuntimeThreadId, RuntimePostId) { let (member_origin, category_id, thread_id) = create_root_category_and_thread(forum_sudo); let post_id = TestForumModule::next_post_id(); @@ -348,7 +350,7 @@ pub fn create_root_category_and_thread_and_post( pub fn moderate_thread( forum_sudo: OriginType, - thread_id: ThreadId, + thread_id: RuntimeThreadId, rationale: Vec, ) -> dispatch::Result { TestForumModule::moderate_thread(mock_origin(forum_sudo), thread_id, rationale) @@ -356,7 +358,7 @@ pub fn moderate_thread( pub fn moderate_post( forum_sudo: OriginType, - post_id: PostId, + post_id: RuntimePostId, rationale: Vec, ) -> dispatch::Result { TestForumModule::moderate_post(mock_origin(forum_sudo), post_id, rationale) @@ -456,23 +458,28 @@ pub type RuntimeThread = Thread< ::BlockNumber, ::Moment, ::AccountId, + RuntimeThreadId, >; pub type RuntimePost = Post< ::BlockNumber, ::Moment, ::AccountId, + RuntimeThreadId, + RuntimePostId, >; pub type RuntimeBlockchainTimestamp = BlockchainTimestamp< ::BlockNumber, ::Moment, >; +pub type RuntimeThreadId = ::ThreadId; +pub type RuntimePostId = ::PostId; pub fn genesis_config( category_by_id: &RuntimeMap, next_category_id: u64, - thread_by_id: &RuntimeMap, + thread_by_id: &RuntimeMap, next_thread_id: u64, - post_by_id: &RuntimeMap, + post_by_id: &RuntimeMap, next_post_id: u64, forum_sudo: ::AccountId, category_title_constraint: &InputValidationLengthConstraint, diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 4bf236fcf2..1b95c2817b 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -94,6 +94,12 @@ pub type Moment = u64; /// Credential type pub type Credential = u64; +/// Represents a thread identifier for both Forum and Proposals Discussion +pub type ThreadId = u64; + +/// Represents a post identifier for both Forum and Proposals Discussion +pub type PostId = u64; + /// Opaque types. These are used by the CLI to instantiate machinery that don't need to know /// the specifics of the runtime. They can then be made to be agnostic over specific formats /// of data like extrinsics, allowing for them to continue syncing the network through upgrades @@ -784,6 +790,8 @@ impl forum::ForumUserRegistry for ShimMembershipRegistry { impl forum::Trait for Runtime { type Event = Event; type MembershipRegistry = ShimMembershipRegistry; + type ThreadId = ThreadId; + type PostId = PostId; } impl migration::Trait for Runtime { @@ -845,8 +853,8 @@ parameter_types! { impl proposals_discussion::Trait for Runtime { type Event = Event; type PostAuthorOriginValidator = MembershipOriginValidator; - type ThreadId = u64; - type PostId = u64; + type ThreadId = ThreadId; + type PostId = PostId; type MaxPostEditionNumber = ProposalMaxPostEditionNumber; type ThreadTitleLengthLimit = ProposalThreadTitleLengthLimit; type PostLengthLimit = ProposalPostLengthLimit; From f1465fc9f78f20ce3883f8250ea008a2e15406a9 Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Thu, 14 May 2020 13:28:22 +0400 Subject: [PATCH 272/286] clippy linter fixes --- node/src/forum_config/from_serialized.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/node/src/forum_config/from_serialized.rs b/node/src/forum_config/from_serialized.rs index 0d907562ad..4b512b0a0c 100644 --- a/node/src/forum_config/from_serialized.rs +++ b/node/src/forum_config/from_serialized.rs @@ -1,3 +1,5 @@ +#![allow(clippy::type_complexity)] + use super::new_validation; use node_runtime::{ forum::{Category, CategoryId, Post, Thread}, From de4ce1ef37309d96f748358ca429e3667b7176d2 Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Thu, 14 May 2020 17:37:47 +0400 Subject: [PATCH 273/286] runtime: ThreadId expand comment explaining why it must be same for forum and proposal discussion --- runtime/src/lib.rs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 1b95c2817b..121767868d 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -95,9 +95,19 @@ pub type Moment = u64; pub type Credential = u64; /// Represents a thread identifier for both Forum and Proposals Discussion +/// +/// Note: Both modules expose type names ThreadId and PostId (which are defined on their Trait) and +/// used in state storage and dispatchable method's argument types, +/// and are therefore part of the public API/metadata of the runtime. +/// In the currenlty version the polkadot-js/api that is used and is compatible with the runtime, +/// the type registry has flat namespace and its not possible +/// to register identically named types from different modules, separately. And so we MUST configure +/// the underlying types to be identicaly to avoid issues with encoding/decoding these types on the client side. pub type ThreadId = u64; /// Represents a post identifier for both Forum and Proposals Discussion +/// +/// See the Note about ThreadId pub type PostId = u64; /// Opaque types. These are used by the CLI to instantiate machinery that don't need to know From 9354c290243a37e473335d9985ef5fa0070c6b8e Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Sun, 17 May 2020 16:08:16 +0300 Subject: [PATCH 274/286] travis: fix repo name --- .travis.yml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8a76eb12cc..88ce72d06d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,7 +62,7 @@ deploy: file: ${FILENAME}.tar.gz on: tags: true - repo: Joystream/substrate-node-joystream + repo: Joystream/joystream draft: true overwrite: true skip_cleanup: true @@ -72,19 +72,8 @@ deploy: file: ${FILENAME}.tar.gz on: branch: development - repo: Joystream/substrate-node-joystream + repo: Joystream/joystream draft: true prerelease: true overwrite: true skip_cleanup: true - - provider: releases - api_key: - secure: ZoEXp8g+yZOEG8JZ1Fg6tWnW3aYDfupFbZflEejYaAdXhj1nw7G9N10ZX5VDdb/O1iFx8BhfFymQxk0ynxNC8c52LzOjKIhXEporxgvEPdnoPS/N1JhfsOUV0ragwZDLv2tFVi2AT0K4w8WJFJDzrK4qHOMMQgVbVQZtFmDL1whHdfBD5FyFyKmMdZdWBtTGy4s7X0LnmxjNB4/3AMa540T3LowZ5H66MYZkQmAbtg8ib93WomVanhS23vbjNaH9x1Kmzxd2B3pCSgI8uaxBrpmzINvAeSusYVJQt0EF/cAPXmq0+JmGoocvcS1ecg/SNZoKUNmeElB4ns/obg/QAyE+fyQtyl+iDYBilhFLm5xRMUnqkpyeUUD3u824i/Z+/tfLvtm5Egg1QAiXtIIJMeAj1nN8OIeSlHR4phnSTA3jl2PZw9QYidtV9WCqHC0qxtpkYSKkC8ItaefScPB1AuvOvVx8xvnIxfR/tXvL8Y3Y2BvhiLgpky9JkbdMln1b0m0E5c4vyGCEVqHqpbxM63VJkpct8sVx0atGvipWEelVjz5XpkxW2PYbgg4EKUzl3FiYcXwf5Y/ykxaZNZt7I4gv9nz2KkVwUCCPqdwWF7ww1shFWW5tCoCmJuUESOdPFx0jQ7LVWz7SDLDsqvvaW2c2OPxG6DIx9BiTeAE4qIQ= - file: "${FILENAME}.tar.gz" - skip_cleanup: true - draft: true - prerelease: true - overwrite: true - on: - repo: mnaamani/substrate-node-joystream - branch: deploy \ No newline at end of file From e6abd22dfa8ddc8a3ab0602d6868443312dd5a36 Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Sun, 17 May 2020 17:38:15 +0300 Subject: [PATCH 275/286] travis: update repo secret API key --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 88ce72d06d..df132cdefc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,7 +58,7 @@ before_deploy: deploy: - provider: releases api_key: - secure: QTna4XzKmPrXNA5KnYfLsH8cAKxESLdFbQ5HJ6nvB9reE10SVtg8lZ+ShL+no7TACNBUNt09Qv9HNgs6JcNRJ9QMHEJHKIbMyjplhBtZ+W3l0k+6TL0yeKHZ/OvddDF+vDbpN+y4xBfOf0xqZcNH3lZJTms/NPBn/KT5DpQ3JZ8bibdMP2HSCazfvHLwj38OuLX6VWbFcmN2RAmUR9AXYvk5wWYVw8g1VDzTCxjH1G+dGWH1L9+ZDgFfv7BNSNhPc6V9GghgLVZ+37r/STzTTAQ/gPv+yruglEWUhSAngFfVYUegvTmIeQLi/V+g0tKUS+l7eNX08xz6eZcn0+/32V7P+oEN/dhU84E0kgmiOsiUEGI/KFM+qw9TyX3GtD67UmG5TZrD7OUMIu1qCuPSetsTOK2kvpwlYAn+j5iFB30Uz4hXhOH5dib2zz2I7cYHi1kvzeNQqQOPNDCmaO48bcbRIaeqMAHdsb6scGzh/+CD2V2HOmHlhd+4o1PpX6hAMwmOXAu3bMDi4zlB9Hb1cSZnsYNBHawkD6y45QGepFKpGW/6u5VRPeMK62Gm9wu815C36B4mVg6CVqtZMbk0WYPIk6zfoTft3i04YthKbRO96a5VD9LssVbiSYnudXuZJjSllSZVCi9AKS8JVIS2jC2z+tWkquAesSrwztriRcs= + secure: FfxZGQexxAGT0Skbctl1FuqmEvNHejPDPtNG8Du1ACSGjS7Y+M6o/aPqE6HL158AmddOgndsIPR+HM7VfMDAUMkLTbOhv3nMpDBZu1h25vwk+jHOM65tm5LWUu/ROWBpaAQiG7NKrvtfkNfbNBSETsEbWBt/DPrhlIfSbgsXBFDiid7uRrCiwvDUJ097/EUOJ9OVUrk+O4ebSzfIfKPGPtRU2rQQ0eNX7yX3TCm3jbQm/kplkQNRL9mnAJNxtKuvuko4LqZ6jN4XLoLTHUMjO7E0r6wXVB4GVjA4HA214eLlQD6BhgTbWMDxKgWyuKzPG+2GLKyluSSn0RurSl8tYryXKxKxuN3H1FX9r23a8AzGtpRACJtIePC2YmPuQRSnz2Bw8jlSP2WPLJtXGD036J/wVMj6W9TROm7IBigiC7QlqAqCYNByOnoKyhRCgYyAJZb0Jpa3qWaFhA6b6gCGhyH85QCcrc0q6JAB3oqH8Wfm/K2HVzBobmKaSFu5DpwInNnUXnLWGVzhSt3oCq6ld773izReGdLJtLC2vaJ9rZVaVw29s9M662EEuAGgaVLO/sinZJFeIIaCF4i4zUXwXSLIdfKXGOR0ZibkyT2FS6qPGvl/lLN5IREzD7v/rV8htGMLmw4jpPLNskvRjCHX42ewRRYdMvZzQQOAvSlWcsw= file: ${FILENAME}.tar.gz on: tags: true @@ -68,7 +68,7 @@ deploy: skip_cleanup: true - provider: releases api_key: - secure: QTna4XzKmPrXNA5KnYfLsH8cAKxESLdFbQ5HJ6nvB9reE10SVtg8lZ+ShL+no7TACNBUNt09Qv9HNgs6JcNRJ9QMHEJHKIbMyjplhBtZ+W3l0k+6TL0yeKHZ/OvddDF+vDbpN+y4xBfOf0xqZcNH3lZJTms/NPBn/KT5DpQ3JZ8bibdMP2HSCazfvHLwj38OuLX6VWbFcmN2RAmUR9AXYvk5wWYVw8g1VDzTCxjH1G+dGWH1L9+ZDgFfv7BNSNhPc6V9GghgLVZ+37r/STzTTAQ/gPv+yruglEWUhSAngFfVYUegvTmIeQLi/V+g0tKUS+l7eNX08xz6eZcn0+/32V7P+oEN/dhU84E0kgmiOsiUEGI/KFM+qw9TyX3GtD67UmG5TZrD7OUMIu1qCuPSetsTOK2kvpwlYAn+j5iFB30Uz4hXhOH5dib2zz2I7cYHi1kvzeNQqQOPNDCmaO48bcbRIaeqMAHdsb6scGzh/+CD2V2HOmHlhd+4o1PpX6hAMwmOXAu3bMDi4zlB9Hb1cSZnsYNBHawkD6y45QGepFKpGW/6u5VRPeMK62Gm9wu815C36B4mVg6CVqtZMbk0WYPIk6zfoTft3i04YthKbRO96a5VD9LssVbiSYnudXuZJjSllSZVCi9AKS8JVIS2jC2z+tWkquAesSrwztriRcs= + secure: FfxZGQexxAGT0Skbctl1FuqmEvNHejPDPtNG8Du1ACSGjS7Y+M6o/aPqE6HL158AmddOgndsIPR+HM7VfMDAUMkLTbOhv3nMpDBZu1h25vwk+jHOM65tm5LWUu/ROWBpaAQiG7NKrvtfkNfbNBSETsEbWBt/DPrhlIfSbgsXBFDiid7uRrCiwvDUJ097/EUOJ9OVUrk+O4ebSzfIfKPGPtRU2rQQ0eNX7yX3TCm3jbQm/kplkQNRL9mnAJNxtKuvuko4LqZ6jN4XLoLTHUMjO7E0r6wXVB4GVjA4HA214eLlQD6BhgTbWMDxKgWyuKzPG+2GLKyluSSn0RurSl8tYryXKxKxuN3H1FX9r23a8AzGtpRACJtIePC2YmPuQRSnz2Bw8jlSP2WPLJtXGD036J/wVMj6W9TROm7IBigiC7QlqAqCYNByOnoKyhRCgYyAJZb0Jpa3qWaFhA6b6gCGhyH85QCcrc0q6JAB3oqH8Wfm/K2HVzBobmKaSFu5DpwInNnUXnLWGVzhSt3oCq6ld773izReGdLJtLC2vaJ9rZVaVw29s9M662EEuAGgaVLO/sinZJFeIIaCF4i4zUXwXSLIdfKXGOR0ZibkyT2FS6qPGvl/lLN5IREzD7v/rV8htGMLmw4jpPLNskvRjCHX42ewRRYdMvZzQQOAvSlWcsw= file: ${FILENAME}.tar.gz on: branch: development From 120e2d6f4bd9c0bb33317ea797e590bd8c553e3f Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Tue, 19 May 2020 10:20:51 +0300 Subject: [PATCH 276/286] bump runtime spec version to 13 and node binary version to v2.2.0 Constantinople --- Cargo.lock | 4 ++-- devops/dockerfiles/rust-builder/Dockerfile | 2 +- node/Cargo.toml | 2 +- runtime/Cargo.toml | 2 +- runtime/src/lib.rs | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 22e918e944..8d6403e68e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1569,7 +1569,7 @@ dependencies = [ [[package]] name = "joystream-node" -version = "2.1.6" +version = "2.2.0" dependencies = [ "ctrlc", "derive_more 0.14.1", @@ -1614,7 +1614,7 @@ dependencies = [ [[package]] name = "joystream-node-runtime" -version = "6.12.2" +version = "6.13.0" dependencies = [ "parity-scale-codec", "safe-mix", diff --git a/devops/dockerfiles/rust-builder/Dockerfile b/devops/dockerfiles/rust-builder/Dockerfile index 26e35b69ab..c6e0d9283f 100644 --- a/devops/dockerfiles/rust-builder/Dockerfile +++ b/devops/dockerfiles/rust-builder/Dockerfile @@ -1,4 +1,4 @@ -FROM liuchong/rustup:1.42.0 AS builder +FROM liuchong/rustup:1.43.0 AS builder LABEL description="Rust and WASM build environment for joystream and substrate" WORKDIR /setup diff --git a/node/Cargo.toml b/node/Cargo.toml index bb6930245e..3464da2bf2 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -3,7 +3,7 @@ authors = ['Joystream'] build = 'build.rs' edition = '2018' name = 'joystream-node' -version = '2.1.6' +version = '2.2.0' default-run = "joystream-node" [[bin]] diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 7342d71866..aa41d86893 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -5,7 +5,7 @@ edition = '2018' name = 'joystream-node-runtime' # Follow convention: https://github.com/Joystream/substrate-runtime-joystream/issues/1 # {Authoring}.{Spec}.{Impl} of the RuntimeVersion -version = '6.12.2' +version = '6.13.0' [features] default = ['std'] diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index dc14045abb..7406376f3c 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -142,8 +142,8 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("joystream-node"), impl_name: create_runtime_str!("joystream-node"), authoring_version: 6, - spec_version: 12, - impl_version: 1, + spec_version: 13, + impl_version: 0, apis: RUNTIME_API_VERSIONS, }; From 21529850cfa16beb004c2338ada5384c573071bd Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Tue, 19 May 2020 14:11:19 +0300 Subject: [PATCH 277/286] runtime: reduce validator stake unbonding period to 1 day --- runtime/src/constantine.rs | 37 +++++++++++++++++++++++++++++++++++++ runtime/src/lib.rs | 2 +- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 runtime/src/constantine.rs diff --git a/runtime/src/constantine.rs b/runtime/src/constantine.rs new file mode 100644 index 0000000000..7b7e4e94f3 --- /dev/null +++ b/runtime/src/constantine.rs @@ -0,0 +1,37 @@ +// Clippy linter warning +#![allow(clippy::redundant_closure_call)] // disable it because of the substrate lib design + +use rstd::prelude::*; +use srml_support::{debug, decl_event, decl_module, decl_storage, traits::Get}; + +pub trait Trait: system::Trait { + type Event: From + Into<::Event>; + type TheValue: Get; +} + +decl_storage! { + trait Store for Module as Constantine { + // compiler error: "use of undeclared type or module `T`" + // pub InitialValue get(initial_value): u32 = T::TheValue::get(); + pub InitialValue get(initial_value) build(|_: &GenesisConfig| T::TheValue::get()): u32; + } +} + +decl_event! { + pub enum Event { + TheValueIs(u32), + } +} + +decl_module! { + pub struct Module for enum Call where origin: T::Origin { + const TheValue: u32 = T::TheValue::get(); + + fn deposit_event() = default; + + fn on_initialize(_now: T::BlockNumber) { + debug::print!("T::TheValue::get() ==> {:?}", T::TheValue::get()); + Self::deposit_event(Event::TheValueIs(T::TheValue::get())); + } + } +} diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 7406376f3c..452a86c32d 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -368,7 +368,7 @@ srml_staking_reward_curve::build! { parameter_types! { pub const SessionsPerEra: sr_staking_primitives::SessionIndex = 6; - pub const BondingDuration: staking::EraIndex = 24 * 28; + pub const BondingDuration: staking::EraIndex = 24; pub const RewardCurve: &'static PiecewiseLinear<'static> = &REWARD_CURVE; } From 23bf6308b9745001b29dc9c2c56f519e7fdc9ecb Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Tue, 19 May 2020 14:13:48 +0300 Subject: [PATCH 278/286] runtime: reward-curve adjusted for Constantinople incentive model --- runtime/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 452a86c32d..be03a44cc4 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -358,8 +358,8 @@ impl session::historical::Trait for Runtime { srml_staking_reward_curve::build! { const REWARD_CURVE: PiecewiseLinear<'static> = curve!( min_inflation: 0_025_000, - max_inflation: 0_100_000, - ideal_stake: 0_500_000, + max_inflation: 0_300_000, + ideal_stake: 0_300_000, falloff: 0_050_000, max_piece_count: 40, test_precision: 0_005_000, From 95dd697cd85a167d8ab50598059d9afd96e16e4d Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Tue, 19 May 2020 14:23:18 +0300 Subject: [PATCH 279/286] runtime: reward-curve increase max_piece_count to fix precision test failure --- runtime/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index be03a44cc4..4bae8353eb 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -361,7 +361,7 @@ srml_staking_reward_curve::build! { max_inflation: 0_300_000, ideal_stake: 0_300_000, falloff: 0_050_000, - max_piece_count: 40, + max_piece_count: 100, test_precision: 0_005_000, ); } From dfcdd10ac7e33c8a91bef4141ac0145da69f9f8d Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Tue, 19 May 2020 17:41:20 +0300 Subject: [PATCH 280/286] runtime: remove temp test code --- runtime/src/constantine.rs | 37 ------------------------------------- 1 file changed, 37 deletions(-) delete mode 100644 runtime/src/constantine.rs diff --git a/runtime/src/constantine.rs b/runtime/src/constantine.rs deleted file mode 100644 index 7b7e4e94f3..0000000000 --- a/runtime/src/constantine.rs +++ /dev/null @@ -1,37 +0,0 @@ -// Clippy linter warning -#![allow(clippy::redundant_closure_call)] // disable it because of the substrate lib design - -use rstd::prelude::*; -use srml_support::{debug, decl_event, decl_module, decl_storage, traits::Get}; - -pub trait Trait: system::Trait { - type Event: From + Into<::Event>; - type TheValue: Get; -} - -decl_storage! { - trait Store for Module as Constantine { - // compiler error: "use of undeclared type or module `T`" - // pub InitialValue get(initial_value): u32 = T::TheValue::get(); - pub InitialValue get(initial_value) build(|_: &GenesisConfig| T::TheValue::get()): u32; - } -} - -decl_event! { - pub enum Event { - TheValueIs(u32), - } -} - -decl_module! { - pub struct Module for enum Call where origin: T::Origin { - const TheValue: u32 = T::TheValue::get(); - - fn deposit_event() = default; - - fn on_initialize(_now: T::BlockNumber) { - debug::print!("T::TheValue::get() ==> {:?}", T::TheValue::get()); - Self::deposit_event(Event::TheValueIs(T::TheValue::get())); - } - } -} From b9da60223555390615aff94c5fc8cf382f121105 Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Tue, 19 May 2020 17:49:38 +0300 Subject: [PATCH 281/286] build scripts: compute wasm blob hash when building the docker joystream/node image --- devops/dockerfiles/node-and-runtime/Dockerfile | 7 +++++++ scripts/compute-runtime-blob-hash.sh | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/devops/dockerfiles/node-and-runtime/Dockerfile b/devops/dockerfiles/node-and-runtime/Dockerfile index ed0a8c1ce3..72f125eb1e 100644 --- a/devops/dockerfiles/node-and-runtime/Dockerfile +++ b/devops/dockerfiles/node-and-runtime/Dockerfile @@ -14,6 +14,13 @@ COPY --from=builder /joystream/target/release/wbuild/joystream-node-runtime/joys # confirm it works RUN /joystream/node --version +# https://manpages.debian.org/stretch/coreutils/b2sum.1.en.html +# RUN apt-get install coreutils +# print the blake2 256 hash of the wasm blob +RUN b2sum -l 256 /joystream/runtime.compact.wasm +# print the blake2 512 hash of the wasm blob +RUN b2sum -l 512 /joystream/runtime.compact.wasm + EXPOSE 30333 9933 9944 # Use these volumes to persits chain state and keystore, eg.: diff --git a/scripts/compute-runtime-blob-hash.sh b/scripts/compute-runtime-blob-hash.sh index c197fbce6d..0e711198fb 100755 --- a/scripts/compute-runtime-blob-hash.sh +++ b/scripts/compute-runtime-blob-hash.sh @@ -1,5 +1,8 @@ #!/usr/bin/env bash +# The script computes the b2sum of the wasm blob in a pre-built joystream/node image +# Assumes b2sum is already instally on the host machine. + # Create a non running container from joystream/node docker create --name temp-container-joystream-node joystream/node @@ -13,4 +16,5 @@ docker rm temp-container-joystream-node # ubuntu 17.0+ with: apt-get install coreutils; b2sum -l 256 joystream_runtime.wasm # TODO: add install of b2sum to setup.sh b2sum -l 256 joystream_runtime.wasm +b2sum -l 512 joystream_runtime.wasm rm joystream_runtime.wasm From 3962df5a64e7e5bfdd6dee7793e49125d2e8b8ef Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Wed, 20 May 2020 00:26:52 +0300 Subject: [PATCH 282/286] travis: add job to build runtime wasm blob deterministicly with docker --- .travis.yml | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index df132cdefc..3aac763f2c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,9 @@ matrix: services: docker - os: osx env: TARGET=x86_64-apple-darwin + - os: linux + env: TARGET=wasm-blob + services: docker before_install: - rustup component add rustfmt @@ -39,27 +42,41 @@ script: joystream/rust-raspberry \ build --release sudo chmod a+r ${TRAVIS_BUILD_DIR}/target/${TARGET}/release/joystream-node + else if [ "$TARGET" = "wasm-blob" ] + then + docker build --tag joystream/node \ + --file ./devops/dockerfiles/node-and-runtime/Dockerfile \ + . + docker create --name temp-container-joystream-node joystream/node + docker cp temp-container-joystream-node:/joystream/runtime.compact.wasm joystream_runtime.wasm + docker rm temp-container-joystream-node else cargo build --release --target=${TARGET} fi before_deploy: - - cp ./target/${TARGET}/release/joystream-node . - | - if [ "$TARGET" = "arm-unknown-linux-gnueabihf" ] + if [ "$TARGET" = "wasm-blob" ] then - export FILENAME="joystream-node-armv7-linux-gnueabihf" + export ASSET="joystream_runtime.wasm" else - export FILENAME=`./joystream-node --version | sed -e "s/ /-/g"` + cp ./target/${TARGET}/release/joystream-node . + if [ "$TARGET" = "arm-unknown-linux-gnueabihf" ] + then + export FILENAME="joystream-node-armv7-linux-gnueabihf" + else + export FILENAME=`./joystream-node --version | sed -e "s/ /-/g"` + fi + tar -cf ${FILENAME}.tar ./joystream-node + gzip ${FILENAME}.tar + export ASSET=${FILENAME}.tar.gz fi - - tar -cf ${FILENAME}.tar ./joystream-node - - gzip ${FILENAME}.tar deploy: - provider: releases api_key: secure: FfxZGQexxAGT0Skbctl1FuqmEvNHejPDPtNG8Du1ACSGjS7Y+M6o/aPqE6HL158AmddOgndsIPR+HM7VfMDAUMkLTbOhv3nMpDBZu1h25vwk+jHOM65tm5LWUu/ROWBpaAQiG7NKrvtfkNfbNBSETsEbWBt/DPrhlIfSbgsXBFDiid7uRrCiwvDUJ097/EUOJ9OVUrk+O4ebSzfIfKPGPtRU2rQQ0eNX7yX3TCm3jbQm/kplkQNRL9mnAJNxtKuvuko4LqZ6jN4XLoLTHUMjO7E0r6wXVB4GVjA4HA214eLlQD6BhgTbWMDxKgWyuKzPG+2GLKyluSSn0RurSl8tYryXKxKxuN3H1FX9r23a8AzGtpRACJtIePC2YmPuQRSnz2Bw8jlSP2WPLJtXGD036J/wVMj6W9TROm7IBigiC7QlqAqCYNByOnoKyhRCgYyAJZb0Jpa3qWaFhA6b6gCGhyH85QCcrc0q6JAB3oqH8Wfm/K2HVzBobmKaSFu5DpwInNnUXnLWGVzhSt3oCq6ld773izReGdLJtLC2vaJ9rZVaVw29s9M662EEuAGgaVLO/sinZJFeIIaCF4i4zUXwXSLIdfKXGOR0ZibkyT2FS6qPGvl/lLN5IREzD7v/rV8htGMLmw4jpPLNskvRjCHX42ewRRYdMvZzQQOAvSlWcsw= - file: ${FILENAME}.tar.gz + file: ${ASSET} on: tags: true repo: Joystream/joystream @@ -69,7 +86,7 @@ deploy: - provider: releases api_key: secure: FfxZGQexxAGT0Skbctl1FuqmEvNHejPDPtNG8Du1ACSGjS7Y+M6o/aPqE6HL158AmddOgndsIPR+HM7VfMDAUMkLTbOhv3nMpDBZu1h25vwk+jHOM65tm5LWUu/ROWBpaAQiG7NKrvtfkNfbNBSETsEbWBt/DPrhlIfSbgsXBFDiid7uRrCiwvDUJ097/EUOJ9OVUrk+O4ebSzfIfKPGPtRU2rQQ0eNX7yX3TCm3jbQm/kplkQNRL9mnAJNxtKuvuko4LqZ6jN4XLoLTHUMjO7E0r6wXVB4GVjA4HA214eLlQD6BhgTbWMDxKgWyuKzPG+2GLKyluSSn0RurSl8tYryXKxKxuN3H1FX9r23a8AzGtpRACJtIePC2YmPuQRSnz2Bw8jlSP2WPLJtXGD036J/wVMj6W9TROm7IBigiC7QlqAqCYNByOnoKyhRCgYyAJZb0Jpa3qWaFhA6b6gCGhyH85QCcrc0q6JAB3oqH8Wfm/K2HVzBobmKaSFu5DpwInNnUXnLWGVzhSt3oCq6ld773izReGdLJtLC2vaJ9rZVaVw29s9M662EEuAGgaVLO/sinZJFeIIaCF4i4zUXwXSLIdfKXGOR0ZibkyT2FS6qPGvl/lLN5IREzD7v/rV8htGMLmw4jpPLNskvRjCHX42ewRRYdMvZzQQOAvSlWcsw= - file: ${FILENAME}.tar.gz + file: ${ASSET} on: branch: development repo: Joystream/joystream From 9aeaa5ab83d69d386dfe274debaeb45a39a05b0d Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Wed, 20 May 2020 01:41:45 +0300 Subject: [PATCH 283/286] travis: fix elif syntax --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3aac763f2c..bfaefebec6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,7 +42,7 @@ script: joystream/rust-raspberry \ build --release sudo chmod a+r ${TRAVIS_BUILD_DIR}/target/${TARGET}/release/joystream-node - else if [ "$TARGET" = "wasm-blob" ] + elif [ "$TARGET" = "wasm-blob" ] then docker build --tag joystream/node \ --file ./devops/dockerfiles/node-and-runtime/Dockerfile \ From 8e55ac6d9aa0f32bacad099b02edce1823dfb388 Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Wed, 20 May 2020 11:34:44 +0300 Subject: [PATCH 284/286] some README fixes and update runtime CHANGELOG --- README.md | 20 +++++++++++++------- runtime/CHANGELOG.md | 7 +++---- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 1f3e32b8da..06e8d870d4 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,18 @@ -# Joystream +# Joystream [![Build Status](https://travis-ci.org/Joystream/joystream.svg?branch=master)](https://travis-ci.org/Joystream/joystream) This is the main code reposity for all joystream software. It will house the substrate chain project, the full node and runtime and all reusable substrate runtime modules that make up the joystream runtime. In addition to all front-end apps and infrastructure servers necessary for operating the network. The repository is currently just a cargo workspace, but eventually will also contain yarn workspaces, and possibly other project type workspaces. +## Build Status + +Development [![Development Branch Build Status](https://travis-ci.org/Joystream/joystream.svg?branch=development)](https://travis-ci.org/Joystream/joystream) + +More detailed build history on [Travis CI](https://travis-ci.org/github/Joystream/joystream/builds) + ## Overview -The joystream network builds on a pre-release version of [substrate v2.0](https://substrate.dev/) and adds additional +The Joystream network builds on a pre-release version of [substrate v2.0](https://substrate.dev/) and adds additional functionality to support the [various roles](https://www.joystream.org/roles) that can be entered into on the platform. @@ -20,7 +26,7 @@ To setup a full node and validator review the [advanced guide from the helpdesk] ### Pre-built Binaries -The latest pre-built binaries can be downloads from the [releases](https://github.com/Joystream/substrate-runtime-joystream/releases) page. +The latest pre-built binaries can be downloads from the [releases](https://github.com/Joystream/joystream/releases) page. ### Building from source @@ -28,9 +34,9 @@ The latest pre-built binaries can be downloads from the [releases](https://githu Clone the repository and install build tools: ```bash -git clone https://github.com/Joystream/substrate-runtime-joystream.git +git clone https://github.com/Joystream/joystream.git -cd substrate-runtime-joystream/ +cd joystream/ ./setup.sh ``` @@ -49,7 +55,7 @@ Run the node and connect to the public testnet. cargo run --release -- --chain ./rome-tesnet.json ``` -The `rome-testnet.json` chain file can be ontained from the [release page](https://github.com/Joystream/substrate-runtime-joystream/releases/tag/v6.8.0) +The `rome-testnet.json` chain file can be ontained from the [release page](https://github.com/Joystream/joystream/releases/tag/v6.8.0) ### Installing a release build @@ -113,7 +119,7 @@ Deploying the compiled runtime on a live system can be done in one of two ways: ### Versioning the runtime Versioning of the runtime is set in `runtime/src/lib.rs` -For detailed information about how to set correct version numbers when developing a new runtime, [see this](https://github.com/Joystream/substrate-runtime-joystream/issues/1) +For detailed information about how to set correct version numbers when developing a new runtime, [see this](https://github.com/Joystream/joystream/issues/1) ## Coding style diff --git a/runtime/CHANGELOG.md b/runtime/CHANGELOG.md index 72fbf612df..ad48410a12 100644 --- a/runtime/CHANGELOG.md +++ b/runtime/CHANGELOG.md @@ -1,5 +1,6 @@ -### Version 6.9.1 -... +### Version 6.13.0 - (Constantinople) runtime upgrade - May 20th 2020 +- New proposal system that strengthens the governance structure of the platform +- Adjusted inflation curve to better reflect a new realistic economic system for the platform ### Version 6.8.0 (Rome release) - March 9th 2020 - New versioned and permissioned content mangement system that powers a new media experience. @@ -35,5 +36,3 @@ - Council Runtime upgrade proposal - Simple PoS validator staking - Memo (account status message) - -Used in genesis block for first testnet (Sparta) From 359c1361e9f5b76985a5854f053fafa3ea849a25 Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Wed, 20 May 2020 11:41:14 +0300 Subject: [PATCH 285/286] readme: typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 06e8d870d4..a2cc125990 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ Run the node and connect to the public testnet. cargo run --release -- --chain ./rome-tesnet.json ``` -The `rome-testnet.json` chain file can be ontained from the [release page](https://github.com/Joystream/joystream/releases/tag/v6.8.0) +The `rome-testnet.json` chain file can be obtained from the [releases page](https://github.com/Joystream/joystream/releases/tag/v6.8.0) ### Installing a release build From 39d5b3c7e567c2ef466ac1856ca0a51fd9a4de99 Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Wed, 20 May 2020 12:00:00 +0300 Subject: [PATCH 286/286] Update README.md Co-authored-by: Martin <35237943+bwhm@users.noreply.github.com> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a2cc125990..bb97452017 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ To setup a full node and validator review the [advanced guide from the helpdesk] ### Pre-built Binaries -The latest pre-built binaries can be downloads from the [releases](https://github.com/Joystream/joystream/releases) page. +The latest pre-built binaries can be downloaded from the [releases](https://github.com/Joystream/joystream/releases) page. ### Building from source