diff --git a/Cargo.lock b/Cargo.lock
index b915ab4bb..aeb03543a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -23,11 +23,11 @@ dependencies = [
[[package]]
name = "addr2line"
-version = "0.21.0"
+version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3"
dependencies = [
- "gimli 0.28.0",
+ "gimli 0.27.3",
]
[[package]]
@@ -172,9 +172,9 @@ dependencies = [
[[package]]
name = "aho-corasick"
-version = "1.0.4"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a"
+checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
dependencies = [
"memchr",
]
@@ -211,23 +211,24 @@ dependencies = [
[[package]]
name = "anstream"
-version = "0.5.0"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c"
+checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
dependencies = [
"anstyle",
"anstyle-parse",
"anstyle-query",
"anstyle-wincon",
"colorchoice",
+ "is-terminal",
"utf8parse",
]
[[package]]
name = "anstyle"
-version = "1.0.2"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea"
+checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd"
[[package]]
name = "anstyle-parse"
@@ -249,9 +250,9 @@ dependencies = [
[[package]]
name = "anstyle-wincon"
-version = "2.1.0"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd"
+checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
dependencies = [
"anstyle",
"windows-sys 0.48.0",
@@ -259,9 +260,9 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.75"
+version = "1.0.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
+checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854"
[[package]]
name = "approx"
@@ -330,7 +331,7 @@ dependencies = [
"num-traits",
"rusticata-macros",
"thiserror",
- "time 0.3.27",
+ "time 0.3.24",
]
[[package]]
@@ -346,7 +347,7 @@ dependencies = [
"num-traits",
"rusticata-macros",
"thiserror",
- "time 0.3.27",
+ "time 0.3.24",
]
[[package]]
@@ -418,22 +419,22 @@ dependencies = [
[[package]]
name = "async-lock"
-version = "2.8.0"
+version = "2.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b"
+checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7"
dependencies = [
"event-listener",
]
[[package]]
name = "async-trait"
-version = "0.1.73"
+version = "0.1.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
+checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.29",
+ "syn 2.0.28",
]
[[package]]
@@ -446,7 +447,7 @@ dependencies = [
"futures-sink",
"futures-util",
"memchr",
- "pin-project-lite 0.2.12",
+ "pin-project-lite 0.2.10",
]
[[package]]
@@ -474,16 +475,16 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "backtrace"
-version = "0.3.69"
+version = "0.3.68"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12"
dependencies = [
- "addr2line 0.21.0",
+ "addr2line 0.20.0",
"cc",
"cfg-if",
"libc",
"miniz_oxide",
- "object 0.32.0",
+ "object 0.31.1",
"rustc-demangle",
]
@@ -733,9 +734,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
-version = "2.4.0"
+version = "2.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
+checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42"
[[package]]
name = "bitvec"
@@ -957,9 +958,9 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.0.83"
+version = "1.0.80"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+checksum = "51f1226cd9da55587234753d1245dd5b132343ea240f26b6a9003d68706141ba"
dependencies = [
"jobserver",
"libc",
@@ -1109,9 +1110,9 @@ dependencies = [
[[package]]
name = "clap"
-version = "4.4.0"
+version = "4.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d5f1946157a96594eb2d2c10eb7ad9a2b27518cb3000209dec700c35df9197d"
+checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d"
dependencies = [
"clap_builder",
"clap_derive",
@@ -1120,9 +1121,9 @@ dependencies = [
[[package]]
name = "clap_builder"
-version = "4.4.0"
+version = "4.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78116e32a042dd73c2901f0dc30790d20ff3447f3e3472fad359e8c3d282bcd6"
+checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1"
dependencies = [
"anstream",
"anstyle",
@@ -1132,21 +1133,21 @@ dependencies = [
[[package]]
name = "clap_derive"
-version = "4.4.0"
+version = "4.3.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a"
+checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050"
dependencies = [
"heck",
"proc-macro2",
"quote",
- "syn 2.0.29",
+ "syn 2.0.28",
]
[[package]]
name = "clap_lex"
-version = "0.5.1"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961"
+checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
[[package]]
name = "coarsetime"
@@ -1234,9 +1235,9 @@ dependencies = [
[[package]]
name = "const-oid"
-version = "0.9.5"
+version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f"
+checksum = "795bc6e66a8e340f075fcf6227e417a2dc976b92b91f3cdc778bb858778b6747"
[[package]]
name = "constant_time_eq"
@@ -2027,37 +2028,23 @@ dependencies = [
[[package]]
name = "curve25519-dalek"
-version = "4.0.0"
+version = "4.0.0-rc.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f711ade317dd348950a9910f81c5947e3d8907ebd2b83f76203ff1807e6a2bc2"
+checksum = "8d4ba9852b42210c7538b75484f9daa0655e9a3ac04f693747bb0f02cf3cfe16"
dependencies = [
"cfg-if",
- "cpufeatures",
- "curve25519-dalek-derive",
- "digest 0.10.7",
"fiat-crypto",
+ "packed_simd_2",
"platforms 3.0.2",
- "rustc_version 0.4.0",
"subtle",
"zeroize",
]
-[[package]]
-name = "curve25519-dalek-derive"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.29",
-]
-
[[package]]
name = "cxx"
-version = "1.0.106"
+version = "1.0.102"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28403c86fc49e3401fdf45499ba37fad6493d9329449d6449d7f0e10f4654d28"
+checksum = "f68e12e817cb19eaab81aaec582b4052d07debd3c3c6b083b9d361db47c7dc9d"
dependencies = [
"cc",
"cxxbridge-flags",
@@ -2067,9 +2054,9 @@ dependencies = [
[[package]]
name = "cxx-build"
-version = "1.0.106"
+version = "1.0.102"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78da94fef01786dc3e0c76eafcd187abcaa9972c78e05ff4041e24fdf059c285"
+checksum = "e789217e4ab7cf8cc9ce82253180a9fe331f35f5d339f0ccfe0270b39433f397"
dependencies = [
"cc",
"codespan-reporting",
@@ -2077,24 +2064,24 @@ dependencies = [
"proc-macro2",
"quote",
"scratch",
- "syn 2.0.29",
+ "syn 2.0.28",
]
[[package]]
name = "cxxbridge-flags"
-version = "1.0.106"
+version = "1.0.102"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2a6f5e1dfb4b34292ad4ea1facbfdaa1824705b231610087b00b17008641809"
+checksum = "78a19f4c80fd9ab6c882286fa865e92e07688f4387370a209508014ead8751d0"
[[package]]
name = "cxxbridge-macro"
-version = "1.0.106"
+version = "1.0.102"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50c49547d73ba8dcfd4ad7325d64c6d5391ff4224d498fc39a6f3f49825a530d"
+checksum = "b8fcfa71f66c8563c4fa9dd2bb68368d50267856f831ac5d85367e0805f9606c"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.29",
+ "syn 2.0.28",
]
[[package]]
@@ -2169,16 +2156,6 @@ dependencies = [
"zeroize",
]
-[[package]]
-name = "der"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c"
-dependencies = [
- "const-oid",
- "zeroize",
-]
-
[[package]]
name = "der-parser"
version = "7.0.0"
@@ -2209,9 +2186,9 @@ dependencies = [
[[package]]
name = "deranged"
-version = "0.3.8"
+version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946"
+checksum = "8810e7e2cf385b1e9b50d68264908ec367ba642c96d02edfe61c39e88e2a3c01"
[[package]]
name = "derivative"
@@ -2243,7 +2220,7 @@ checksum = "53e0efad4403bfc52dc201159c4b842a246a14b98c64b55dfd0f2d89729dfeb8"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.29",
+ "syn 2.0.28",
]
[[package]]
@@ -2374,7 +2351,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.29",
+ "syn 2.0.28",
]
[[package]]
@@ -2418,9 +2395,9 @@ dependencies = [
[[package]]
name = "dyn-clone"
-version = "1.0.13"
+version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbfc4744c1b8f2a09adc0e55242f60b1af195d88596bd8700be74418c056c555"
+checksum = "304e6508efa593091e97a9abbc10f90aa7ca635b6d2784feff3c89d41dd12272"
[[package]]
name = "ecdsa"
@@ -2428,10 +2405,10 @@ version = "0.14.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c"
dependencies = [
- "der 0.6.1",
+ "der",
"elliptic-curve",
"rfc6979",
- "signature 1.6.4",
+ "signature",
]
[[package]]
@@ -2440,17 +2417,7 @@ version = "1.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7"
dependencies = [
- "signature 1.6.4",
-]
-
-[[package]]
-name = "ed25519"
-version = "2.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60f6d271ca33075c88028be6f04d502853d63a5ece419d269c15315d4fc1cf1d"
-dependencies = [
- "pkcs8 0.10.2",
- "signature 2.1.0",
+ "signature",
]
[[package]]
@@ -2460,27 +2427,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d"
dependencies = [
"curve25519-dalek 3.2.0",
- "ed25519 1.5.3",
+ "ed25519",
"rand 0.7.3",
"serde",
"sha2 0.9.9",
"zeroize",
]
-[[package]]
-name = "ed25519-dalek"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980"
-dependencies = [
- "curve25519-dalek 4.0.0",
- "ed25519 2.2.2",
- "rand_core 0.6.4",
- "serde",
- "sha2 0.10.7",
- "zeroize",
-]
-
[[package]]
name = "ed25519-zebra"
version = "3.1.0"
@@ -2509,14 +2462,14 @@ checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3"
dependencies = [
"base16ct",
"crypto-bigint",
- "der 0.6.1",
+ "der",
"digest 0.10.7",
"ff",
"generic-array 0.14.7",
"group",
"hkdf",
"pem-rfc7468",
- "pkcs8 0.9.0",
+ "pkcs8",
"rand_core 0.6.4",
"sec1",
"subtle",
@@ -2552,7 +2505,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.29",
+ "syn 2.0.28",
]
[[package]]
@@ -2563,7 +2516,7 @@ checksum = "b893c4eb2dc092c811165f84dc7447fae16fb66521717968c34c509b39b1a5c5"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.29",
+ "syn 2.0.28",
]
[[package]]
@@ -2765,13 +2718,13 @@ dependencies = [
[[package]]
name = "filetime"
-version = "0.2.22"
+version = "0.2.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0"
+checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153"
dependencies = [
"cfg-if",
"libc",
- "redox_syscall 0.3.5",
+ "redox_syscall 0.2.16",
"windows-sys 0.48.0",
]
@@ -2811,9 +2764,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
[[package]]
name = "flate2"
-version = "1.0.27"
+version = "1.0.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
+checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
dependencies = [
"crc32fast",
"libz-sys",
@@ -3214,7 +3167,7 @@ dependencies = [
"futures-io",
"memchr",
"parking",
- "pin-project-lite 0.2.12",
+ "pin-project-lite 0.2.10",
"waker-fn",
]
@@ -3226,7 +3179,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.29",
+ "syn 2.0.28",
]
[[package]]
@@ -3272,7 +3225,7 @@ dependencies = [
"futures-sink",
"futures-task",
"memchr",
- "pin-project-lite 0.2.12",
+ "pin-project-lite 0.2.10",
"pin-utils",
"slab",
]
@@ -3370,9 +3323,9 @@ dependencies = [
[[package]]
name = "gimli"
-version = "0.28.0"
+version = "0.27.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
+checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
[[package]]
name = "glob"
@@ -3382,9 +3335,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
[[package]]
name = "globset"
-version = "0.4.13"
+version = "0.4.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d"
+checksum = "aca8bbd8e0707c1887a8bbb7e6b40e228f251ff5d62c8220a4a7a53c73aff006"
dependencies = [
"aho-corasick",
"bstr",
@@ -3406,9 +3359,9 @@ dependencies = [
[[package]]
name = "h2"
-version = "0.3.21"
+version = "0.3.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833"
+checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049"
dependencies = [
"bytes",
"fnv",
@@ -3588,7 +3541,7 @@ checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
dependencies = [
"bytes",
"http",
- "pin-project-lite 0.2.12",
+ "pin-project-lite 0.2.10",
]
[[package]]
@@ -3605,9 +3558,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
[[package]]
name = "httpdate"
-version = "1.0.3"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
+checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
[[package]]
name = "humantime"
@@ -3631,7 +3584,7 @@ dependencies = [
"httparse",
"httpdate",
"itoa",
- "pin-project-lite 0.2.12",
+ "pin-project-lite 0.2.10",
"socket2 0.4.9",
"tokio",
"tower-service",
@@ -3651,7 +3604,7 @@ dependencies = [
"rustls 0.20.8",
"rustls-native-certs",
"tokio",
- "tokio-rustls 0.23.4",
+ "tokio-rustls",
]
[[package]]
@@ -3889,7 +3842,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
dependencies = [
"hermit-abi 0.3.2",
- "rustix 0.38.8",
+ "rustix 0.38.4",
"windows-sys 0.48.0",
]
@@ -3928,9 +3881,9 @@ dependencies = [
[[package]]
name = "jsonrpsee"
-version = "0.16.3"
+version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "367a292944c07385839818bb71c8d76611138e2dedb0677d035b8da21d29c78b"
+checksum = "7d291e3a5818a2384645fd9756362e6d89cf0541b0b916fa7702ea4a9833608e"
dependencies = [
"jsonrpsee-core",
"jsonrpsee-proc-macros",
@@ -3942,9 +3895,9 @@ dependencies = [
[[package]]
name = "jsonrpsee-client-transport"
-version = "0.16.3"
+version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8b3815d9f5d5de348e5f162b316dc9cdf4548305ebb15b4eb9328e66cf27d7a"
+checksum = "965de52763f2004bc91ac5bcec504192440f0b568a5d621c59d9dbd6f886c3fb"
dependencies = [
"futures-util",
"http",
@@ -3955,17 +3908,17 @@ dependencies = [
"soketto",
"thiserror",
"tokio",
- "tokio-rustls 0.24.1",
+ "tokio-rustls",
"tokio-util",
"tracing",
- "webpki-roots 0.25.2",
+ "webpki-roots",
]
[[package]]
name = "jsonrpsee-core"
-version = "0.16.3"
+version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b5dde66c53d6dcdc8caea1874a45632ec0fcf5b437789f1e45766a1512ce803"
+checksum = "a4e70b4439a751a5de7dd5ed55eacff78ebf4ffe0fc009cb1ebb11417f5b536b"
dependencies = [
"anyhow",
"arrayvec 0.7.4",
@@ -3991,9 +3944,9 @@ dependencies = [
[[package]]
name = "jsonrpsee-proc-macros"
-version = "0.16.3"
+version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44e8ab85614a08792b9bff6c8feee23be78c98d0182d4c622c05256ab553892a"
+checksum = "baa6da1e4199c10d7b1d0a6e5e8bd8e55f351163b6f4b3cbb044672a69bd4c1c"
dependencies = [
"heck",
"proc-macro-crate",
@@ -4004,9 +3957,9 @@ dependencies = [
[[package]]
name = "jsonrpsee-server"
-version = "0.16.3"
+version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4d945a6008c9b03db3354fb3c83ee02d2faa9f2e755ec1dfb69c3551b8f4ba"
+checksum = "1fb69dad85df79527c019659a992498d03f8495390496da2f07e6c24c2b356fc"
dependencies = [
"futures-channel",
"futures-util",
@@ -4026,9 +3979,9 @@ dependencies = [
[[package]]
name = "jsonrpsee-types"
-version = "0.16.3"
+version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "245ba8e5aa633dd1c1e4fae72bce06e71f42d34c14a2767c6b4d173b57bee5e5"
+checksum = "5bd522fe1ce3702fd94812965d7bb7a3364b1c9aba743944c5a00529aae80f8c"
dependencies = [
"anyhow",
"beef",
@@ -4040,9 +3993,9 @@ dependencies = [
[[package]]
name = "jsonrpsee-ws-client"
-version = "0.16.3"
+version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e1b3975ed5d73f456478681a417128597acd6a2487855fdb7b4a3d4d195bf5e"
+checksum = "0b83daeecfc6517cfe210df24e570fb06213533dfb990318fae781f4c7119dd9"
dependencies = [
"http",
"jsonrpsee-client-transport",
@@ -4254,6 +4207,12 @@ dependencies = [
"winapi",
]
+[[package]]
+name = "libm"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
+
[[package]]
name = "libm"
version = "0.2.7"
@@ -4302,7 +4261,7 @@ checksum = "b6a8fcd392ff67af6cc3f03b1426c41f7f26b6b9aff2dc632c1c56dd649e571f"
dependencies = [
"asn1_der",
"bs58",
- "ed25519-dalek 1.0.1",
+ "ed25519-dalek",
"either",
"fnv",
"futures 0.3.28",
@@ -4393,12 +4352,12 @@ dependencies = [
[[package]]
name = "libp2p-identity"
-version = "0.1.3"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "276bb57e7af15d8f100d3c11cbdd32c6752b7eef4ba7a18ecf464972c07abcce"
+checksum = "9e2d584751cecb2aabaa56106be6be91338a60a0f4e420cf2af639204f596fc1"
dependencies = [
"bs58",
- "ed25519-dalek 2.0.0",
+ "ed25519-dalek",
"log",
"multiaddr 0.17.1",
"multihash 0.17.0",
@@ -4696,7 +4655,7 @@ dependencies = [
"rw-stream-sink",
"soketto",
"url",
- "webpki-roots 0.22.6",
+ "webpki-roots",
]
[[package]]
@@ -4851,9 +4810,9 @@ dependencies = [
[[package]]
name = "log"
-version = "0.4.20"
+version = "0.4.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
[[package]]
name = "lru"
@@ -5471,9 +5430,9 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
[[package]]
name = "num-bigint"
-version = "0.4.4"
+version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
+checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f"
dependencies = [
"autocfg",
"num-integer",
@@ -5482,9 +5441,9 @@ dependencies = [
[[package]]
name = "num-complex"
-version = "0.4.4"
+version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214"
+checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d"
dependencies = [
"num-traits",
]
@@ -5528,7 +5487,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
dependencies = [
"autocfg",
- "libm",
+ "libm 0.2.7",
]
[[package]]
@@ -5555,9 +5514,9 @@ dependencies = [
[[package]]
name = "object"
-version = "0.32.0"
+version = "0.31.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe"
+checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1"
dependencies = [
"memchr",
]
@@ -5821,6 +5780,16 @@ dependencies = [
"sha2 0.10.7",
]
+[[package]]
+name = "packed_simd_2"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282"
+dependencies = [
+ "cfg-if",
+ "libm 0.1.4",
+]
+
[[package]]
name = "pallet-asset-tx-payment"
version = "4.0.0-dev"
@@ -7130,7 +7099,7 @@ dependencies = [
"pest_meta",
"proc-macro2",
"quote",
- "syn 2.0.29",
+ "syn 2.0.28",
]
[[package]]
@@ -7146,32 +7115,32 @@ dependencies = [
[[package]]
name = "petgraph"
-version = "0.6.4"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
+checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4"
dependencies = [
"fixedbitset",
- "indexmap 2.0.0",
+ "indexmap 1.9.3",
]
[[package]]
name = "pin-project"
-version = "1.1.3"
+version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422"
+checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842"
dependencies = [
"pin-project-internal",
]
[[package]]
name = "pin-project-internal"
-version = "1.1.3"
+version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
+checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.29",
+ "syn 2.0.28",
]
[[package]]
@@ -7182,9 +7151,9 @@ checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777"
[[package]]
name = "pin-project-lite"
-version = "0.2.12"
+version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05"
+checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57"
[[package]]
name = "pin-utils"
@@ -7198,18 +7167,8 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba"
dependencies = [
- "der 0.6.1",
- "spki 0.6.0",
-]
-
-[[package]]
-name = "pkcs8"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
-dependencies = [
- "der 0.7.8",
- "spki 0.7.2",
+ "der",
+ "spki",
]
[[package]]
@@ -8553,7 +8512,7 @@ dependencies = [
"concurrent-queue",
"libc",
"log",
- "pin-project-lite 0.2.12",
+ "pin-project-lite 0.2.10",
"windows-sys 0.48.0",
]
@@ -8869,9 +8828,9 @@ dependencies = [
[[package]]
name = "quote"
-version = "1.0.33"
+version = "1.0.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965"
dependencies = [
"proc-macro2",
]
@@ -9008,7 +8967,7 @@ checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd"
dependencies = [
"pem",
"ring",
- "time 0.3.27",
+ "time 0.3.24",
"x509-parser 0.13.2",
"yasna",
]
@@ -9021,7 +8980,7 @@ checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b"
dependencies = [
"pem",
"ring",
- "time 0.3.27",
+ "time 0.3.24",
"yasna",
]
@@ -9069,22 +9028,22 @@ dependencies = [
[[package]]
name = "ref-cast"
-version = "1.0.20"
+version = "1.0.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acde58d073e9c79da00f2b5b84eed919c8326832648a5b109b3fce1bb1175280"
+checksum = "61ef7e18e8841942ddb1cf845054f8008410030a3997875d9e49b7a363063df1"
dependencies = [
"ref-cast-impl",
]
[[package]]
name = "ref-cast-impl"
-version = "1.0.20"
+version = "1.0.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925"
+checksum = "2dfaf0c85b766276c797f3791f5bc6d5bd116b41d53049af2789666b0c0bc9fa"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.29",
+ "syn 2.0.28",
]
[[package]]
@@ -9101,13 +9060,13 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.9.3"
+version = "1.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a"
+checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575"
dependencies = [
"aho-corasick",
"memchr",
- "regex-automata 0.3.6",
+ "regex-automata 0.3.4",
"regex-syntax 0.7.4",
]
@@ -9122,9 +9081,9 @@ dependencies = [
[[package]]
name = "regex-automata"
-version = "0.3.6"
+version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69"
+checksum = "b7b6d6190b7594385f61bd3911cd1be99dfddcfc365a4160cc2ab5bff4aed294"
dependencies = [
"aho-corasick",
"memchr",
@@ -9425,11 +9384,11 @@ dependencies = [
[[package]]
name = "rustix"
-version = "0.38.8"
+version = "0.38.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f"
+checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5"
dependencies = [
- "bitflags 2.4.0",
+ "bitflags 2.3.3",
"errno 0.3.2",
"libc",
"linux-raw-sys 0.4.5",
@@ -9461,18 +9420,6 @@ dependencies = [
"webpki 0.22.0",
]
-[[package]]
-name = "rustls"
-version = "0.21.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb"
-dependencies = [
- "log",
- "ring",
- "rustls-webpki",
- "sct 0.7.0",
-]
-
[[package]]
name = "rustls-native-certs"
version = "0.6.3"
@@ -9494,16 +9441,6 @@ dependencies = [
"base64 0.21.2",
]
-[[package]]
-name = "rustls-webpki"
-version = "0.101.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d"
-dependencies = [
- "ring",
- "untrusted",
-]
-
[[package]]
name = "rustversion"
version = "1.0.14"
@@ -10762,9 +10699,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
dependencies = [
"base16ct",
- "der 0.6.1",
+ "der",
"generic-array 0.14.7",
- "pkcs8 0.9.0",
+ "pkcs8",
"subtle",
"zeroize",
]
@@ -10854,29 +10791,29 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
[[package]]
name = "serde"
-version = "1.0.186"
+version = "1.0.180"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f5db24220c009de9bd45e69fb2938f4b6d2df856aa9304ce377b3180f83b7c1"
+checksum = "0ea67f183f058fe88a4e3ec6e2788e003840893b91bac4559cabedd00863b3ed"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.186"
+version = "1.0.180"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ad697f7e0b65af4983a4ce8f56ed5b357e8d3c36651bf6a7e13639c17b8e670"
+checksum = "24e744d7782b686ab3b73267ef05697159cc0e5abbed3f47f9933165e5219036"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.29",
+ "syn 2.0.28",
]
[[package]]
name = "serde_json"
-version = "1.0.105"
+version = "1.0.104"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360"
+checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c"
dependencies = [
"itoa",
"ryu",
@@ -11008,12 +10945,6 @@ dependencies = [
"rand_core 0.6.4",
]
-[[package]]
-name = "signature"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500"
-
[[package]]
name = "simba"
version = "0.5.1"
@@ -11028,15 +10959,15 @@ dependencies = [
[[package]]
name = "siphasher"
-version = "0.3.11"
+version = "0.3.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
[[package]]
name = "slab"
-version = "0.4.9"
+version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
dependencies = [
"autocfg",
]
@@ -11082,14 +11013,14 @@ checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831"
[[package]]
name = "snow"
-version = "0.9.3"
+version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c9d1425eb528a21de2755c75af4c9b5d57f50a0d4c3b7f1828a4cd03f8ba155"
+checksum = "5ccba027ba85743e09d15c03296797cad56395089b832b48b5a5217880f57733"
dependencies = [
"aes-gcm 0.9.4",
"blake2",
"chacha20poly1305",
- "curve25519-dalek 4.0.0",
+ "curve25519-dalek 4.0.0-rc.1",
"rand_core 0.6.4",
"ring",
"rustc_version 0.4.0",
@@ -11470,8 +11401,8 @@ version = "7.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672"
dependencies = [
"bytes",
- "ed25519 1.5.3",
- "ed25519-dalek 1.0.1",
+ "ed25519",
+ "ed25519-dalek",
"futures 0.3.28",
"libsecp256k1",
"log",
@@ -11863,24 +11794,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b"
dependencies = [
"base64ct",
- "der 0.6.1",
-]
-
-[[package]]
-name = "spki"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a"
-dependencies = [
- "base64ct",
- "der 0.7.8",
+ "der",
]
[[package]]
name = "ss58-registry"
-version = "1.43.0"
+version = "1.41.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e6915280e2d0db8911e5032a5c275571af6bdded2916abd691a659be25d3439"
+checksum = "bfc443bad666016e012538782d9e3006213a7db43e9fb1dda91657dc06a6fa08"
dependencies = [
"Inflector",
"num-format",
@@ -12182,9 +12103,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.29"
+version = "2.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a"
+checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567"
dependencies = [
"proc-macro2",
"quote",
@@ -12238,14 +12159,14 @@ checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a"
[[package]]
name = "tempfile"
-version = "3.8.0"
+version = "3.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
+checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998"
dependencies = [
"cfg-if",
"fastrand 2.0.0",
"redox_syscall 0.3.5",
- "rustix 0.38.8",
+ "rustix 0.38.4",
"windows-sys 0.48.0",
]
@@ -12315,22 +12236,22 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "1.0.47"
+version = "1.0.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f"
+checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.47"
+version = "1.0.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b"
+checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.29",
+ "syn 2.0.28",
]
[[package]]
@@ -12405,9 +12326,9 @@ dependencies = [
[[package]]
name = "time"
-version = "0.3.27"
+version = "0.3.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bb39ee79a6d8de55f48f2293a830e040392f1c5f16e336bdd1788cd0aadce07"
+checksum = "b79eabcd964882a646b3584543ccabeae7869e9ac32a46f6f22b7a5bd405308b"
dependencies = [
"deranged",
"itoa",
@@ -12424,9 +12345,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
[[package]]
name = "time-macros"
-version = "0.2.13"
+version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "733d258752e9303d392b94b75230d07b0b9c489350c69b851fc6c065fde3e8f9"
+checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd"
dependencies = [
"time-core",
]
@@ -12477,19 +12398,20 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
-version = "1.32.0"
+version = "1.29.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9"
+checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da"
dependencies = [
+ "autocfg",
"backtrace",
"bytes",
"libc",
"mio",
"num_cpus",
"parking_lot 0.12.1",
- "pin-project-lite 0.2.12",
+ "pin-project-lite 0.2.10",
"signal-hook-registry",
- "socket2 0.5.3",
+ "socket2 0.4.9",
"tokio-macros",
"windows-sys 0.48.0",
]
@@ -12502,7 +12424,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.29",
+ "syn 2.0.28",
]
[[package]]
@@ -12516,16 +12438,6 @@ dependencies = [
"webpki 0.22.0",
]
-[[package]]
-name = "tokio-rustls"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
-dependencies = [
- "rustls 0.21.6",
- "tokio",
-]
-
[[package]]
name = "tokio-stream"
version = "0.1.14"
@@ -12533,7 +12445,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
dependencies = [
"futures-core",
- "pin-project-lite 0.2.12",
+ "pin-project-lite 0.2.10",
"tokio",
"tokio-util",
]
@@ -12548,7 +12460,7 @@ dependencies = [
"futures-core",
"futures-io",
"futures-sink",
- "pin-project-lite 0.2.12",
+ "pin-project-lite 0.2.10",
"tokio",
"tracing",
]
@@ -12603,7 +12515,7 @@ dependencies = [
"http",
"http-body",
"http-range-header",
- "pin-project-lite 0.2.12",
+ "pin-project-lite 0.2.10",
"tower-layer",
"tower-service",
]
@@ -12628,7 +12540,7 @@ checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
dependencies = [
"cfg-if",
"log",
- "pin-project-lite 0.2.12",
+ "pin-project-lite 0.2.10",
"tracing-attributes",
"tracing-core",
]
@@ -12641,7 +12553,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.29",
+ "syn 2.0.28",
]
[[package]]
@@ -13123,7 +13035,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.29",
+ "syn 2.0.28",
"wasm-bindgen-shared",
]
@@ -13157,7 +13069,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.29",
+ "syn 2.0.28",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -13287,7 +13199,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57d20cb3c59b788653d99541c646c561c9dd26506f25c0cebfe810659c54c6d7"
dependencies = [
"downcast-rs",
- "libm",
+ "libm 0.2.7",
"memory_units",
"num-rational",
"num-traits",
@@ -13300,7 +13212,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c5bf998ab792be85e20e771fe14182b4295571ad1d4f89d3da521c1bef5f597a"
dependencies = [
"downcast-rs",
- "libm",
+ "libm 0.2.7",
"num-traits",
]
@@ -13531,12 +13443,6 @@ dependencies = [
"webpki 0.22.0",
]
-[[package]]
-name = "webpki-roots"
-version = "0.25.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc"
-
[[package]]
name = "webrtc"
version = "0.6.0"
@@ -13563,7 +13469,7 @@ dependencies = [
"sha2 0.10.7",
"stun",
"thiserror",
- "time 0.3.27",
+ "time 0.3.24",
"tokio",
"turn",
"url",
@@ -13595,9 +13501,9 @@ dependencies = [
[[package]]
name = "webrtc-dtls"
-version = "0.7.2"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a00f4242f2db33307347bd5be53263c52a0331c96c14292118c9a6bb48d267"
+checksum = "942be5bd85f072c3128396f6e5a9bfb93ca8c1939ded735d177b7bcba9a13d05"
dependencies = [
"aes 0.6.0",
"aes-gcm 0.10.2",
@@ -13612,24 +13518,25 @@ dependencies = [
"hkdf",
"hmac 0.12.1",
"log",
+ "oid-registry 0.6.1",
"p256",
"p384",
"rand 0.8.5",
"rand_core 0.6.4",
- "rcgen 0.10.0",
+ "rcgen 0.9.3",
"ring",
"rustls 0.19.1",
"sec1",
"serde",
"sha1",
"sha2 0.10.7",
- "signature 1.6.4",
+ "signature",
"subtle",
"thiserror",
"tokio",
"webpki 0.21.4",
"webrtc-util",
- "x25519-dalek 2.0.0",
+ "x25519-dalek 2.0.0-pre.1",
"x509-parser 0.13.2",
]
@@ -13959,17 +13866,17 @@ dependencies = [
[[package]]
name = "windows-targets"
-version = "0.48.5"
+version = "0.48.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f"
dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc 0.48.5",
+ "windows_aarch64_gnullvm 0.48.0",
+ "windows_aarch64_msvc 0.48.0",
+ "windows_i686_gnu 0.48.0",
+ "windows_i686_msvc 0.48.0",
+ "windows_x86_64_gnu 0.48.0",
+ "windows_x86_64_gnullvm 0.48.0",
+ "windows_x86_64_msvc 0.48.0",
]
[[package]]
@@ -13980,9 +13887,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
[[package]]
name = "windows_aarch64_gnullvm"
-version = "0.48.5"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
[[package]]
name = "windows_aarch64_msvc"
@@ -14004,9 +13911,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
[[package]]
name = "windows_aarch64_msvc"
-version = "0.48.5"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
[[package]]
name = "windows_i686_gnu"
@@ -14028,9 +13935,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
[[package]]
name = "windows_i686_gnu"
-version = "0.48.5"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
[[package]]
name = "windows_i686_msvc"
@@ -14052,9 +13959,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
[[package]]
name = "windows_i686_msvc"
-version = "0.48.5"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
[[package]]
name = "windows_x86_64_gnu"
@@ -14076,9 +13983,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
[[package]]
name = "windows_x86_64_gnu"
-version = "0.48.5"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
[[package]]
name = "windows_x86_64_gnullvm"
@@ -14088,9 +13995,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
[[package]]
name = "windows_x86_64_gnullvm"
-version = "0.48.5"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
[[package]]
name = "windows_x86_64_msvc"
@@ -14112,15 +14019,15 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
[[package]]
name = "windows_x86_64_msvc"
-version = "0.48.5"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
[[package]]
name = "winnow"
-version = "0.5.15"
+version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc"
+checksum = "f46aab759304e4d7b2075a9aecba26228bb073ee8c50db796b2c72c676b5d807"
dependencies = [
"memchr",
]
@@ -14157,13 +14064,12 @@ dependencies = [
[[package]]
name = "x25519-dalek"
-version = "2.0.0"
+version = "2.0.0-pre.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96"
+checksum = "e5da623d8af10a62342bcbbb230e33e58a63255a58012f8653c578e54bab48df"
dependencies = [
- "curve25519-dalek 4.0.0",
+ "curve25519-dalek 3.2.0",
"rand_core 0.6.4",
- "serde",
"zeroize",
]
@@ -14183,7 +14089,7 @@ dependencies = [
"ring",
"rusticata-macros",
"thiserror",
- "time 0.3.27",
+ "time 0.3.24",
]
[[package]]
@@ -14201,7 +14107,7 @@ dependencies = [
"oid-registry 0.6.1",
"rusticata-macros",
"thiserror",
- "time 0.3.27",
+ "time 0.3.24",
]
[[package]]
@@ -14318,7 +14224,7 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd"
dependencies = [
- "time 0.3.27",
+ "time 0.3.24",
]
[[package]]
@@ -14548,7 +14454,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.29",
+ "syn 2.0.28",
]
[[package]]
@@ -14579,11 +14485,15 @@ dependencies = [
"pallet-balances",
"pallet-randomness-collective-flip",
"pallet-timestamp",
+ "pallet-treasury",
"parity-scale-codec",
"rand 0.8.5",
+ "rand_chacha 0.3.1",
"scale-info",
+ "sp-arithmetic",
"sp-io",
"sp-runtime",
+ "test-case",
"zeitgeist-primitives",
"zrml-market-commons",
]
@@ -14771,6 +14681,9 @@ dependencies = [
"frame-benchmarking",
"frame-support",
"frame-system",
+ "orml-currencies",
+ "orml-tokens",
+ "orml-traits",
"pallet-balances",
"pallet-timestamp",
"parity-scale-codec",
diff --git a/Cargo.toml b/Cargo.toml
index 89644a91c..899a30cb3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -256,6 +256,7 @@ hex-literal = { version = "0.3.4", default-features = false }
log = { version = "0.4.17", default-features = false }
num-traits = { version = "0.2.15", default-features = false }
rand = { version = "0.8.5", default-features = false }
+rand_chacha = { version = "0.3.1", default-features = false }
serde = { version = "1.0.152", default-features = false }
[profile.dev.package]
diff --git a/docs/changelog_for_devs.md b/docs/changelog_for_devs.md
index e8420bcac..953ffe489 100644
--- a/docs/changelog_for_devs.md
+++ b/docs/changelog_for_devs.md
@@ -8,10 +8,88 @@ and does not represent a complete changelog for the zeitgeistpm/zeitgeist
repository.
As of 0.3.9, the changelog's format is based on
-https://keepachangelog.com/en/1.0.0/ and ⚠️ marks changes that might break
+ and ⚠️ marks changes that might break
components which query the chain's storage, the extrinsics or the runtime
APIs/RPC interface.
+## v0.4.0
+
+[#976]: https://github.com/zeitgeistpm/zeitgeist/pull/976
+
+### Changed
+
+All things about Global Disputes Fix ⚠️ :
+
+- Replace `WinnerInfo` by `GlobalDisputeInfo` with the following fields:
+ - `winner_outcome: OutcomeReport`
+ - `outcome_info: OutcomeInfo`
+ - `status: GdStatus`
+
+### Removed
+
+All things about Global Disputes Fix ⚠️ :
+
+- Remove the following event:
+ - `OutcomeOwnersRewardedWithNoFunds`
+
+### Added
+
+- ⚠️ Add court production implementation ([#976]). Dispatchable calls are:
+ - `join_court` - Join the court with a stake to become a juror in order to get
+ the stake-weighted chance to be selected for decision making.
+ - `delegate` - Join the court with a stake to become a delegator in order to
+ delegate the voting power to actively participating jurors.
+ - `prepare_exit_court` - Prepare as a court participant to leave the court
+ system.
+ - `exit_court` - Exit the court system in order to get the stake back.
+ - `vote` - An actively participating juror votes secretely on a specific court
+ case, in which the juror got selected.
+ - `denounce_vote` - Denounce a selected and active juror, if the secret and
+ vote is known before the actual reveal period.
+ - `reveal_vote` - An actively participating juror reveals the previously
+ casted secret vote.
+ - `appeal` - After the reveal phase (aggregation period), the jurors decision
+ can be appealed.
+ - `reassign_juror_stakes` - After the appeal period is over, losers pay the
+ winners for the jurors and delegators.
+ - `set_inflation` - Set the yearly inflation rate of the court system. Events
+ are:
+ - `JurorJoined` - A juror joined the court system.
+ - `ExitPrepared` - A court participant prepared to exit the court system.
+ - `ExitedCourt` - A court participant exited the court system.
+ - `JurorVoted` - A juror voted on a specific court case.
+ - `JurorRevealedVote` - A juror revealed the previously casted secret vote.
+ - `DenouncedJurorVote` - A juror was denounced.
+ - `DelegatorJoined` - A delegator joined the court system.
+ - `CourtAppealed` - A court case was appealed.
+ - `MintedInCourt` - A court participant was rewarded with newly minted tokens.
+ - `StakesReassigned` - The juror and delegator stakes have been reassigned.
+ The losing jurors have been slashed. The winning jurors have been rewarded
+ by the losers. The losing jurors are those, who did not vote, or did not
+ vote with the plurality, were denounced or did not reveal their vote.
+ - `InflationSet` - The yearly inflation rate of the court system was set.
+
+All things about Global Disputes Fix ⚠️ :
+
+- Add new dispatchable function:
+ - `refund_vote_fees` - Return all vote funds and fees, when a global dispute
+ was destroyed.
+- Add the following events:
+ - `OutcomeOwnerRewarded` for `Possession::Paid`
+ - `OutcomeOwnersRewarded` for `Possession::Shared`
+ - `OutcomesFullyCleaned` and `OutcomesPartiallyCleaned` for extrinsic
+ `refund_vote_fees`
+- Add enum `Possession` with variants:
+- `Paid { owner: AccountId, fee: Balance }`
+- `Shared { owners: BoundedVec }`
+- `OutcomeInfo` has the following fields:
+ - `outcome_sum: Balance`
+ - `possession: Possession`
+- Add `GdStatus` with the following enum variants:
+ - `Active { add_outcome_end: BlockNumber, vote_end: BlockNumber }`
+ - `Finished`
+ - `Destroyed`
+
## v0.3.11
[#1049]: https://github.com/zeitgeistpm/zeitgeist/pull/1049
@@ -19,9 +97,10 @@ APIs/RPC interface.
### Changed
- ⚠️ All tokens now use 10 fractional decimal places ([#1049]).
-- Cross-consensus messages (XCM) assume the global canonical representation for token balances.
-- The token metadata in the asset registry now assumes that the existential deposit and fee factor
- are stored in base 10,000,000,000.
+- Cross-consensus messages (XCM) assume the global canonical representation for
+ token balances.
+- The token metadata in the asset registry now assumes that the existential
+ deposit and fee factor are stored in base 10,000,000,000.
## v0.3.10
@@ -113,7 +192,7 @@ APIs/RPC interface.
- Added xTokens pallet to transfer tokens accross chains
- Added AssetRegistry pallet to register foreign asset
- Added UnknownTokens pallet to handle unknown foreign assets
- - More information at https://github.com/zeitgeistpm/zeitgeist/pull/661#top
+ - More information at
- Transformed integer scalar markets to fixed point with ten digits after the
decimal point. As soon as this update is deployed, the interpretation of the
@@ -212,8 +291,8 @@ APIs/RPC interface.
- The `MarketCounter` of the `market-commons` pallet is incremented by one. This
means that `MarketCounter` is now equal to the total number of markets ever
created, instead of equal to the id of the last market created. For details
- regarding this fix, see https://github.com/zeitgeistpm/zeitgeist/pull/636 and
- https://github.com/zeitgeistpm/zeitgeist/issues/365.
+ regarding this fix, see
+ and .
- Made the `min_asset_amount_out` and `max_price` parameters of
`swap_exact_amount_in` and the `max_asset_amount_in` and `max_price`
diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml
index 63c6ce2e4..0e44d19a0 100644
--- a/primitives/Cargo.toml
+++ b/primitives/Cargo.toml
@@ -28,7 +28,6 @@ std = [
"sp-core/std",
"sp-runtime/std",
]
-with-global-disputes = []
[package]
authors = ["Zeitgeist PM "]
diff --git a/primitives/src/constants.rs b/primitives/src/constants.rs
index f1a7f47dc..6e0b6d3a3 100644
--- a/primitives/src/constants.rs
+++ b/primitives/src/constants.rs
@@ -30,11 +30,11 @@ use crate::types::{Balance, BlockNumber};
use frame_support::{parameter_types, PalletId};
// Definitions for time
-pub const BLOCKS_PER_YEAR: BlockNumber = (BLOCKS_PER_DAY * 36525) / 100;
-pub const BLOCKS_PER_DAY: BlockNumber = BLOCKS_PER_HOUR * 24;
+pub const BLOCKS_PER_YEAR: BlockNumber = (BLOCKS_PER_DAY * 36525) / 100; // 2_629_800
+pub const BLOCKS_PER_DAY: BlockNumber = BLOCKS_PER_HOUR * 24; // 7_200
pub const MILLISECS_PER_BLOCK: u32 = 12000;
-pub const BLOCKS_PER_MINUTE: BlockNumber = 60_000 / (MILLISECS_PER_BLOCK as BlockNumber);
-pub const BLOCKS_PER_HOUR: BlockNumber = BLOCKS_PER_MINUTE * 60;
+pub const BLOCKS_PER_MINUTE: BlockNumber = 60_000 / (MILLISECS_PER_BLOCK as BlockNumber); // 5
+pub const BLOCKS_PER_HOUR: BlockNumber = BLOCKS_PER_MINUTE * 60; // 300
// Definitions for currency
pub const BASE: u128 = 10_000_000_000;
@@ -70,6 +70,8 @@ pub const AUTHORIZED_PALLET_ID: PalletId = PalletId(*b"zge/atzd");
// Court
/// Pallet identifier, mainly used for named balance reserves.
pub const COURT_PALLET_ID: PalletId = PalletId(*b"zge/cout");
+/// Lock identifier, mainly used for the locks on the accounts.
+pub const COURT_LOCK_ID: [u8; 8] = *b"zge/colk";
// Global Disputes
pub const GLOBAL_DISPUTES_PALLET_ID: PalletId = PalletId(*b"zge/gldp");
diff --git a/primitives/src/constants/mock.rs b/primitives/src/constants/mock.rs
index 3c0f64294..05626c688 100644
--- a/primitives/src/constants/mock.rs
+++ b/primitives/src/constants/mock.rs
@@ -34,19 +34,33 @@ parameter_types! {
// Court
parameter_types! {
- pub const CourtCaseDuration: u64 = BLOCKS_PER_DAY;
+ pub const AppealBond: Balance = 5 * BASE;
+ pub const AppealBondFactor: Balance = 2 * BASE;
+ pub const BlocksPerYear: BlockNumber = 10000;
pub const CourtPalletId: PalletId = PalletId(*b"zge/cout");
- pub const StakeWeight: u128 = 2 * BASE;
+ pub const RequestInterval: BlockNumber = 15;
+ pub const VotePeriod: BlockNumber = 3;
+ pub const AggregationPeriod: BlockNumber = 4;
+ pub const AppealPeriod: BlockNumber = 5;
+ pub const LockId: LockIdentifier = *b"zge/cloc";
+ pub const MaxAppeals: u32 = 4;
+ pub const MaxDelegations: u32 = 5;
+ pub const MaxSelectedDraws: u32 = 510;
+ pub const MaxCourtParticipants: u32 = 1_000;
+ pub const MinJurorStake: Balance = 50 * CENT;
+ pub const InflationPeriod: BlockNumber = 20;
}
// Global disputes parameters
parameter_types! {
+ pub const AddOutcomePeriod: BlockNumber = 20;
pub const GlobalDisputeLockId: LockIdentifier = *b"zge/vote";
pub const GlobalDisputesPalletId: PalletId = PalletId(*b"zge/gldp");
pub const MaxGlobalDisputeVotes: u32 = 50;
pub const MaxOwners: u32 = 10;
pub const MinOutcomeVoteAmount: Balance = 10 * CENT;
pub const RemoveKeysLimit: u32 = 250;
+ pub const GdVotingPeriod: BlockNumber = 140;
pub const VotingOutcomeFee: Balance = 100 * CENT;
}
@@ -60,7 +74,6 @@ parameter_types! {
pub const AdvisoryBond: Balance = 25 * CENT;
pub const DisputeBond: Balance = 5 * BASE;
pub const DisputeFactor: Balance = 2 * BASE;
- pub const GlobalDisputePeriod: BlockNumber = 7 * BLOCKS_PER_DAY;
pub const MaxCategories: u16 = 10;
pub const MaxDisputeDuration: BlockNumber = 50;
pub const MaxDisputes: u16 = 6;
@@ -85,6 +98,8 @@ parameter_types! {
// Simple disputes parameters
parameter_types! {
pub const SimpleDisputesPalletId: PalletId = PalletId(*b"zge/sedp");
+ pub const OutcomeBond: Balance = 5 * BASE;
+ pub const OutcomeFactor: Balance = 2 * BASE;
}
// Swaps parameters
diff --git a/primitives/src/market.rs b/primitives/src/market.rs
index 7a2cc3127..3deb85494 100644
--- a/primitives/src/market.rs
+++ b/primitives/src/market.rs
@@ -88,6 +88,7 @@ pub struct MarketBonds {
pub creation: Option>,
pub oracle: Option>,
pub outsider: Option>,
+ pub dispute: Option>,
}
impl MarketBonds {
@@ -100,13 +101,14 @@ impl MarketBonds {
value_or_default(&self.creation)
.saturating_add(value_or_default(&self.oracle))
.saturating_add(value_or_default(&self.outsider))
+ .saturating_add(value_or_default(&self.dispute))
}
}
// Used primarily for testing purposes.
impl Default for MarketBonds {
fn default() -> Self {
- MarketBonds { creation: None, oracle: None, outsider: None }
+ MarketBonds { creation: None, oracle: None, outsider: None, dispute: None }
}
}
@@ -175,11 +177,32 @@ pub enum MarketCreation {
Advised,
}
+/// Defines a global dispute item for the initialisation of a global dispute.
+#[derive(Clone, Decode, Encode, MaxEncodedLen, PartialEq, Eq, RuntimeDebug, TypeInfo)]
+pub struct GlobalDisputeItem {
+ /// The account that already paid somehow for the outcome.
+ pub owner: AccountId,
+ /// The outcome that was already paid for
+ /// and should be added as vote outcome inside global disputes.
+ pub outcome: OutcomeReport,
+ /// The initial amount added in the global dispute vote system initially for the outcome.
+ pub initial_vote_amount: Balance,
+}
+
+// TODO to remove, when Disputes storage item is removed
+#[derive(Clone, Decode, Encode, Eq, MaxEncodedLen, PartialEq, RuntimeDebug, TypeInfo)]
+pub struct OldMarketDispute {
+ pub at: BlockNumber,
+ pub by: AccountId,
+ pub outcome: OutcomeReport,
+}
+
#[derive(Clone, Decode, Encode, Eq, MaxEncodedLen, PartialEq, RuntimeDebug, TypeInfo)]
-pub struct MarketDispute {
+pub struct MarketDispute {
pub at: BlockNumber,
pub by: AccountId,
pub outcome: OutcomeReport,
+ pub bond: Balance,
}
/// How a market should resolve disputes
diff --git a/primitives/src/traits.rs b/primitives/src/traits.rs
index fe7ec219f..a1be3cd57 100644
--- a/primitives/src/traits.rs
+++ b/primitives/src/traits.rs
@@ -22,7 +22,7 @@ mod market_id;
mod swaps;
mod zeitgeist_multi_reservable_currency;
-pub use dispute_api::{DisputeApi, DisputeResolutionApi};
+pub use dispute_api::{DisputeApi, DisputeMaxWeightApi, DisputeResolutionApi};
pub use market_commons_pallet_api::MarketCommonsPalletApi;
pub use market_id::MarketId;
pub use swaps::Swaps;
diff --git a/primitives/src/traits/dispute_api.rs b/primitives/src/traits/dispute_api.rs
index caa7b94f3..7c7accf1c 100644
--- a/primitives/src/traits/dispute_api.rs
+++ b/primitives/src/traits/dispute_api.rs
@@ -16,12 +16,14 @@
// You should have received a copy of the GNU General Public License
// along with Zeitgeist. If not, see .
+extern crate alloc;
+
use crate::{
- market::MarketDispute,
outcome_report::OutcomeReport,
- types::{Asset, Market},
+ types::{Asset, GlobalDisputeItem, Market, ResultWithWeightInfo},
};
-use frame_support::{dispatch::DispatchResult, pallet_prelude::Weight, BoundedVec};
+use alloc::vec::Vec;
+use frame_support::pallet_prelude::Weight;
use parity_scale_codec::MaxEncodedLen;
use sp_runtime::DispatchError;
@@ -35,9 +37,13 @@ type MarketOfDisputeApi = Market<
Asset<::MarketId>,
>;
+type GlobalDisputeItemOfDisputeApi =
+ GlobalDisputeItem<::AccountId, ::Balance>;
+
pub trait DisputeApi {
type AccountId;
type Balance;
+ type NegativeImbalance;
type BlockNumber;
type MarketId: MaxEncodedLen;
type Moment;
@@ -48,10 +54,9 @@ pub trait DisputeApi {
/// Further interaction with the dispute API (if necessary) **should** happen through an
/// associated pallet. **May** assume that `market.dispute_mechanism` refers to the calling dispute API.
fn on_dispute(
- previous_disputes: &[MarketDispute],
market_id: &Self::MarketId,
market: &MarketOfDisputeApi,
- ) -> DispatchResult;
+ ) -> Result, DispatchError>;
/// Manage market resolution of a disputed market.
///
@@ -63,31 +68,81 @@ pub trait DisputeApi {
/// Returns the dispute mechanism's report if available, otherwise `None`. If `None` is
/// returned, this means that the dispute could not be resolved.
fn on_resolution(
- disputes: &[MarketDispute],
market_id: &Self::MarketId,
market: &MarketOfDisputeApi,
- ) -> Result, DispatchError>;
+ ) -> Result>, DispatchError>;
- /// Query the future resolution block of a disputed market.
+ /// Allow the transfer of funds from the API caller to the API consumer and back.
+ /// This can be based on the final resolution outcome of the market.
+ /// **May** assume that `market.dispute_mechanism` refers to the calling dispute API.
+ ///
+ /// # Arguments
+ /// * `market_id` - The identifier of the market.
+ /// * `market` - The market data.
+ /// * `resolved_outcome` - The final resolution outcome of the market.
+ /// * `amount` - The amount of funds transferred to the dispute mechanism.
+ ///
+ /// # Returns
+ /// Returns a negative imbalance in order to transfer funds back to the caller.
+ fn exchange(
+ market_id: &Self::MarketId,
+ market: &MarketOfDisputeApi,
+ resolved_outcome: &OutcomeReport,
+ amount: Self::NegativeImbalance,
+ ) -> Result, DispatchError>;
/// **May** assume that `market.dispute_mechanism` refers to the calling dispute API.
///
/// # Returns
///
/// Returns the future resolution block if available, otherwise `None`.
fn get_auto_resolve(
- disputes: &[MarketDispute],
market_id: &Self::MarketId,
market: &MarketOfDisputeApi,
- ) -> Result, DispatchError>;
+ ) -> ResultWithWeightInfo>;
/// Returns `true` if the market dispute mechanism
/// was unable to come to a conclusion.
/// **May** assume that `market.dispute_mechanism` refers to the calling dispute API.
fn has_failed(
- disputes: &[MarketDispute],
market_id: &Self::MarketId,
market: &MarketOfDisputeApi,
- ) -> Result;
+ ) -> Result, DispatchError>;
+
+ /// Initialise a global dispute for the failed market dispute mechanism.
+ /// **May** assume that `market.dispute_mechanism` refers to the calling dispute API.
+ ///
+ /// # Returns
+ /// Returns the initial vote outcomes with initial vote value and owner of the vote.
+ fn on_global_dispute(
+ market_id: &Self::MarketId,
+ market: &MarketOfDisputeApi,
+ ) -> Result>>, DispatchError>;
+
+ /// Allow the API consumer to clear storage items of the dispute mechanism.
+ /// This may be called, when the dispute mechanism is no longer needed.
+ /// **May** assume that `market.dispute_mechanism` refers to the calling dispute API.
+ fn clear(
+ market_id: &Self::MarketId,
+ market: &MarketOfDisputeApi,
+ ) -> Result, DispatchError>;
+}
+
+pub trait DisputeMaxWeightApi {
+ /// Return the max weight of the `on_dispute` function.
+ fn on_dispute_max_weight() -> Weight;
+ /// Return the max weight of the `on_resolution` function.
+ fn on_resolution_max_weight() -> Weight;
+ /// Return the max weight of the `exchange` function.
+ fn exchange_max_weight() -> Weight;
+ /// Query the future resolution block of a disputed market.
+ /// Return the max weight of the `get_auto_resolve` function.
+ fn get_auto_resolve_max_weight() -> Weight;
+ /// Return the max weight of the `has_failed` function.
+ fn has_failed_max_weight() -> Weight;
+ /// Return the max weight of the `on_global_dispute` function.
+ fn on_global_dispute_max_weight() -> Weight;
+ /// Return the max weight of the `clear` function.
+ fn clear_max_weight() -> Weight;
}
type MarketOfDisputeResolutionApi = Market<
@@ -103,7 +158,6 @@ pub trait DisputeResolutionApi {
type Balance;
type BlockNumber;
type MarketId: MaxEncodedLen;
- type MaxDisputes;
type Moment;
/// Resolve a market.
@@ -142,9 +196,4 @@ pub trait DisputeResolutionApi {
///
/// Returns the number of elements in the storage structure.
fn remove_auto_resolve(market_id: &Self::MarketId, resolve_at: Self::BlockNumber) -> u32;
-
- /// Get the disputes of a market.
- fn get_disputes(
- market_id: &Self::MarketId,
- ) -> BoundedVec, Self::MaxDisputes>;
}
diff --git a/runtime/battery-station/Cargo.toml b/runtime/battery-station/Cargo.toml
index 8805b97c9..ade6c68de 100644
--- a/runtime/battery-station/Cargo.toml
+++ b/runtime/battery-station/Cargo.toml
@@ -324,7 +324,7 @@ std = [
"zrml-prediction-markets/std",
"zrml-rikiddo/std",
"zrml-simple-disputes/std",
- "zrml-global-disputes?/std",
+ "zrml-global-disputes/std",
"zrml-styx/std",
"zrml-swaps-runtime-api/std",
"zrml-swaps/std",
@@ -377,7 +377,7 @@ try-runtime = [
"zrml-prediction-markets/try-runtime",
"zrml-rikiddo/try-runtime",
"zrml-simple-disputes/try-runtime",
- "zrml-global-disputes?/try-runtime",
+ "zrml-global-disputes/try-runtime",
"zrml-styx/try-runtime",
"zrml-swaps/try-runtime",
@@ -386,6 +386,8 @@ try-runtime = [
"pallet-author-mapping?/try-runtime",
"pallet-author-slot-filter?/try-runtime",
"pallet-parachain-staking?/try-runtime",
+ # Required by pallet-parachain-staking@v0.26.1
+ "parity-scale-codec/full",
"pallet-proxy/try-runtime",
"pallet-grandpa/try-runtime",
"pallet-aura/try-runtime",
@@ -399,11 +401,6 @@ try-runtime = [
"cumulus-pallet-xcmp-queue?/try-runtime",
"parachain-info?/try-runtime",
]
-with-global-disputes = [
- "zrml-global-disputes",
- "common-runtime/with-global-disputes",
- "zrml-prediction-markets/with-global-disputes",
-]
[package]
authors = ["Zeitgeist PM "]
diff --git a/runtime/battery-station/src/lib.rs b/runtime/battery-station/src/lib.rs
index 4b050f78c..8e26a9494 100644
--- a/runtime/battery-station/src/lib.rs
+++ b/runtime/battery-station/src/lib.rs
@@ -166,29 +166,34 @@ impl Contains for ContractsCallfilter {
#[derive(scale_info::TypeInfo)]
pub struct IsCallable;
-// Currently disables Court, Rikiddo and creation of markets using Court.
+// Currently disables Rikiddo.
impl Contains for IsCallable {
fn contains(call: &RuntimeCall) -> bool {
#[allow(clippy::match_like_matches_macro)]
match call {
- RuntimeCall::Court(_) => false,
+ RuntimeCall::SimpleDisputes(_) => false,
RuntimeCall::LiquidityMining(_) => false,
RuntimeCall::PredictionMarkets(inner_call) => {
match inner_call {
- // Disable Rikiddo markets
+ // Disable Rikiddo and SimpleDisputes markets
create_market {
scoring_rule: ScoringRule::RikiddoSigmoidFeeMarketEma, ..
} => false,
+ create_market {
+ dispute_mechanism: MarketDisputeMechanism::SimpleDisputes,
+ ..
+ } => false,
edit_market {
scoring_rule: ScoringRule::RikiddoSigmoidFeeMarketEma, ..
} => false,
- // Disable Court dispute resolution mechanism
- create_market { dispute_mechanism: MarketDisputeMechanism::Court, .. } => false,
create_cpmm_market_and_deploy_assets {
- dispute_mechanism: MarketDisputeMechanism::Court,
+ dispute_mechanism: MarketDisputeMechanism::SimpleDisputes,
+ ..
+ } => false,
+ edit_market {
+ dispute_mechanism: MarketDisputeMechanism::SimpleDisputes,
..
} => false,
- edit_market { dispute_mechanism: MarketDisputeMechanism::Court, .. } => false,
_ => true,
}
}
@@ -199,13 +204,6 @@ impl Contains for IsCallable {
decl_common_types!();
-#[cfg(feature = "with-global-disputes")]
-create_runtime_with_additional_pallets!(
- GlobalDisputes: zrml_global_disputes::{Call, Event, Pallet, Storage} = 59,
- Sudo: pallet_sudo::{Call, Config, Event, Pallet, Storage} = 150,
-);
-
-#[cfg(not(feature = "with-global-disputes"))]
create_runtime_with_additional_pallets!(
Sudo: pallet_sudo::{Call, Config, Event, Pallet, Storage} = 150,
);
diff --git a/runtime/battery-station/src/parameters.rs b/runtime/battery-station/src/parameters.rs
index c4e5cf874..b3317c3bc 100644
--- a/runtime/battery-station/src/parameters.rs
+++ b/runtime/battery-station/src/parameters.rs
@@ -26,7 +26,7 @@ use super::{Runtime, VERSION};
use frame_support::{
dispatch::DispatchClass,
parameter_types,
- traits::WithdrawReasons,
+ traits::{LockIdentifier, WithdrawReasons},
weights::{
constants::{BlockExecutionWeight, ExtrinsicBaseWeight, WEIGHT_REF_TIME_PER_SECOND},
Weight,
@@ -43,9 +43,6 @@ use sp_runtime::{
use sp_version::RuntimeVersion;
use zeitgeist_primitives::{constants::*, types::*};
-#[cfg(feature = "with-global-disputes")]
-use frame_support::traits::LockIdentifier;
-
pub(crate) const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(10);
pub(crate) const MAXIMUM_BLOCK_WEIGHT: Weight = Weight::from_parts(
WEIGHT_REF_TIME_PER_SECOND.saturating_div(2),
@@ -105,13 +102,37 @@ parameter_types! {
pub ContractsSchedule: pallet_contracts::Schedule = Default::default();
// Court
- /// Duration of a single court case.
- pub const CourtCaseDuration: u64 = BLOCKS_PER_DAY;
+ /// (Slashable) Bond that is provided for overriding the last appeal.
+ /// This bond increases exponentially with the number of appeals.
+ /// Slashed in case the final outcome does match the appealed outcome for which the `AppealBond`
+ /// was deposited.
+ pub const AppealBond: Balance = 5 * BASE;
+ /// The blocks per year required to calculate the yearly inflation for court incentivisation.
+ pub const BlocksPerYear: BlockNumber = BLOCKS_PER_YEAR;
/// Pallet identifier, mainly used for named balance reserves.
pub const CourtPalletId: PalletId = COURT_PALLET_ID;
- /// This value is multiplied by the current number of jurors to determine the stake
- /// the juror has to pay.
- pub const StakeWeight: u128 = 2 * BASE;
+ /// The time in which the jurors can cast their secret vote.
+ pub const CourtVotePeriod: BlockNumber = 3 * BLOCKS_PER_DAY;
+ /// The time in which the jurors should reveal their secret vote.
+ pub const CourtAggregationPeriod: BlockNumber = 3 * BLOCKS_PER_DAY;
+ /// The time in which a court case can get appealed.
+ pub const CourtAppealPeriod: BlockNumber = BLOCKS_PER_DAY;
+ /// The court lock identifier.
+ pub const CourtLockId: LockIdentifier = COURT_LOCK_ID;
+ /// The time in which the inflation is periodically issued.
+ pub const InflationPeriod: BlockNumber = 3 * BLOCKS_PER_DAY;
+ /// The maximum number of appeals until the court fails.
+ pub const MaxAppeals: u32 = 4;
+ /// The maximum number of delegations per juror account.
+ pub const MaxDelegations: u32 = 5;
+ /// The maximum number of randomly selected `MinJurorStake` draws / atoms of jurors for a dispute.
+ pub const MaxSelectedDraws: u32 = 510;
+ /// The maximum number of jurors / delegators that can be registered.
+ pub const MaxCourtParticipants: u32 = 1_000;
+ /// The minimum stake a user needs to reserve to become a juror.
+ pub const MinJurorStake: Balance = 500 * BASE;
+ /// The interval for requesting multiple court votes at once.
+ pub const RequestInterval: BlockNumber = 7 * BLOCKS_PER_DAY;
// Democracy
/// How often (in blocks) new public referenda are launched.
@@ -179,11 +200,9 @@ parameter_types! {
/// The percentage of the advisory bond that gets slashed when a market is rejected.
pub const AdvisoryBondSlashPercentage: Percent = Percent::from_percent(0);
/// (Slashable) Bond that is provided for disputing the outcome.
- /// Slashed in case the final outcome does not match the dispute for which the `DisputeBond`
- /// was deposited.
- pub const DisputeBond: Balance = 5 * BASE;
- /// `DisputeBond` is increased by this factor after every dispute.
- pub const DisputeFactor: Balance = 2 * BASE;
+ /// Unreserved in case the dispute was justified otherwise slashed.
+ /// This is when the resolved outcome is different to the default (reported) outcome.
+ pub const DisputeBond: Balance = 25 * BASE;
/// Maximum Categories a prediciton market can have (excluding base asset).
pub const MaxCategories: u16 = MAX_CATEGORIES;
/// Maximum block period for a dispute.
@@ -250,6 +269,12 @@ parameter_types! {
// Simple disputes parameters
/// Pallet identifier, mainly used for named balance reserves.
pub const SimpleDisputesPalletId: PalletId = SD_PALLET_ID;
+ /// (Slashable) Bond that is provided for overriding the last outcome addition.
+ /// Slashed in case the final outcome does not match the dispute for which the `OutcomeBond`
+ /// was deposited.
+ pub const OutcomeBond: Balance = 5 * BASE;
+ /// `OutcomeBond` is increased by this factor after every new outcome addition.
+ pub const OutcomeFactor: Balance = 2 * BASE;
// Swaps parameters
/// A precentage from the withdrawal amount a liquidity provider wants to withdraw
@@ -382,21 +407,22 @@ parameter_types! {
WithdrawReasons::except(WithdrawReasons::TRANSFER | WithdrawReasons::RESERVE);
}
-#[cfg(feature = "with-global-disputes")]
parameter_types! {
// Global Disputes
+ /// The time period in which the addition of new outcomes are allowed.
+ pub const AddOutcomePeriod: BlockNumber = BLOCKS_PER_DAY;
/// Vote lock identifier, mainly used for the LockableCurrency on the native token.
pub const GlobalDisputeLockId: LockIdentifier = GLOBAL_DISPUTES_LOCK_ID;
/// Pallet identifier
pub const GlobalDisputesPalletId: PalletId = GLOBAL_DISPUTES_PALLET_ID;
- /// The period for a global dispute to end.
- pub const GlobalDisputePeriod: BlockNumber = 3 * BLOCKS_PER_DAY;
- /// The maximum number of owners for a voting outcome for private API calls of `push_voting_outcome`.
+ /// The maximum number of owners for a voting outcome for private API calls of `push_vote_outcome`.
pub const MaxOwners: u32 = 10;
/// The maximum number of market ids (participate in multiple different global disputes at the same time) for one account to vote on outcomes.
pub const MaxGlobalDisputeVotes: u32 = 50;
/// The minimum required amount to vote on an outcome.
pub const MinOutcomeVoteAmount: Balance = 10 * BASE;
+ /// The time period in which votes are allowed.
+ pub const GdVotingPeriod: BlockNumber = 3 * BLOCKS_PER_DAY;
/// The fee required to add a voting outcome.
pub const VotingOutcomeFee: Balance = 200 * BASE;
/// The remove limit for the Outcomes storage double map.
diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml
index a33d82337..9ed0a7429 100644
--- a/runtime/common/Cargo.toml
+++ b/runtime/common/Cargo.toml
@@ -73,7 +73,6 @@ std = [
"pallet-vesting/std",
"pallet-parachain-staking?/std",
]
-with-global-disputes = []
[package]
authors = ["Zeitgeist PM "]
diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs
index 530beaef1..c43311299 100644
--- a/runtime/common/src/lib.rs
+++ b/runtime/common/src/lib.rs
@@ -60,11 +60,19 @@ macro_rules! decl_common_types {
orml_asset_registry::Migration,
orml_unknown_tokens::Migration,
pallet_xcm::migration::v1::MigrateToV1,
+ // IMPORTANT that AddDisputeBond comes before MoveDataToSimpleDisputes!!!
+ zrml_prediction_markets::migrations::AddDisputeBond,
+ zrml_prediction_markets::migrations::MoveDataToSimpleDisputes,
+ zrml_global_disputes::migrations::ModifyGlobalDisputesStructures,
);
#[cfg(not(feature = "parachain"))]
type Migrations = (
pallet_grandpa::migrations::CleanupSetIdSessionMap,
+ // IMPORTANT that AddDisputeBond comes before MoveDataToSimpleDisputes!!!
+ zrml_prediction_markets::migrations::AddDisputeBond,
+ zrml_prediction_markets::migrations::MoveDataToSimpleDisputes,
+ zrml_global_disputes::migrations::ModifyGlobalDisputesStructures,
);
pub type Executive = frame_executive::Executive<
@@ -186,6 +194,7 @@ macro_rules! decl_common_types {
let mut pallets = vec![
AuthorizedPalletId::get(),
CourtPalletId::get(),
+ GlobalDisputesPalletId::get(),
LiquidityMiningPalletId::get(),
PmPalletId::get(),
SimpleDisputesPalletId::get(),
@@ -193,9 +202,6 @@ macro_rules! decl_common_types {
TreasuryPalletId::get(),
];
- #[cfg(feature = "with-global-disputes")]
- pallets.push(GlobalDisputesPalletId::get());
-
if let Some(pallet_id) = frame_support::PalletId::try_from_sub_account::(ai) {
return pallets.contains(&pallet_id.0);
}
@@ -302,10 +308,11 @@ macro_rules! create_runtime {
Court: zrml_court::{Call, Event, Pallet, Storage} = 52,
LiquidityMining: zrml_liquidity_mining::{Call, Config, Event, Pallet, Storage} = 53,
RikiddoSigmoidFeeMarketEma: zrml_rikiddo::::{Pallet, Storage} = 54,
- SimpleDisputes: zrml_simple_disputes::{Event, Pallet, Storage} = 55,
+ SimpleDisputes: zrml_simple_disputes::{Call, Event, Pallet, Storage} = 55,
Swaps: zrml_swaps::{Call, Event, Pallet, Storage} = 56,
PredictionMarkets: zrml_prediction_markets::{Call, Event, Pallet, Storage} = 57,
Styx: zrml_styx::{Call, Event, Pallet, Storage} = 58,
+ GlobalDisputes: zrml_global_disputes::{Call, Event, Pallet, Storage} = 59,
$($additional_pallets)*
}
@@ -1042,13 +1049,27 @@ macro_rules! impl_config_traits {
}
impl zrml_court::Config for Runtime {
- type CourtCaseDuration = CourtCaseDuration;
+ type AppealBond = AppealBond;
+ type BlocksPerYear = BlocksPerYear;
+ type VotePeriod = CourtVotePeriod;
+ type AggregationPeriod = CourtAggregationPeriod;
+ type AppealPeriod = CourtAppealPeriod;
+ type LockId = CourtLockId;
+ type PalletId = CourtPalletId;
+ type Currency = Balances;
type DisputeResolution = zrml_prediction_markets::Pallet;
type RuntimeEvent = RuntimeEvent;
+ type InflationPeriod = InflationPeriod;
type MarketCommons = MarketCommons;
- type PalletId = CourtPalletId;
+ type MaxAppeals = MaxAppeals;
+ type MaxDelegations = MaxDelegations;
+ type MaxSelectedDraws = MaxSelectedDraws;
+ type MaxCourtParticipants = MaxCourtParticipants;
+ type MinJurorStake = MinJurorStake;
+ type MonetaryGovernanceOrigin = EnsureRoot;
type Random = RandomnessCollectiveFlip;
- type StakeWeight = StakeWeight;
+ type RequestInterval = RequestInterval;
+ type Slash = Treasury;
type TreasuryPalletId = TreasuryPalletId;
type WeightInfo = zrml_court::weights::WeightInfo;
}
@@ -1098,12 +1119,8 @@ macro_rules! impl_config_traits {
type CloseOrigin = EnsureRoot;
type DestroyOrigin = EnsureRootOrAllAdvisoryCommittee;
type DisputeBond = DisputeBond;
- type DisputeFactor = DisputeFactor;
type RuntimeEvent = RuntimeEvent;
- #[cfg(feature = "with-global-disputes")]
type GlobalDisputes = GlobalDisputes;
- #[cfg(feature = "with-global-disputes")]
- type GlobalDisputePeriod = GlobalDisputePeriod;
// LiquidityMining is currently unstable.
// NoopLiquidityMining will be applied only to mainnet once runtimes are separated.
type LiquidityMining = NoopLiquidityMining;
@@ -1153,15 +1170,21 @@ macro_rules! impl_config_traits {
}
impl zrml_simple_disputes::Config for Runtime {
+ type AssetManager = AssetManager;
+ type OutcomeBond = OutcomeBond;
+ type OutcomeFactor = OutcomeFactor;
type DisputeResolution = zrml_prediction_markets::Pallet;
type RuntimeEvent = RuntimeEvent;
type MarketCommons = MarketCommons;
+ type MaxDisputes = MaxDisputes;
type PalletId = SimpleDisputesPalletId;
+ type WeightInfo = zrml_simple_disputes::weights::WeightInfo;
}
- #[cfg(feature = "with-global-disputes")]
impl zrml_global_disputes::Config for Runtime {
+ type AddOutcomePeriod = AddOutcomePeriod;
type Currency = Balances;
+ type DisputeResolution = zrml_prediction_markets::Pallet;
type RuntimeEvent = RuntimeEvent;
type GlobalDisputeLockId = GlobalDisputeLockId;
type GlobalDisputesPalletId = GlobalDisputesPalletId;
@@ -1170,6 +1193,7 @@ macro_rules! impl_config_traits {
type MaxOwners = MaxOwners;
type MinOutcomeVoteAmount = MinOutcomeVoteAmount;
type RemoveKeysLimit = RemoveKeysLimit;
+ type GdVotingPeriod = GdVotingPeriod;
type VotingOutcomeFee = VotingOutcomeFee;
type WeightInfo = zrml_global_disputes::weights::WeightInfo;
}
@@ -1312,7 +1336,7 @@ macro_rules! create_runtime_api {
list_benchmark!(list, extra, zrml_swaps, Swaps);
list_benchmark!(list, extra, zrml_authorized, Authorized);
list_benchmark!(list, extra, zrml_court, Court);
- #[cfg(feature = "with-global-disputes")]
+ list_benchmark!(list, extra, zrml_simple_disputes, SimpleDisputes);
list_benchmark!(list, extra, zrml_global_disputes, GlobalDisputes);
#[cfg(not(feature = "parachain"))]
list_benchmark!(list, extra, zrml_prediction_markets, PredictionMarkets);
@@ -1413,7 +1437,7 @@ macro_rules! create_runtime_api {
add_benchmark!(params, batches, zrml_swaps, Swaps);
add_benchmark!(params, batches, zrml_authorized, Authorized);
add_benchmark!(params, batches, zrml_court, Court);
- #[cfg(feature = "with-global-disputes")]
+ add_benchmark!(params, batches, zrml_simple_disputes, SimpleDisputes);
add_benchmark!(params, batches, zrml_global_disputes, GlobalDisputes);
#[cfg(not(feature = "parachain"))]
add_benchmark!(params, batches, zrml_prediction_markets, PredictionMarkets);
diff --git a/runtime/zeitgeist/Cargo.toml b/runtime/zeitgeist/Cargo.toml
index 80260ddc6..0798fd41c 100644
--- a/runtime/zeitgeist/Cargo.toml
+++ b/runtime/zeitgeist/Cargo.toml
@@ -313,7 +313,7 @@ std = [
"zrml-prediction-markets/std",
"zrml-rikiddo/std",
"zrml-simple-disputes/std",
- "zrml-global-disputes?/std",
+ "zrml-global-disputes/std",
"zrml-swaps-runtime-api/std",
"zrml-styx/std",
"zrml-swaps/std",
@@ -366,7 +366,7 @@ try-runtime = [
"zrml-prediction-markets/try-runtime",
"zrml-rikiddo/try-runtime",
"zrml-simple-disputes/try-runtime",
- "zrml-global-disputes?/try-runtime",
+ "zrml-global-disputes/try-runtime",
"zrml-styx/try-runtime",
"zrml-swaps/try-runtime",
@@ -389,11 +389,6 @@ try-runtime = [
"cumulus-pallet-xcmp-queue?/try-runtime",
"parachain-info?/try-runtime",
]
-with-global-disputes = [
- "zrml-global-disputes",
- "common-runtime/with-global-disputes",
- "zrml-prediction-markets/with-global-disputes",
-]
[package]
authors = ["Zeitgeist PM "]
diff --git a/runtime/zeitgeist/src/lib.rs b/runtime/zeitgeist/src/lib.rs
index f9c8bca24..44811a014 100644
--- a/runtime/zeitgeist/src/lib.rs
+++ b/runtime/zeitgeist/src/lib.rs
@@ -166,6 +166,7 @@ impl Contains for IsCallable {
RuntimeCall::Court(_) => false,
#[cfg(feature = "parachain")]
RuntimeCall::DmpQueue(service_overweight { .. }) => false,
+ RuntimeCall::GlobalDisputes(_) => false,
RuntimeCall::LiquidityMining(_) => false,
RuntimeCall::PredictionMarkets(inner_call) => {
match inner_call {
@@ -182,6 +183,7 @@ impl Contains for IsCallable {
_ => true,
}
}
+ RuntimeCall::SimpleDisputes(_) => false,
RuntimeCall::System(inner_call) => {
match inner_call {
// Some "waste" storage will never impact proper operation.
@@ -213,12 +215,6 @@ impl Contains for IsCallable {
decl_common_types!();
-#[cfg(feature = "with-global-disputes")]
-create_runtime_with_additional_pallets!(
- GlobalDisputes: zrml_global_disputes::{Call, Event, Pallet, Storage} = 59,
-);
-
-#[cfg(not(feature = "with-global-disputes"))]
create_runtime_with_additional_pallets!();
impl_config_traits!();
diff --git a/runtime/zeitgeist/src/parameters.rs b/runtime/zeitgeist/src/parameters.rs
index f82dbf5b1..2afd3dc66 100644
--- a/runtime/zeitgeist/src/parameters.rs
+++ b/runtime/zeitgeist/src/parameters.rs
@@ -26,7 +26,7 @@ use super::{Runtime, VERSION};
use frame_support::{
dispatch::DispatchClass,
parameter_types,
- traits::WithdrawReasons,
+ traits::{LockIdentifier, WithdrawReasons},
weights::{
constants::{BlockExecutionWeight, ExtrinsicBaseWeight, WEIGHT_REF_TIME_PER_SECOND},
Weight,
@@ -43,9 +43,6 @@ use sp_runtime::{
use sp_version::RuntimeVersion;
use zeitgeist_primitives::{constants::*, types::*};
-#[cfg(feature = "with-global-disputes")]
-use frame_support::traits::LockIdentifier;
-
pub(crate) const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(10);
pub(crate) const MAXIMUM_BLOCK_WEIGHT: Weight = Weight::from_parts(
WEIGHT_REF_TIME_PER_SECOND.saturating_div(2),
@@ -105,13 +102,37 @@ parameter_types! {
pub ContractsSchedule: pallet_contracts::Schedule = Default::default();
// Court
- /// Duration of a single court case.
- pub const CourtCaseDuration: u64 = BLOCKS_PER_DAY;
+ /// (Slashable) Bond that is provided for overriding the last appeal.
+ /// This bond increases exponentially with the number of appeals.
+ /// Slashed in case the final outcome does match the appealed outcome for which the `AppealBond`
+ /// was deposited.
+ pub const AppealBond: Balance = 2000 * BASE;
+ /// The blocks per year required to calculate the yearly inflation for court incentivisation.
+ pub const BlocksPerYear: BlockNumber = BLOCKS_PER_YEAR;
/// Pallet identifier, mainly used for named balance reserves. DO NOT CHANGE.
pub const CourtPalletId: PalletId = COURT_PALLET_ID;
- /// This value is multiplied by the current number of jurors to determine the stake
- /// the juror has to pay.
- pub const StakeWeight: u128 = 2 * BASE;
+ /// The time in which the jurors can cast their secret vote.
+ pub const CourtVotePeriod: BlockNumber = 3 * BLOCKS_PER_DAY;
+ /// The time in which the jurors should reveal their secret vote.
+ pub const CourtAggregationPeriod: BlockNumber = 3 * BLOCKS_PER_DAY;
+ /// The time in which a court case can get appealed.
+ pub const CourtAppealPeriod: BlockNumber = BLOCKS_PER_DAY;
+ /// The lock identifier for the court votes.
+ pub const CourtLockId: LockIdentifier = COURT_LOCK_ID;
+ /// The time in which the inflation is periodically issued.
+ pub const InflationPeriod: BlockNumber = 30 * BLOCKS_PER_DAY;
+ /// The maximum number of appeals until the court fails.
+ pub const MaxAppeals: u32 = 4;
+ /// The maximum number of delegations per juror account.
+ pub const MaxDelegations: u32 = 5;
+ /// The maximum number of randomly selected `MinJurorStake` draws / atoms of jurors for a dispute.
+ pub const MaxSelectedDraws: u32 = 510;
+ /// The maximum number of jurors / delegators that can be registered.
+ pub const MaxCourtParticipants: u32 = 1_000;
+ /// The minimum stake a user needs to reserve to become a juror.
+ pub const MinJurorStake: Balance = 500 * BASE;
+ /// The interval for requesting multiple court votes at once.
+ pub const RequestInterval: BlockNumber = 7 * BLOCKS_PER_DAY;
// Democracy
/// How often (in blocks) new public referenda are launched.
@@ -179,11 +200,9 @@ parameter_types! {
/// The percentage of the advisory bond that gets slashed when a market is rejected.
pub const AdvisoryBondSlashPercentage: Percent = Percent::from_percent(0);
/// (Slashable) Bond that is provided for disputing the outcome.
- /// Slashed in case the final outcome does not match the dispute for which the `DisputeBond`
- /// was deposited.
+ /// Unreserved in case the dispute was justified otherwise slashed.
+ /// This is when the resolved outcome is different to the default (reported) outcome.
pub const DisputeBond: Balance = 2_000 * BASE;
- /// `DisputeBond` is increased by this factor after every dispute.
- pub const DisputeFactor: Balance = 2 * BASE;
/// Maximum Categories a prediciton market can have (excluding base asset).
pub const MaxCategories: u16 = MAX_CATEGORIES;
/// Maximum block period for a dispute.
@@ -250,6 +269,12 @@ parameter_types! {
// Simple disputes parameters
/// Pallet identifier, mainly used for named balance reserves. DO NOT CHANGE.
pub const SimpleDisputesPalletId: PalletId = SD_PALLET_ID;
+ /// (Slashable) Bond that is provided for overriding the last outcome addition.
+ /// Slashed in case the final outcome does not match the dispute for which the `OutcomeBond`
+ /// was deposited.
+ pub const OutcomeBond: Balance = 2_000 * BASE;
+ /// `OutcomeBond` is increased by this factor after every new outcome addition.
+ pub const OutcomeFactor: Balance = 2 * BASE;
// Swaps parameters
/// A precentage from the withdrawal amount a liquidity provider wants to withdraw
@@ -382,21 +407,22 @@ parameter_types! {
WithdrawReasons::except(WithdrawReasons::TRANSFER | WithdrawReasons::RESERVE);
}
-#[cfg(feature = "with-global-disputes")]
parameter_types! {
// Global Disputes
+ /// The time period in which the addition of new outcomes are allowed.
+ pub const AddOutcomePeriod: BlockNumber = BLOCKS_PER_DAY;
/// Vote lock identifier, mainly used for the LockableCurrency on the native token.
pub const GlobalDisputeLockId: LockIdentifier = GLOBAL_DISPUTES_LOCK_ID;
/// Pallet identifier
pub const GlobalDisputesPalletId: PalletId = GLOBAL_DISPUTES_PALLET_ID;
- /// The period for a global dispute to end.
- pub const GlobalDisputePeriod: BlockNumber = 7 * BLOCKS_PER_DAY;
- /// The maximum number of owners for a voting outcome for private API calls of `push_voting_outcome`.
+ /// The maximum number of owners for a voting outcome for private API calls of `push_vote_outcome`.
pub const MaxOwners: u32 = 10;
/// The maximum number of market ids (participate in multiple different global disputes at the same time) for one account to vote on outcomes.
pub const MaxGlobalDisputeVotes: u32 = 50;
/// The minimum required amount to vote on an outcome.
pub const MinOutcomeVoteAmount: Balance = 10 * BASE;
+ /// The time period in which votes are allowed.
+ pub const GdVotingPeriod: BlockNumber = 7 * BLOCKS_PER_DAY;
/// The fee required to add a voting outcome.
pub const VotingOutcomeFee: Balance = 200 * BASE;
/// The remove limit for the Outcomes storage double map.
diff --git a/scripts/benchmarks/configuration.sh b/scripts/benchmarks/configuration.sh
index f8c9a9213..c4f71fe2c 100644
--- a/scripts/benchmarks/configuration.sh
+++ b/scripts/benchmarks/configuration.sh
@@ -43,5 +43,5 @@ else
fi
export EXECUTION="${EXECUTION:-wasm}"
export ADDITIONAL_PARAMS="${ADDITIONAL:-}"
-export ADDITIONAL_FEATURES="${ADDITIONAL_FEATURES:-with-global-disputes}"
+export ADDITIONAL_FEATURES="${ADDITIONAL_FEATURES:-}"
export HEADER="${HEADER:-./HEADER_GPL3}"
diff --git a/scripts/benchmarks/quick_check.sh b/scripts/benchmarks/quick_check.sh
index 73506b2e2..9ae754b68 100755
--- a/scripts/benchmarks/quick_check.sh
+++ b/scripts/benchmarks/quick_check.sh
@@ -25,7 +25,6 @@ export PROFILE=release
export PROFILE_DIR=release
export ADDITIONAL_PARAMS=--detailed-log-output
export EXECUTION=native
-# TODO(#848) Delete this, when global disputes is on main-net
-export ADDITIONAL_FEATURES=with-global-disputes
+export ADDITIONAL_FEATURES=""
source ./scripts/benchmarks/run_benchmarks.sh
diff --git a/zrml/authorized/src/authorized_pallet_api.rs b/zrml/authorized/src/authorized_pallet_api.rs
index b9a1f4185..387fa6034 100644
--- a/zrml/authorized/src/authorized_pallet_api.rs
+++ b/zrml/authorized/src/authorized_pallet_api.rs
@@ -1,3 +1,4 @@
+// Copyright 2023 Forecasting Technologies LTD.
// Copyright 2021-2022 Zeitgeist PM LLC.
//
// This file is part of Zeitgeist.
@@ -15,6 +16,6 @@
// You should have received a copy of the GNU General Public License
// along with Zeitgeist. If not, see .
-use zeitgeist_primitives::traits::DisputeApi;
+use zeitgeist_primitives::traits::{DisputeApi, DisputeMaxWeightApi};
-pub trait AuthorizedPalletApi: DisputeApi {}
+pub trait AuthorizedPalletApi: DisputeApi + DisputeMaxWeightApi {}
diff --git a/zrml/authorized/src/benchmarks.rs b/zrml/authorized/src/benchmarks.rs
index 77bd884b1..db649941b 100644
--- a/zrml/authorized/src/benchmarks.rs
+++ b/zrml/authorized/src/benchmarks.rs
@@ -22,17 +22,18 @@
)]
#![cfg(feature = "runtime-benchmarks")]
-#[cfg(test)]
-use crate::Pallet as Authorized;
-use crate::{market_mock, AuthorizedOutcomeReports, Call, Config, Pallet};
+use crate::{
+ market_mock, AuthorizedOutcomeReports, Call, Config, NegativeImbalanceOf, Pallet as Authorized,
+ Pallet,
+};
use frame_benchmarking::benchmarks;
use frame_support::{
dispatch::UnfilteredDispatchable,
- traits::{EnsureOrigin, Get},
+ traits::{EnsureOrigin, Get, Imbalance},
};
use sp_runtime::traits::Saturating;
use zeitgeist_primitives::{
- traits::DisputeResolutionApi,
+ traits::{DisputeApi, DisputeResolutionApi},
types::{AuthorityReport, OutcomeReport},
};
use zrml_market_commons::MarketCommonsPalletApi;
@@ -96,6 +97,72 @@ benchmarks! {
assert_eq!(AuthorizedOutcomeReports::::get(market_id).unwrap(), report);
}
+ on_dispute_weight {
+ let market_id = 0u32.into();
+ let market = market_mock::();
+ T::MarketCommons::push_market(market.clone()).unwrap();
+ }: {
+ Authorized::::on_dispute(&market_id, &market).unwrap();
+ }
+
+ on_resolution_weight {
+ let market_id = 0u32.into();
+ let market = market_mock::();
+ T::MarketCommons::push_market(market.clone()).unwrap();
+
+ let report = AuthorityReport { resolve_at: 0u32.into(), outcome: OutcomeReport::Scalar(0) };
+ AuthorizedOutcomeReports::::insert(market_id, report);
+ }: {
+ Authorized::::on_resolution(&market_id, &market).unwrap();
+ }
+
+ exchange_weight {
+ let market_id = 0u32.into();
+ let market = market_mock::();
+ T::MarketCommons::push_market(market.clone()).unwrap();
+
+ let outcome = OutcomeReport::Scalar(0);
+ let imb = NegativeImbalanceOf::::zero();
+ }: {
+ Authorized::::exchange(&market_id, &market, &outcome, imb).unwrap();
+ }
+
+ get_auto_resolve_weight {
+ let market_id = 0u32.into();
+ let market = market_mock::();
+ T::MarketCommons::push_market(market.clone()).unwrap();
+ let report = AuthorityReport { resolve_at: 0u32.into(), outcome: OutcomeReport::Scalar(0) };
+ AuthorizedOutcomeReports::::insert(market_id, report);
+ }: {
+ Authorized::::get_auto_resolve(&market_id, &market);
+ }
+
+ has_failed_weight {
+ let market_id = 0u32.into();
+ let market = market_mock::();
+ T::MarketCommons::push_market(market.clone()).unwrap();
+ }: {
+ Authorized::::has_failed(&market_id, &market).unwrap();
+ }
+
+ on_global_dispute_weight {
+ let market_id = 0u32.into();
+ let market = market_mock::();
+ T::MarketCommons::push_market(market.clone()).unwrap();
+ }: {
+ Authorized::::on_global_dispute(&market_id, &market).unwrap();
+ }
+
+ clear_weight {
+ let market_id = 0u32.into();
+ let market = market_mock::();
+ T::MarketCommons::push_market(market.clone()).unwrap();
+ let report = AuthorityReport { resolve_at: 0u32.into(), outcome: OutcomeReport::Scalar(0) };
+ AuthorizedOutcomeReports::::insert(market_id, report);
+ }: {
+ Authorized::::clear(&market_id, &market).unwrap();
+ }
+
impl_benchmark_test_suite!(
Authorized,
crate::mock::ExtBuilder::default().build(),
diff --git a/zrml/authorized/src/lib.rs b/zrml/authorized/src/lib.rs
index 10bb0f8fe..1dc53f750 100644
--- a/zrml/authorized/src/lib.rs
+++ b/zrml/authorized/src/lib.rs
@@ -35,21 +35,22 @@ pub use pallet::*;
#[frame_support::pallet]
mod pallet {
use crate::{weights::WeightInfoZeitgeist, AuthorizedPalletApi};
+ use alloc::vec::Vec;
use core::marker::PhantomData;
use frame_support::{
- dispatch::{DispatchResult, DispatchResultWithPostInfo},
+ dispatch::DispatchResultWithPostInfo,
ensure,
- pallet_prelude::{ConstU32, EnsureOrigin, OptionQuery, StorageMap},
+ pallet_prelude::{ConstU32, EnsureOrigin, OptionQuery, StorageMap, Weight},
traits::{Currency, Get, Hooks, IsType, StorageVersion},
PalletId, Twox64Concat,
};
use frame_system::pallet_prelude::OriginFor;
use sp_runtime::{traits::Saturating, DispatchError};
use zeitgeist_primitives::{
- traits::{DisputeApi, DisputeResolutionApi},
+ traits::{DisputeApi, DisputeMaxWeightApi, DisputeResolutionApi},
types::{
- Asset, AuthorityReport, Market, MarketDispute, MarketDisputeMechanism, MarketStatus,
- OutcomeReport,
+ Asset, AuthorityReport, GlobalDisputeItem, Market, MarketDisputeMechanism,
+ MarketStatus, OutcomeReport, ResultWithWeightInfo,
},
};
use zrml_market_commons::MarketCommonsPalletApi;
@@ -61,6 +62,8 @@ mod pallet {
as Currency<::AccountId>>::Balance;
pub(crate) type CurrencyOf =
<::MarketCommons as MarketCommonsPalletApi>::Currency;
+ pub(crate) type NegativeImbalanceOf =
+ as Currency<::AccountId>>::NegativeImbalance;
pub(crate) type MarketIdOf =
<::MarketCommons as MarketCommonsPalletApi>::MarketId;
pub(crate) type MomentOf = <::MarketCommons as MarketCommonsPalletApi>::Moment;
@@ -101,16 +104,21 @@ mod pallet {
let report_opt = AuthorizedOutcomeReports::::get(market_id);
let (report, ids_len) = match &report_opt {
- Some(report) => (AuthorityReport { resolve_at: report.resolve_at, outcome }, 0u32),
+ Some(report) => (
+ AuthorityReport { resolve_at: report.resolve_at, outcome: outcome.clone() },
+ 0u32,
+ ),
None => {
let resolve_at = now.saturating_add(T::CorrectionPeriod::get());
let ids_len = T::DisputeResolution::add_auto_resolve(&market_id, resolve_at)?;
- (AuthorityReport { resolve_at, outcome }, ids_len)
+ (AuthorityReport { resolve_at, outcome: outcome.clone() }, ids_len)
}
};
AuthorizedOutcomeReports::::insert(market_id, report);
+ Self::deposit_event(Event::AuthorityReported { market_id, outcome });
+
if report_opt.is_none() {
Ok(Some(T::WeightInfo::authorize_market_outcome_first_report(ids_len)).into())
} else {
@@ -155,16 +163,19 @@ mod pallet {
MarketDoesNotHaveDisputeMechanismAuthorized,
/// An account attempts to submit a report to an undisputed market.
MarketIsNotDisputed,
- /// Only one dispute is allowed.
- OnlyOneDisputeAllowed,
/// The report does not match the market's type.
OutcomeMismatch,
}
#[pallet::event]
+ #[pallet::generate_deposit(pub(crate) fn deposit_event)]
pub enum Event
where
- T: Config, {}
+ T: Config,
+ {
+ /// The Authority reported.
+ AuthorityReported { market_id: MarketIdOf, outcome: OutcomeReport },
+ }
#[pallet::hooks]
impl Hooks for Pallet {}
@@ -183,66 +194,170 @@ mod pallet {
}
}
+ impl DisputeMaxWeightApi for Pallet
+ where
+ T: Config,
+ {
+ fn on_dispute_max_weight() -> Weight {
+ T::WeightInfo::on_dispute_weight()
+ }
+
+ fn on_resolution_max_weight() -> Weight {
+ T::WeightInfo::on_resolution_weight()
+ }
+
+ fn exchange_max_weight() -> Weight {
+ T::WeightInfo::exchange_weight()
+ }
+
+ fn get_auto_resolve_max_weight() -> Weight {
+ T::WeightInfo::get_auto_resolve_weight()
+ }
+
+ fn has_failed_max_weight() -> Weight {
+ T::WeightInfo::has_failed_weight()
+ }
+
+ fn on_global_dispute_max_weight() -> Weight {
+ T::WeightInfo::on_global_dispute_weight()
+ }
+
+ fn clear_max_weight() -> Weight {
+ T::WeightInfo::clear_weight()
+ }
+ }
+
impl DisputeApi for Pallet
where
T: Config,
{
type AccountId = T::AccountId;
type Balance = BalanceOf;
+ type NegativeImbalance = NegativeImbalanceOf;
type BlockNumber = T::BlockNumber;
type MarketId = MarketIdOf;
type Moment = MomentOf;
type Origin = T::RuntimeOrigin;
fn on_dispute(
- disputes: &[MarketDispute],
_: &Self::MarketId,
market: &MarketOf,
- ) -> DispatchResult {
+ ) -> Result, DispatchError> {
ensure!(
market.dispute_mechanism == MarketDisputeMechanism::Authorized,
Error::::MarketDoesNotHaveDisputeMechanismAuthorized
);
- ensure!(disputes.is_empty(), Error::::OnlyOneDisputeAllowed);
- Ok(())
+
+ let res =
+ ResultWithWeightInfo { result: (), weight: T::WeightInfo::on_dispute_weight() };
+
+ Ok(res)
}
fn on_resolution(
- _: &[MarketDispute],
market_id: &Self::MarketId,
market: &MarketOf,
- ) -> Result, DispatchError> {
+ ) -> Result>, DispatchError> {
ensure!(
market.dispute_mechanism == MarketDisputeMechanism::Authorized,
Error::::MarketDoesNotHaveDisputeMechanismAuthorized
);
let report = AuthorizedOutcomeReports::::take(market_id);
- Ok(report.map(|r| r.outcome))
+
+ let res = ResultWithWeightInfo {
+ result: report.map(|r| r.outcome),
+ weight: T::WeightInfo::on_resolution_weight(),
+ };
+
+ Ok(res)
+ }
+
+ fn exchange(
+ _: &Self::MarketId,
+ market: &MarketOf,
+ _: &OutcomeReport,
+ overall_imbalance: NegativeImbalanceOf,
+ ) -> Result>, DispatchError> {
+ ensure!(
+ market.dispute_mechanism == MarketDisputeMechanism::Authorized,
+ Error::::MarketDoesNotHaveDisputeMechanismAuthorized
+ );
+ // all funds to treasury
+ let res = ResultWithWeightInfo {
+ result: overall_imbalance,
+ weight: T::WeightInfo::exchange_weight(),
+ };
+
+ Ok(res)
}
fn get_auto_resolve(
- _: &[MarketDispute],
market_id: &Self::MarketId,
market: &MarketOf,
- ) -> Result, DispatchError> {
+ ) -> ResultWithWeightInfo> {
+ let mut res = ResultWithWeightInfo {
+ result: None,
+ weight: T::WeightInfo::get_auto_resolve_weight(),
+ };
+
+ if market.dispute_mechanism != MarketDisputeMechanism::Authorized {
+ return res;
+ }
+
+ res.result = Self::get_auto_resolve(market_id);
+
+ res
+ }
+
+ fn has_failed(
+ _: &Self::MarketId,
+ market: &MarketOf,
+ ) -> Result, DispatchError> {
ensure!(
market.dispute_mechanism == MarketDisputeMechanism::Authorized,
Error::::MarketDoesNotHaveDisputeMechanismAuthorized
);
- Ok(Self::get_auto_resolve(market_id))
+
+ let res =
+ ResultWithWeightInfo { result: false, weight: T::WeightInfo::has_failed_weight() };
+
+ Ok(res)
}
- fn has_failed(
- _: &[MarketDispute],
+ fn on_global_dispute(
_: &Self::MarketId,
market: &MarketOf,
- ) -> Result {
+ ) -> Result<
+ ResultWithWeightInfo>>,
+ DispatchError,
+ > {
ensure!(
market.dispute_mechanism == MarketDisputeMechanism::Authorized,
Error::::MarketDoesNotHaveDisputeMechanismAuthorized
);
- Ok(false)
+ let res = ResultWithWeightInfo {
+ result: Vec::new(),
+ weight: T::WeightInfo::on_global_dispute_weight(),
+ };
+
+ Ok(res)
+ }
+
+ fn clear(
+ market_id: &Self::MarketId,
+ market: &MarketOf,
+ ) -> Result, DispatchError> {
+ ensure!(
+ market.dispute_mechanism == MarketDisputeMechanism::Authorized,
+ Error::::MarketDoesNotHaveDisputeMechanismAuthorized
+ );
+
+ AuthorizedOutcomeReports::::remove(market_id);
+
+ let res = ResultWithWeightInfo { result: (), weight: T::WeightInfo::clear_weight() };
+
+ Ok(res)
}
}
diff --git a/zrml/authorized/src/mock.rs b/zrml/authorized/src/mock.rs
index f34cdc7bc..529e27534 100644
--- a/zrml/authorized/src/mock.rs
+++ b/zrml/authorized/src/mock.rs
@@ -26,7 +26,6 @@ use frame_support::{
construct_runtime, ord_parameter_types,
pallet_prelude::{DispatchError, Weight},
traits::Everything,
- BoundedVec,
};
use frame_system::EnsureSignedBy;
use sp_runtime::{
@@ -40,8 +39,8 @@ use zeitgeist_primitives::{
},
traits::DisputeResolutionApi,
types::{
- AccountIdTest, Asset, Balance, BlockNumber, BlockTest, Hash, Index, Market, MarketDispute,
- MarketId, Moment, OutcomeReport, UncheckedExtrinsicTest,
+ AccountIdTest, Asset, Balance, BlockNumber, BlockTest, Hash, Index, Market, MarketId,
+ Moment, UncheckedExtrinsicTest,
},
};
@@ -68,7 +67,6 @@ construct_runtime!(
ord_parameter_types! {
pub const AuthorizedDisputeResolutionUser: AccountIdTest = ALICE;
- pub const MaxDisputes: u32 = 64;
}
// MockResolution implements DisputeResolutionApi with no-ops.
@@ -79,7 +77,6 @@ impl DisputeResolutionApi for MockResolution {
type Balance = Balance;
type BlockNumber = BlockNumber;
type MarketId = MarketId;
- type MaxDisputes = MaxDisputes;
type Moment = Moment;
fn resolve(
@@ -119,17 +116,6 @@ impl DisputeResolutionApi for MockResolution {
ids.len() as u32
})
}
-
- fn get_disputes(
- _market_id: &Self::MarketId,
- ) -> BoundedVec, Self::MaxDisputes> {
- BoundedVec::try_from(vec![MarketDispute {
- at: 42u64,
- by: BOB,
- outcome: OutcomeReport::Scalar(42),
- }])
- .unwrap()
- }
}
impl crate::Config for Runtime {
diff --git a/zrml/authorized/src/tests.rs b/zrml/authorized/src/tests.rs
index 3682ac5e1..018db50eb 100644
--- a/zrml/authorized/src/tests.rs
+++ b/zrml/authorized/src/tests.rs
@@ -27,7 +27,7 @@ use crate::{
use frame_support::{assert_noop, assert_ok, dispatch::DispatchError};
use zeitgeist_primitives::{
traits::DisputeApi,
- types::{AuthorityReport, MarketDispute, MarketDisputeMechanism, MarketStatus, OutcomeReport},
+ types::{AuthorityReport, MarketDisputeMechanism, MarketStatus, OutcomeReport},
};
use zrml_market_commons::Markets;
@@ -161,22 +161,10 @@ fn authorize_market_outcome_fails_on_unauthorized_account() {
});
}
-#[test]
-fn on_dispute_fails_if_disputes_is_not_empty() {
- ExtBuilder::default().build().execute_with(|| {
- let dispute =
- MarketDispute { by: crate::mock::ALICE, at: 0, outcome: OutcomeReport::Scalar(1) };
- assert_noop!(
- Authorized::on_dispute(&[dispute], &0, &market_mock::()),
- Error::::OnlyOneDisputeAllowed
- );
- });
-}
-
#[test]
fn on_resolution_fails_if_no_report_was_submitted() {
ExtBuilder::default().build().execute_with(|| {
- let report = Authorized::on_resolution(&[], &0, &market_mock::()).unwrap();
+ let report = Authorized::on_resolution(&0, &market_mock::()).unwrap().result;
assert!(report.is_none());
});
}
@@ -191,7 +179,7 @@ fn on_resolution_removes_stored_outcomes() {
0,
OutcomeReport::Scalar(2)
));
- assert_ok!(Authorized::on_resolution(&[], &0, &market));
+ assert_ok!(Authorized::on_resolution(&0, &market));
assert_eq!(AuthorizedOutcomeReports::::get(0), None);
});
}
@@ -213,7 +201,7 @@ fn on_resolution_returns_the_reported_outcome() {
OutcomeReport::Scalar(2)
));
assert_eq!(
- Authorized::on_resolution(&[], &0, &market).unwrap(),
+ Authorized::on_resolution(&0, &market).unwrap().result,
Some(OutcomeReport::Scalar(2))
);
});
@@ -260,7 +248,7 @@ fn get_auto_resolve_works() {
));
let now = frame_system::Pallet::::block_number();
let resolve_at = now + ::CorrectionPeriod::get();
- assert_eq!(Authorized::get_auto_resolve(&[], &0, &market).unwrap(), Some(resolve_at),);
+ assert_eq!(Authorized::get_auto_resolve(&0, &market).result, Some(resolve_at),);
});
}
@@ -268,6 +256,6 @@ fn get_auto_resolve_works() {
fn get_auto_resolve_returns_none_without_market_storage() {
ExtBuilder::default().build().execute_with(|| {
let market = market_mock::();
- assert_eq!(Authorized::get_auto_resolve(&[], &0, &market).unwrap(), None,);
+ assert_eq!(Authorized::get_auto_resolve(&0, &market).result, None,);
});
}
diff --git a/zrml/authorized/src/weights.rs b/zrml/authorized/src/weights.rs
index c76b1faf8..8cd6968ff 100644
--- a/zrml/authorized/src/weights.rs
+++ b/zrml/authorized/src/weights.rs
@@ -48,6 +48,13 @@ use frame_support::{traits::Get, weights::Weight};
pub trait WeightInfoZeitgeist {
fn authorize_market_outcome_first_report(m: u32) -> Weight;
fn authorize_market_outcome_existing_report() -> Weight;
+ fn on_dispute_weight() -> Weight;
+ fn on_resolution_weight() -> Weight;
+ fn exchange_weight() -> Weight;
+ fn get_auto_resolve_weight() -> Weight;
+ fn has_failed_weight() -> Weight;
+ fn on_global_dispute_weight() -> Weight;
+ fn clear_weight() -> Weight;
}
/// Weight functions for zrml_authorized (automatically generated)
@@ -70,4 +77,25 @@ impl WeightInfoZeitgeist for WeightInfo {
.saturating_add(T::DbWeight::get().reads(2))
.saturating_add(T::DbWeight::get().writes(1))
}
+ fn on_dispute_weight() -> Weight {
+ Weight::from_ref_time(0)
+ }
+ fn on_resolution_weight() -> Weight {
+ Weight::from_ref_time(0)
+ }
+ fn exchange_weight() -> Weight {
+ Weight::from_ref_time(0)
+ }
+ fn get_auto_resolve_weight() -> Weight {
+ Weight::from_ref_time(0)
+ }
+ fn has_failed_weight() -> Weight {
+ Weight::from_ref_time(0)
+ }
+ fn on_global_dispute_weight() -> Weight {
+ Weight::from_ref_time(0)
+ }
+ fn clear_weight() -> Weight {
+ Weight::from_ref_time(0)
+ }
}
diff --git a/zrml/court/Cargo.toml b/zrml/court/Cargo.toml
index fd7b589df..d40612540 100644
--- a/zrml/court/Cargo.toml
+++ b/zrml/court/Cargo.toml
@@ -5,7 +5,9 @@ frame-support = { workspace = true }
frame-system = { workspace = true }
parity-scale-codec = { workspace = true, features = ["derive", "max-encoded-len"] }
rand = { workspace = true, features = ["alloc", "std_rng"] }
+rand_chacha = { workspace = true }
scale-info = { workspace = true, features = ["derive"] }
+sp-arithmetic = { workspace = true }
sp-runtime = { workspace = true }
zeitgeist-primitives = { workspace = true }
zrml-market-commons = { workspace = true }
@@ -14,9 +16,12 @@ zrml-market-commons = { workspace = true }
pallet-balances = { workspace = true, features = ["default"] }
pallet-randomness-collective-flip = { workspace = true, features = ["default"] }
pallet-timestamp = { workspace = true, features = ["default"] }
+pallet-treasury = { workspace = true, features = ["default"] }
sp-io = { workspace = true, features = ["default"] }
zeitgeist-primitives = { workspace = true, features = ["mock", "default"] }
+test-case = { workspace = true }
+
[features]
default = ["std"]
runtime-benchmarks = [
diff --git a/zrml/court/README.md b/zrml/court/README.md
index 53bbf35ec..ae8364d60 100644
--- a/zrml/court/README.md
+++ b/zrml/court/README.md
@@ -1 +1,56 @@
-# Court Module
+# Court
+
+A pallet for stake-weighted plurality decision making.
+
+- [`Call`]()
+- [`Config`]()
+- [`Error`]()
+- [`Event`]()
+
+## Overview
+
+Court is a market dispute resolution mechanism. It allows jurors to discover the truth.
+If a juror does not vote with the plurality of the other jurors, the juror will be punished,
+while those who did vote with the plurality will be rewarded.
+
+## Terminology
+
+- **Aggregation Period:** The period in which the actively participating jurors
+ need to reveal their vote secrets.
+- **Appeal Period:** The period in which the jurors can appeal the decision of
+ the last court round.
+- **Court:** The court is a dispute resolution mechanism to find the resolution
+ outcome of a market.
+- **Delegator:** A delegator is a court participant who delegates their voting
+ power to an actively participating juror.
+- **Juror:** A juror is a court participant who votes inside court cases.
+- **Reveal Period / Aggregation Period:** The period in which the actively
+ participating jurors need to reveal their vote secrets.
+
+## Interface
+
+### Dispatches
+
+#### Public Dispatches
+
+- `join_court` - Join the court with a stake to become a juror in order to get
+ the stake-weighted chance to be selected for decision making.
+- `delegate` - Join the court with a stake to become a delegator in order to
+ delegate the voting power to actively participating jurors.
+- `prepare_exit_court` - Prepare as a court participant to leave the court
+ system.
+- `exit_court` - Exit the court system in order to get the stake back.
+- `vote` - An actively participating juror votes secretely on a specific court
+ case, in which the juror got selected.
+- `denounce_vote` - Denounce a selected and active juror, if the secret and vote
+ is known before the actual reveal period.
+- `reveal_vote` - An actively participating juror reveals the previously casted
+ secret vote.
+- `appeal` - After the reveal phase (aggregation period), the jurors decision
+ can be appealed.
+- `reassign_juror_stakes` - After the appeal period is over, losers pay the
+ winners for the jurors and delegators.
+
+#### `MonetaryGovernanceOrigin` Dispatches
+
+- `set_inflation` - Set the yearly inflation rate of the court system.
diff --git a/zrml/court/src/benchmarks.rs b/zrml/court/src/benchmarks.rs
index 829695001..d18860390 100644
--- a/zrml/court/src/benchmarks.rs
+++ b/zrml/court/src/benchmarks.rs
@@ -22,49 +22,716 @@
)]
#![cfg(feature = "runtime-benchmarks")]
-#[cfg(test)]
-use crate::Pallet as Court;
-use crate::{BalanceOf, Call, Config, CurrencyOf, Pallet};
-use frame_benchmarking::{benchmarks, whitelisted_caller};
-use frame_support::{dispatch::UnfilteredDispatchable, traits::Currency};
+extern crate alloc;
+use crate::{
+ types::{CourtParticipantInfo, CourtPoolItem, CourtStatus, Draw, Vote},
+ AppealInfo, BalanceOf, Call, Config, CourtId, CourtPool, Courts, DelegatedStakesOf,
+ MarketIdToCourtId, MarketOf, Pallet as Court, Pallet, Participants, RequestBlock,
+ SelectedDraws, VoteItem,
+};
+use alloc::{vec, vec::Vec};
+use frame_benchmarking::{account, benchmarks, whitelisted_caller};
+use frame_support::traits::{Currency, Get, NamedReservableCurrency};
use frame_system::RawOrigin;
-use sp_runtime::traits::Bounded;
-use zeitgeist_primitives::types::OutcomeReport;
+use sp_arithmetic::Perbill;
+use sp_runtime::{
+ traits::{Bounded, Hash, Saturating, StaticLookup, Zero},
+ SaturatedConversion,
+};
+use zeitgeist_primitives::{
+ traits::{DisputeApi, DisputeResolutionApi},
+ types::{
+ Asset, Deadlines, Market, MarketBonds, MarketCreation, MarketDisputeMechanism,
+ MarketPeriod, MarketStatus, MarketType, OutcomeReport, Report, ScoringRule,
+ },
+};
+use zrml_market_commons::MarketCommonsPalletApi;
+
+const ORACLE_REPORT: OutcomeReport = OutcomeReport::Scalar(u128::MAX);
+
+fn get_market() -> MarketOf
+where
+ T: Config,
+{
+ Market {
+ base_asset: Asset::Ztg,
+ creation: MarketCreation::Permissionless,
+ creator_fee: 0,
+ creator: account("creator", 0, 0),
+ market_type: MarketType::Scalar(0..=100),
+ dispute_mechanism: MarketDisputeMechanism::Court,
+ metadata: vec![],
+ oracle: account("oracle", 0, 0),
+ period: MarketPeriod::Block(
+ 0u64.saturated_into::()..100u64.saturated_into::(),
+ ),
+ deadlines: Deadlines {
+ grace_period: 1_u64.saturated_into::(),
+ oracle_duration: 1_u64.saturated_into::(),
+ dispute_duration: 1_u64.saturated_into::(),
+ },
+ report: Some(Report {
+ at: 1u64.saturated_into::(),
+ by: account("oracle", 0, 0),
+ outcome: ORACLE_REPORT,
+ }),
+ resolved_outcome: None,
+ status: MarketStatus::Disputed,
+ scoring_rule: ScoringRule::CPMM,
+ bonds: MarketBonds { creation: None, oracle: None, outsider: None, dispute: None },
+ }
+}
fn deposit(caller: &T::AccountId)
where
T: Config,
{
- let _ = CurrencyOf::::deposit_creating(caller, BalanceOf::::max_value());
+ let _ = T::Currency::deposit_creating(
+ caller,
+ BalanceOf::::max_value() / BalanceOf::::from(2u8),
+ );
+}
+
+fn fill_pool(number: u32) -> Result<(), &'static str>
+where
+ T: Config,
+{
+ let mut pool = >::get();
+ let min_amount = T::MinJurorStake::get();
+ let max_amount = min_amount + min_amount + BalanceOf::::from(number);
+ let joined_at = >::block_number();
+ for i in 0..number {
+ let juror: T::AccountId = account("juror", i, 0);
+ let stake = max_amount - BalanceOf::::from(i);
+ let _ = T::Currency::deposit_creating(&juror, stake);
+ >::insert(
+ juror.clone(),
+ CourtParticipantInfo {
+ stake,
+ active_lock: >::zero(),
+ prepare_exit_at: None,
+ delegations: Default::default(),
+ },
+ );
+ let consumed_stake = BalanceOf::::zero();
+ let pool_item =
+ CourtPoolItem { stake, court_participant: juror.clone(), consumed_stake, joined_at };
+ match pool.binary_search_by_key(&(stake, &juror), |pool_item| {
+ (pool_item.stake, &pool_item.court_participant)
+ }) {
+ Ok(_) => panic!("Juror already in pool"),
+ Err(index) => pool.try_insert(index, pool_item).unwrap(),
+ };
+ }
+ >::put(pool);
+ Ok(())
+}
+
+// assume always worst case for delegations (MaxDelegations),
+// because delegations are individual to each juror
+fn fill_delegations()
+where
+ T: Config,
+{
+ let pool = >::get();
+ debug_assert!(pool.len() >= T::MaxDelegations::get() as usize);
+ let mut pool_iter = pool.iter();
+ let mut delegated_jurors = vec![];
+ for _ in 0..T::MaxDelegations::get() {
+ let delegated_juror = pool_iter.next().unwrap().court_participant.clone();
+ delegated_jurors.push(delegated_juror);
+ }
+ for pool_item in pool_iter {
+ let juror = &pool_item.court_participant;
+ let mut j = >::get(juror).unwrap();
+ j.delegations = Some(delegated_jurors.clone().try_into().unwrap());
+ >::insert(juror, j);
+ }
}
-fn deposit_and_join_court(caller: &T::AccountId)
+fn join_with_min_stake(caller: &T::AccountId) -> Result<(), &'static str>
where
T: Config,
{
+ let stake = T::MinJurorStake::get();
deposit::(caller);
- Call::::join_court {}
- .dispatch_bypass_filter(RawOrigin::Signed(caller.clone()).into())
- .unwrap();
+ Court::::join_court(RawOrigin::Signed(caller.clone()).into(), stake)?;
+ Ok(())
+}
+
+fn setup_court() -> Result<(crate::MarketIdOf, CourtId), &'static str>
+where
+ T: Config,
+{
+ >::set_block_number(1u64.saturated_into::());
+
+ let now = >::block_number();
+ >::put(now + 1u64.saturated_into::());
+
+ let market_id = T::MarketCommons::push_market(get_market::()).unwrap();
+ Court::::on_dispute(&market_id, &get_market::()).unwrap();
+
+ let court_id = >::get(market_id).unwrap();
+
+ Ok((market_id, court_id))
+}
+
+fn fill_draws(court_id: CourtId, number: u32) -> Result<(), &'static str>
+where
+ T: Config,
+{
+ // remove last random selections of on_dispute
+ >::remove(court_id);
+ let mut draws = >::get(court_id);
+ for i in 0..number {
+ let juror = account("juror", i, 0);
+ deposit::(&juror);
+ >::insert(
+ &juror,
+ CourtParticipantInfo {
+ stake: T::MinJurorStake::get(),
+ active_lock: T::MinJurorStake::get(),
+ prepare_exit_at: None,
+ delegations: Default::default(),
+ },
+ );
+ let draw = Draw {
+ court_participant: juror,
+ vote: Vote::Drawn,
+ weight: 1u32,
+ slashable: T::MinJurorStake::get(),
+ };
+ let index = draws
+ .binary_search_by_key(&draw.court_participant, |draw| draw.court_participant.clone())
+ .unwrap_or_else(|j| j);
+ draws.try_insert(index, draw).unwrap();
+ }
+ >::insert(court_id, draws);
+ Ok(())
+}
+
+fn apply_revealed_draws(court_id: CourtId)
+where
+ T: Config,
+{
+ let winner_outcome = OutcomeReport::Scalar(0u128);
+ let mut draws = >::get(court_id);
+ // change draws to have revealed votes
+ for draw in draws.iter_mut() {
+ let salt = Default::default();
+ let commitment =
+ T::Hashing::hash_of(&(draw.court_participant.clone(), winner_outcome.clone(), salt));
+ draw.vote = Vote::Revealed {
+ commitment,
+ vote_item: VoteItem::Outcome(winner_outcome.clone()),
+ salt,
+ };
+ }
+ >::insert(court_id, draws);
}
benchmarks! {
- exit_court {
+ join_court {
+ let j in 0..(T::MaxCourtParticipants::get() - 1);
+
+ fill_pool::(j)?;
+
let caller: T::AccountId = whitelisted_caller();
- deposit_and_join_court::(&caller);
- }: _(RawOrigin::Signed(caller))
+ join_with_min_stake::(&caller)?;
+
+ let new_stake = T::MinJurorStake::get()
+ .saturating_add(1u128.saturated_into::>());
+ }: _(RawOrigin::Signed(caller), new_stake)
+
+ delegate {
+ // jurors greater or equal to MaxDelegations,
+ // because we can not delegate to a non-existent juror
+ let j in 5..(T::MaxCourtParticipants::get() - 1);
+ let d in 1..T::MaxDelegations::get();
+
+ fill_pool::(j)?;
- join_court {
let caller: T::AccountId = whitelisted_caller();
- deposit::(&caller);
+ join_with_min_stake::(&caller)?;
+
+ let juror_pool = >::get();
+ let mut delegations = Vec::::new();
+ juror_pool.iter()
+ .filter(|pool_item| pool_item.court_participant != caller).take(d as usize)
+ .for_each(|pool_item| delegations.push(pool_item.court_participant.clone()));
+
+ let new_stake = T::MinJurorStake::get()
+ .saturating_add(1u128.saturated_into::>());
+ }: _(RawOrigin::Signed(caller), new_stake, delegations)
+
+ prepare_exit_court {
+ let j in 0..(T::MaxCourtParticipants::get() - 1);
+
+ fill_pool::(j)?;
+
+ let caller: T::AccountId = whitelisted_caller();
+ join_with_min_stake::(&caller)?;
}: _(RawOrigin::Signed(caller))
+ exit_court_remove {
+ let caller: T::AccountId = whitelisted_caller();
+ join_with_min_stake::(&caller)?;
+
+ Court::::prepare_exit_court(RawOrigin::Signed(caller.clone()).into())?;
+ let now = >::block_number();
+ >::set_block_number(now + T::InflationPeriod::get());
+
+ >::mutate(caller.clone(), |prev_p_info| {
+ prev_p_info.as_mut().unwrap().active_lock = >::zero();
+ });
+
+ let juror = T::Lookup::unlookup(caller.clone());
+ }: exit_court(RawOrigin::Signed(caller), juror)
+
+ exit_court_set {
+ let caller: T::AccountId = whitelisted_caller();
+ join_with_min_stake::(&caller)?;
+
+ Court::::prepare_exit_court(RawOrigin::Signed(caller.clone()).into())?;
+ let now = >::block_number();
+ >::set_block_number(now + T::InflationPeriod::get());
+
+