diff --git a/Cargo.lock b/Cargo.lock index 8daba3d41..f06e56b94 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -21,6 +21,15 @@ dependencies = [ "gimli 0.26.2", ] +[[package]] +name = "addr2line" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +dependencies = [ + "gimli 0.27.3", +] + [[package]] name = "addr2line" version = "0.20.0" @@ -191,13 +200,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.71" +version = "0.1.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a564d521dd56509c4c47480d00b80ee55f7e385ae48db5744c67ad50c92d2ebf" +checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.27", ] [[package]] @@ -358,7 +367,7 @@ dependencies = [ "serde_json", "serial_test 2.0.0", "sha2 0.8.2", - "sp-core", + "sp-core 21.0.0", "thiserror", "tokio", "url 2.4.0", @@ -562,6 +571,12 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" +[[package]] +name = "bytemuck" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" + [[package]] name = "byteorder" version = "1.4.3" @@ -652,9 +667,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.17" +version = "4.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0827b011f6f8ab38590295339817b0d26f344aa4932c3ced71b45b0c54b4a9" +checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d" dependencies = [ "clap_builder", "clap_derive", @@ -663,9 +678,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.17" +version = "4.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9441b403be87be858db6a23edb493e7f694761acdc3343d5a0fcaafd304cbc9e" +checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1" dependencies = [ "anstream", "anstyle", @@ -682,7 +697,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.27", ] [[package]] @@ -758,6 +773,15 @@ dependencies = [ "serde", ] +[[package]] +name = "cranelift-entity" +version = "0.95.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40099d38061b37e505e63f89bab52199037a72b931ad4868d9089ff7268660b0" +dependencies = [ + "serde", +] + [[package]] name = "crc32fast" version = "1.3.2" @@ -929,7 +953,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.26", + "syn 2.0.27", ] [[package]] @@ -951,7 +975,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core 0.20.3", "quote", - "syn 2.0.26", + "syn 2.0.27", ] [[package]] @@ -1089,9 +1113,9 @@ checksum = "304e6508efa593091e97a9abbc10f90aa7ca635b6d2784feff3c89d41dd12272" [[package]] name = "ecdsa" -version = "0.16.7" +version = "0.16.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0997c976637b606099b9985693efa3581e84e41f5c11ba5255f88711058ad428" +checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4" dependencies = [ "der", "digest 0.10.7", @@ -1138,9 +1162,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "elliptic-curve" @@ -1275,12 +1299,9 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" [[package]] name = "faucet" @@ -1410,8 +1431,9 @@ dependencies = [ [[package]] name = "frame-support" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "21.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80da0f683e5da274ff0401a02d16f4fb976686ed4286204fa00ab29207013d2c" dependencies = [ "bitflags 1.3.2", "environmental", @@ -1427,24 +1449,25 @@ dependencies = [ "serde", "smallvec", "sp-api", - "sp-arithmetic", - "sp-core", + "sp-arithmetic 15.0.0", + "sp-core 20.0.0", "sp-core-hashing-proc-macro", "sp-inherents", - "sp-io", - "sp-runtime", + "sp-io 22.0.0", + "sp-runtime 23.0.0", "sp-staking", - "sp-state-machine", - "sp-std 5.0.0", - "sp-tracing", - "sp-weights", + "sp-state-machine 0.27.0", + "sp-std 7.0.0", + "sp-tracing 9.0.0", + "sp-weights 19.0.0", "tt-call", ] [[package]] name = "frame-support-procedural" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "16.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37e680991289aa3e7b11609228642df005edd888b72b52fbbabb361d2b7cb1ed" dependencies = [ "Inflector", "cfg-expr", @@ -1454,29 +1477,31 @@ dependencies = [ "proc-macro-warning", "proc-macro2", "quote", - "syn 2.0.26", + "syn 1.0.109", ] [[package]] name = "frame-support-procedural-tools" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fd1ce0e420f441e4b5fc53cda17fd63f98147a392191ff3c94270d01110a070" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.26", + "syn 1.0.109", ] [[package]] name = "frame-support-procedural-tools-derive" -version = "3.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b64b7713ff42072fba1dadf3165fb4837e7d84d28fd7fae5f7d752a659607682" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 1.0.109", ] [[package]] @@ -1570,7 +1595,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.27", ] [[package]] @@ -1650,8 +1675,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ "cfg-if 1.0.0", + "js-sys", "libc", "wasi 0.9.0+wasi-snapshot-preview1", + "wasm-bindgen", ] [[package]] @@ -1682,6 +1709,11 @@ name = "gimli" version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +dependencies = [ + "fallible-iterator", + "indexmap 1.9.3", + "stable_deref_trait", +] [[package]] name = "git-version" @@ -1713,9 +1745,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1391ab1f92ffcc08911957149833e682aa3fe252b9f45f966d2ef972274c97df" +checksum = "aca8bbd8e0707c1887a8bbb7e6b40e228f251ff5d62c8220a4a7a53c73aff006" dependencies = [ "aho-corasick", "bstr", @@ -1817,6 +1849,12 @@ dependencies = [ "tracing", ] +[[package]] +name = "hash-db" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d23bd4e7b5eda0d0f3a307e8b381fdc8ba9000f26fbe912250c0a4cc3956364a" + [[package]] name = "hash-db" version = "0.16.0" @@ -2196,7 +2234,7 @@ dependencies = [ "scale-encode", "scale-info", "serde", - "sp-runtime", + "sp-runtime 6.0.0", ] [[package]] @@ -2631,9 +2669,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.9" +version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" +checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" dependencies = [ "cc", "pkg-config", @@ -2674,6 +2712,15 @@ version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +[[package]] +name = "lru" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a" +dependencies = [ + "hashbrown 0.12.3", +] + [[package]] name = "mach" version = "0.3.2" @@ -2732,6 +2779,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "memoffset" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +dependencies = [ + "autocfg", +] + [[package]] name = "memoffset" version = "0.9.0" @@ -2741,13 +2797,24 @@ dependencies = [ "autocfg", ] +[[package]] +name = "memory-db" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34ac11bb793c28fa095b7554466f53b3a60a2cd002afdac01bcf135cbd73a269" +dependencies = [ + "hash-db 0.15.2", + "hashbrown 0.12.3", + "parity-util-mem", +] + [[package]] name = "memory-db" version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "808b50db46293432a45e63bc15ea51e0ab4c0a1647b8eb114e31a3e698dd6fbe" dependencies = [ - "hash-db", + "hash-db 0.16.0", ] [[package]] @@ -2857,9 +2924,9 @@ dependencies = [ [[package]] name = "nalgebra" -version = "0.27.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "462fffe4002f4f2e1f6a9dcf12cc1a6fc0e15989014efc02a941d3e0f5dc2120" +checksum = "d506eb7e08d6329505faa8a3a00a5dcc6de9f76e0c77e4b75763ae3c770831ff" dependencies = [ "approx", "matrixmultiply", @@ -3100,9 +3167,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", "libm", @@ -3130,6 +3197,18 @@ dependencies = [ "memchr", ] +[[package]] +name = "object" +version = "0.30.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385" +dependencies = [ + "crc32fast", + "hashbrown 0.13.2", + "indexmap 1.9.3", + "memchr", +] + [[package]] name = "object" version = "0.31.1" @@ -3180,7 +3259,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.27", ] [[package]] @@ -3251,6 +3330,32 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "parity-util-mem" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d32c34f4f5ca7f9196001c0aba5a1f9a5a12382c8944b8b0f90233282d1e8f8" +dependencies = [ + "cfg-if 1.0.0", + "hashbrown 0.12.3", + "impl-trait-for-tuples", + "parity-util-mem-derive", + "parking_lot 0.12.1", + "primitive-types", + "winapi", +] + +[[package]] +name = "parity-util-mem-derive" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2" +dependencies = [ + "proc-macro2", + "syn 1.0.109", + "synstructure", +] + [[package]] name = "parity-wasm" version = "0.45.0" @@ -3311,6 +3416,15 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +[[package]] +name = "pbkdf2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216eaa586a190f0a738f2f918511eecfa90f13295abec0e457cdebcceda80cbd" +dependencies = [ + "crypto-mac 0.8.0", +] + [[package]] name = "pbkdf2" version = "0.8.0" @@ -3364,7 +3478,7 @@ checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.27", ] [[package]] @@ -3485,13 +3599,13 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro-warning" -version = "0.3.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e99670bafb56b9a106419397343bdbc8b8742c3cc449fec6345f86173f47cd4" +checksum = "9d4f284d87b9cedc2ff57223cbc4e3937cd6063c01e92c8e2a8c080df0013933" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 1.0.109", ] [[package]] @@ -3573,9 +3687,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.31" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" dependencies = [ "proc-macro2", ] @@ -3610,6 +3724,7 @@ dependencies = [ "rand_chacha 0.2.2", "rand_core 0.5.1", "rand_hc", + "rand_pcg", ] [[package]] @@ -3695,6 +3810,15 @@ dependencies = [ "rand_core 0.5.1", ] +[[package]] +name = "rand_pcg" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" +dependencies = [ + "rand_core 0.5.1", +] + [[package]] name = "raw-cpuid" version = "10.7.0" @@ -3761,22 +3885,22 @@ dependencies = [ [[package]] name = "ref-cast" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1641819477c319ef452a075ac34a4be92eb9ba09f6841f62d594d50fdcf0bf6b" +checksum = "61ef7e18e8841942ddb1cf845054f8008410030a3997875d9e49b7a363063df1" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68bf53dad9b6086826722cdc99140793afd9f62faa14a1ad07eb4f955e7a7216" +checksum = "2dfaf0c85b766276c797f3791f5bc6d5bd116b41d53049af2789666b0c0bc9fa" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.27", ] [[package]] @@ -3923,7 +4047,7 @@ dependencies = [ "sha2 0.8.2", "signal-hook", "signal-hook-tokio", - "sp-core", + "sp-core 21.0.0", "subxt", "sysinfo 0.25.3", "tempdir", @@ -3938,10 +4062,8 @@ version = "1.1.0" dependencies = [ "async-trait", "backoff", - "base58", "bitcoin 1.1.0", "bitcoin 1.2.0", - "blake2", "cfg-if 1.0.0", "clap", "env_logger 0.8.4", @@ -3960,10 +4082,9 @@ dependencies = [ "serde", "serde_json", "serial_test 0.9.0", - "sp-arithmetic", - "sp-core", + "sp-core 21.0.0", "sp-keyring", - "sp-runtime", + "sp-runtime 24.0.0", "subxt", "tempdir", "thiserror", @@ -4084,6 +4205,15 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +[[package]] +name = "safe_arch" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354" +dependencies = [ + "bytemuck", +] + [[package]] name = "scale-bits" version = "0.3.0" @@ -4337,9 +4467,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.1" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -4350,9 +4480,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -4372,29 +4502,29 @@ checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0" [[package]] name = "serde" -version = "1.0.173" +version = "1.0.177" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91f70896d6720bc714a4a57d22fc91f1db634680e65c8efe13323f1fa38d53f" +checksum = "63ba2516aa6bf82e0b19ca8b50019d52df58455d3cf9bdaf6315225fdd0c560a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.173" +version = "1.0.177" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6250dde8342e0232232be9ca3db7aa40aceb5a3e5dd9bddbc00d99a007cde49" +checksum = "401797fe7833d72109fedec6bfcbe67c0eed9b99772f26eb8afd261f0abc6fd3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.27", ] [[package]] name = "serde_json" -version = "1.0.103" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" +checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" dependencies = [ "itoa", "ryu", @@ -4461,7 +4591,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.27", ] [[package]] @@ -4621,14 +4751,15 @@ dependencies = [ [[package]] name = "simba" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e82063457853d00243beda9952e910b82593e4b07ae9f721b9278a99a0d3d5c" +checksum = "f0b7840f121a46d63066ee7a99fc81dcabbc6105e437cae43528cea199b5a05f" dependencies = [ "approx", "num-complex 0.4.3", "num-traits", "paste", + "wide", ] [[package]] @@ -4689,28 +4820,28 @@ dependencies = [ [[package]] name = "sp-api" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "19.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2600bccfb4897e030d8974a17cfb1abfb3151d1f130db4ed4af1aa3ded436e1" dependencies = [ - "hash-db", + "hash-db 0.16.0", "log", "parity-scale-codec", - "scale-info", "sp-api-proc-macro", - "sp-core", - "sp-metadata-ir", - "sp-runtime", - "sp-state-machine", - "sp-std 5.0.0", - "sp-trie", + "sp-core 20.0.0", + "sp-runtime 23.0.0", + "sp-state-machine 0.27.0", + "sp-std 7.0.0", + "sp-trie 21.0.0", "sp-version", "thiserror", ] [[package]] name = "sp-api-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c58a2f5386a0eb163fcb68b8057b3623cb8efa1470153aa5a9dac13907dbb95d" dependencies = [ "Inflector", "blake2", @@ -4718,160 +4849,400 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.26", + "syn 1.0.109", ] [[package]] name = "sp-application-crypto" -version = "7.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 6.0.0", + "sp-io 6.0.0", + "sp-std 4.0.0", +] + +[[package]] +name = "sp-application-crypto" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cf23435a4bbd6eeec2bbbc346719ba4f3200e0ddb5f9e9f06c1724db03a8410" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 20.0.0", + "sp-io 22.0.0", + "sp-std 7.0.0", +] + +[[package]] +name = "sp-application-crypto" +version = "23.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "899492ea547816d5dfe9a5a2ecc32f65a7110805af6da3380aa4902371b31dc2" dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-std 5.0.0", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-std 8.0.0", ] [[package]] name = "sp-arithmetic" -version = "6.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +dependencies = [ + "integer-sqrt", + "num-traits", + "parity-scale-codec", + "scale-info", + "serde", + "sp-debug-derive 4.0.0", + "sp-std 4.0.0", + "static_assertions", +] + +[[package]] +name = "sp-arithmetic" +version = "15.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c3d3507a803e8bc332fa290ed3015a7b51d4436ce2b836744642fc412040456" +dependencies = [ + "integer-sqrt", + "num-traits", + "parity-scale-codec", + "scale-info", + "serde", + "sp-std 7.0.0", + "static_assertions", +] + +[[package]] +name = "sp-arithmetic" +version = "16.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb6020576e544c6824a51d651bc8df8e6ab67cd59f1c9ac09868bb81a5199ded" dependencies = [ "integer-sqrt", "num-traits", "parity-scale-codec", "scale-info", "serde", - "sp-std 5.0.0", + "sp-std 8.0.0", "static_assertions", ] [[package]] name = "sp-core" -version = "7.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ "array-bytes", + "base58", "bitflags 1.3.2", "blake2", - "bounded-collections", - "bs58", + "byteorder", "dyn-clonable", "ed25519-zebra", "futures 0.3.28", - "hash-db", + "hash-db 0.15.2", "hash256-std-hasher", "impl-serde 0.4.0", "lazy_static", "libsecp256k1", "log", "merlin", + "num-traits", "parity-scale-codec", + "parity-util-mem", "parking_lot 0.12.1", - "paste", "primitive-types", - "rand 0.8.5", + "rand 0.7.3", "regex", "scale-info", "schnorrkel", "secp256k1 0.24.3", "secrecy", "serde", - "sp-core-hashing 5.0.0", - "sp-debug-derive", - "sp-externalities", - "sp-runtime-interface", - "sp-std 5.0.0", - "sp-storage", + "sp-core-hashing 4.0.0", + "sp-debug-derive 4.0.0", + "sp-externalities 0.12.0", + "sp-runtime-interface 6.0.0", + "sp-std 4.0.0", + "sp-storage 6.0.0", "ss58-registry", "substrate-bip39", "thiserror", - "tiny-bip39", + "tiny-bip39 0.8.2", + "wasmi", "zeroize", ] [[package]] -name = "sp-core-hashing" -version = "5.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" -dependencies = [ - "blake2b_simd", - "byteorder", - "digest 0.10.7", - "sha2 0.10.7", - "sha3", - "sp-std 5.0.0", - "twox-hash", -] - -[[package]] -name = "sp-core-hashing" -version = "9.0.0" +name = "sp-core" +version = "20.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ee599a8399448e65197f9a6cee338ad192e9023e35e31f22382964c3c174c68" +checksum = "7789372146f8ad40d0b40fad0596cb1db5771187a258eabe19b06f00767fcbd6" dependencies = [ - "blake2b_simd", - "byteorder", - "digest 0.10.7", - "sha2 0.10.7", - "sha3", - "sp-std 8.0.0", - "twox-hash", + "array-bytes", + "bitflags 1.3.2", + "blake2", + "bounded-collections", + "bs58", + "dyn-clonable", + "ed25519-zebra", + "futures 0.3.28", + "hash-db 0.16.0", + "hash256-std-hasher", + "impl-serde 0.4.0", + "lazy_static", + "libsecp256k1", + "log", + "merlin", + "parity-scale-codec", + "parking_lot 0.12.1", + "primitive-types", + "rand 0.8.5", + "regex", + "scale-info", + "schnorrkel", + "secp256k1 0.24.3", + "secrecy", + "serde", + "sp-core-hashing 8.0.0", + "sp-debug-derive 7.0.0", + "sp-externalities 0.18.0", + "sp-runtime-interface 16.0.0", + "sp-std 7.0.0", + "sp-storage 12.0.0", + "ss58-registry", + "substrate-bip39", + "thiserror", + "tiny-bip39 1.0.0", + "zeroize", ] [[package]] -name = "sp-core-hashing-proc-macro" -version = "5.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +name = "sp-core" +version = "21.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f18d9e2f67d8661f9729f35347069ac29d92758b59135176799db966947a7336" dependencies = [ - "proc-macro2", - "quote", - "sp-core-hashing 5.0.0", - "syn 2.0.26", -] - + "array-bytes", + "bitflags 1.3.2", + "blake2", + "bounded-collections", + "bs58", + "dyn-clonable", + "ed25519-zebra", + "futures 0.3.28", + "hash-db 0.16.0", + "hash256-std-hasher", + "impl-serde 0.4.0", + "lazy_static", + "libsecp256k1", + "log", + "merlin", + "parity-scale-codec", + "parking_lot 0.12.1", + "paste", + "primitive-types", + "rand 0.8.5", + "regex", + "scale-info", + "schnorrkel", + "secp256k1 0.24.3", + "secrecy", + "serde", + "sp-core-hashing 9.0.0", + "sp-debug-derive 8.0.0", + "sp-externalities 0.19.0", + "sp-runtime-interface 17.0.0", + "sp-std 8.0.0", + "sp-storage 13.0.0", + "ss58-registry", + "substrate-bip39", + "thiserror", + "tiny-bip39 1.0.0", + "zeroize", +] + +[[package]] +name = "sp-core-hashing" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +dependencies = [ + "blake2", + "byteorder", + "digest 0.10.7", + "sha2 0.10.7", + "sha3", + "sp-std 4.0.0", + "twox-hash", +] + +[[package]] +name = "sp-core-hashing" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27449abdfbe41b473e625bce8113745e81d65777dd1d5a8462cf24137930dad8" +dependencies = [ + "blake2b_simd", + "byteorder", + "digest 0.10.7", + "sha2 0.10.7", + "sha3", + "sp-std 7.0.0", + "twox-hash", +] + +[[package]] +name = "sp-core-hashing" +version = "9.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ee599a8399448e65197f9a6cee338ad192e9023e35e31f22382964c3c174c68" +dependencies = [ + "blake2b_simd", + "byteorder", + "digest 0.10.7", + "sha2 0.10.7", + "sha3", + "sp-std 8.0.0", + "twox-hash", +] + +[[package]] +name = "sp-core-hashing-proc-macro" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23061dbb10975058aaca7965991386d93d0ffa1c4316094357ce65814a0a2a1e" +dependencies = [ + "proc-macro2", + "quote", + "sp-core-hashing 8.0.0", + "syn 1.0.109", +] + [[package]] name = "sp-debug-derive" -version = "5.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "sp-debug-derive" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62211eed9ef9dac4b9d837c56ccc9f8ee4fc49d9d9b7e6b9daf098fe173389ab" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "sp-debug-derive" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7f531814d2f16995144c74428830ccf7d94ff4a7749632b83ad8199b181140c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.27", ] [[package]] name = "sp-externalities" -version = "0.13.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "0.12.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +dependencies = [ + "environmental", + "parity-scale-codec", + "sp-std 4.0.0", + "sp-storage 6.0.0", +] + +[[package]] +name = "sp-externalities" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ae0f275760689aaefe967943331d458cd99f5169d18364365d4cb584b246d1c" dependencies = [ "environmental", "parity-scale-codec", - "sp-std 5.0.0", - "sp-storage", + "sp-std 7.0.0", + "sp-storage 12.0.0", +] + +[[package]] +name = "sp-externalities" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0f71c671e01a8ca60da925d43a1b351b69626e268b8837f8371e320cf1dd100" +dependencies = [ + "environmental", + "parity-scale-codec", + "sp-std 8.0.0", + "sp-storage 13.0.0", ] [[package]] name = "sp-inherents" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "19.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "802044b0af966f76f0f42c23b24349c8f6f267e3ce4165244ac01bd0a49f7bb7" dependencies = [ "async-trait", "impl-trait-for-tuples", "parity-scale-codec", "scale-info", - "sp-core", - "sp-runtime", - "sp-std 5.0.0", + "sp-core 20.0.0", + "sp-runtime 23.0.0", + "sp-std 7.0.0", "thiserror", ] [[package]] name = "sp-io" -version = "7.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +dependencies = [ + "bytes", + "futures 0.3.28", + "hash-db 0.15.2", + "libsecp256k1", + "log", + "parity-scale-codec", + "parking_lot 0.12.1", + "secp256k1 0.24.3", + "sp-core 6.0.0", + "sp-externalities 0.12.0", + "sp-keystore 0.12.0", + "sp-runtime-interface 6.0.0", + "sp-state-machine 0.12.0", + "sp-std 4.0.0", + "sp-tracing 5.0.0", + "sp-trie 6.0.0", + "sp-wasm-interface 6.0.0", + "tracing", + "tracing-core", +] + +[[package]] +name = "sp-io" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd3431c245992fe51b8256c838fc2e981f8d3b0afc1d1377ca7dbe0a3287a764" dependencies = [ "bytes", "ed25519", @@ -4882,57 +5253,107 @@ dependencies = [ "parity-scale-codec", "rustversion", "secp256k1 0.24.3", - "sp-core", - "sp-externalities", - "sp-keystore", - "sp-runtime-interface", - "sp-state-machine", - "sp-std 5.0.0", - "sp-tracing", - "sp-trie", + "sp-core 20.0.0", + "sp-externalities 0.18.0", + "sp-keystore 0.26.0", + "sp-runtime-interface 16.0.0", + "sp-state-machine 0.27.0", + "sp-std 7.0.0", + "sp-tracing 9.0.0", + "sp-trie 21.0.0", + "tracing", + "tracing-core", +] + +[[package]] +name = "sp-io" +version = "23.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d597e35a9628fe7454b08965b2442e3ec0f264b0a90d41328e87422cec02e99" +dependencies = [ + "bytes", + "ed25519", + "ed25519-dalek", + "futures 0.3.28", + "libsecp256k1", + "log", + "parity-scale-codec", + "rustversion", + "secp256k1 0.24.3", + "sp-core 21.0.0", + "sp-externalities 0.19.0", + "sp-keystore 0.27.0", + "sp-runtime-interface 17.0.0", + "sp-state-machine 0.28.0", + "sp-std 8.0.0", + "sp-tracing 10.0.0", + "sp-trie 22.0.0", "tracing", "tracing-core", ] [[package]] name = "sp-keyring" -version = "7.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "24.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4673405248580504a8bc4e09615ab25ccb182dfaccd27e000fda9dcb2ca1dab1" dependencies = [ "lazy_static", - "sp-core", - "sp-runtime", + "sp-core 21.0.0", + "sp-runtime 24.0.0", "strum", ] [[package]] name = "sp-keystore" -version = "0.13.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "0.12.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ + "async-trait", "futures 0.3.28", + "merlin", "parity-scale-codec", "parking_lot 0.12.1", - "sp-core", - "sp-externalities", + "schnorrkel", + "sp-core 6.0.0", + "sp-externalities 0.12.0", "thiserror", ] [[package]] -name = "sp-metadata-ir" -version = "0.1.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +name = "sp-keystore" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "452d079f592c97369c9ca8a5083b25f146751c6b5af10cbcacc2b24dc53fd72a" dependencies = [ - "frame-metadata", + "futures 0.3.28", + "merlin", "parity-scale-codec", - "scale-info", - "sp-std 5.0.0", + "parking_lot 0.12.1", + "schnorrkel", + "sp-core 20.0.0", + "sp-externalities 0.18.0", + "thiserror", +] + +[[package]] +name = "sp-keystore" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9be3cdd67cc1d9c1db17c5cbc4ec4924054a8437009d167f21f6590797e4aa45" +dependencies = [ + "futures 0.3.28", + "parity-scale-codec", + "parking_lot 0.12.1", + "sp-core 21.0.0", + "sp-externalities 0.19.0", + "thiserror", ] [[package]] name = "sp-panic-handler" -version = "5.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ "backtrace", "lazy_static", @@ -4940,9 +5361,78 @@ dependencies = [ ] [[package]] -name = "sp-runtime" +name = "sp-panic-handler" version = "7.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75986cc917d897e0f6d0c848088064df4c74ccbb8f1c1848700b725f5ca7fe04" +dependencies = [ + "backtrace", + "lazy_static", + "regex", +] + +[[package]] +name = "sp-panic-handler" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebd2de46003fa8212426838ca71cd42ee36a26480ba9ffea983506ce03131033" +dependencies = [ + "backtrace", + "lazy_static", + "regex", +] + +[[package]] +name = "sp-runtime" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +dependencies = [ + "either", + "hash256-std-hasher", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "parity-util-mem", + "paste", + "rand 0.7.3", + "scale-info", + "serde", + "sp-application-crypto 6.0.0", + "sp-arithmetic 5.0.0", + "sp-core 6.0.0", + "sp-io 6.0.0", + "sp-std 4.0.0", + "sp-weights 4.0.0", +] + +[[package]] +name = "sp-runtime" +version = "23.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6220216caa67e3d931c693b06a3590dfcaa255f19bb3c3e3150f1672b8bc53f6" +dependencies = [ + "either", + "hash256-std-hasher", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "paste", + "rand 0.8.5", + "scale-info", + "serde", + "sp-application-crypto 22.0.0", + "sp-arithmetic 15.0.0", + "sp-core 20.0.0", + "sp-io 22.0.0", + "sp-std 7.0.0", + "sp-weights 19.0.0", +] + +[[package]] +name = "sp-runtime" +version = "24.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21c5bfc764a1a8259d7e8f7cfd22c84006275a512c958d3ff966c92151e134d5" dependencies = [ "either", "hash256-std-hasher", @@ -4953,140 +5443,357 @@ dependencies = [ "rand 0.8.5", "scale-info", "serde", - "sp-application-crypto", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-std 5.0.0", - "sp-weights", + "sp-application-crypto 23.0.0", + "sp-arithmetic 16.0.0", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-std 8.0.0", + "sp-weights 20.0.0", ] [[package]] name = "sp-runtime-interface" -version = "7.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ "bytes", "impl-trait-for-tuples", "parity-scale-codec", "primitive-types", - "sp-externalities", - "sp-runtime-interface-proc-macro", - "sp-std 5.0.0", - "sp-storage", - "sp-tracing", - "sp-wasm-interface", + "sp-externalities 0.12.0", + "sp-runtime-interface-proc-macro 5.0.0", + "sp-std 4.0.0", + "sp-storage 6.0.0", + "sp-tracing 5.0.0", + "sp-wasm-interface 6.0.0", + "static_assertions", +] + +[[package]] +name = "sp-runtime-interface" +version = "16.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca5d0cd80200bf85b8b064238b2508b69b6146b13adf36066ec5d924825af737" +dependencies = [ + "bytes", + "impl-trait-for-tuples", + "parity-scale-codec", + "primitive-types", + "sp-externalities 0.18.0", + "sp-runtime-interface-proc-macro 10.0.0", + "sp-std 7.0.0", + "sp-storage 12.0.0", + "sp-tracing 9.0.0", + "sp-wasm-interface 13.0.0", + "static_assertions", +] + +[[package]] +name = "sp-runtime-interface" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e676128182f90015e916f806cba635c8141e341e7abbc45d25525472e1bbce8" +dependencies = [ + "bytes", + "impl-trait-for-tuples", + "parity-scale-codec", + "primitive-types", + "sp-externalities 0.19.0", + "sp-runtime-interface-proc-macro 11.0.0", + "sp-std 8.0.0", + "sp-storage 13.0.0", + "sp-tracing 10.0.0", + "sp-wasm-interface 14.0.0", "static_assertions", ] [[package]] name = "sp-runtime-interface-proc-macro" -version = "6.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ "Inflector", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.26", + "syn 1.0.109", +] + +[[package]] +name = "sp-runtime-interface-proc-macro" +version = "10.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05ae5b00aef477127ddb6177b3464ad1e2bdcc12ee913fc5dfc9d065c6cea89b" +dependencies = [ + "Inflector", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "sp-runtime-interface-proc-macro" +version = "11.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5d5bd5566fe5633ec48dfa35ab152fd29f8a577c21971e1c6db9f28afb9bbb9" +dependencies = [ + "Inflector", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.27", ] [[package]] name = "sp-staking" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "19.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04b95b340fdd272af8bbec8dbc80996931a04b89d3d1edac555dcdd447f5982d" dependencies = [ "parity-scale-codec", "scale-info", + "sp-core 20.0.0", + "sp-runtime 23.0.0", + "sp-std 7.0.0", +] + +[[package]] +name = "sp-state-machine" +version = "0.12.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +dependencies = [ + "hash-db 0.15.2", + "log", + "num-traits", + "parity-scale-codec", + "parking_lot 0.12.1", + "rand 0.7.3", + "smallvec", + "sp-core 6.0.0", + "sp-externalities 0.12.0", + "sp-panic-handler 4.0.0", + "sp-std 4.0.0", + "sp-trie 6.0.0", + "thiserror", + "tracing", + "trie-root 0.17.0", +] + +[[package]] +name = "sp-state-machine" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1e49c3bfcc8c832c34552cd8194180cc60508c6d3d9b0b9615d6b7c3e275019" +dependencies = [ + "hash-db 0.16.0", + "log", + "parity-scale-codec", + "parking_lot 0.12.1", + "rand 0.8.5", + "smallvec", + "sp-core 20.0.0", + "sp-externalities 0.18.0", + "sp-panic-handler 7.0.0", + "sp-std 7.0.0", + "sp-trie 21.0.0", + "thiserror", + "tracing", +] + +[[package]] +name = "sp-state-machine" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ef45d31f9e7ac648f8899a0cd038a3608f8499028bff55b6c799702592325b6" +dependencies = [ + "hash-db 0.16.0", + "log", + "parity-scale-codec", + "parking_lot 0.12.1", + "rand 0.8.5", + "smallvec", + "sp-core 21.0.0", + "sp-externalities 0.19.0", + "sp-panic-handler 8.0.0", + "sp-std 8.0.0", + "sp-trie 22.0.0", + "thiserror", + "tracing", +] + +[[package]] +name = "sp-std" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" + +[[package]] +name = "sp-std" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1de8eef39962b5b97478719c493bed2926cf70cb621005bbf68ebe58252ff986" + +[[package]] +name = "sp-std" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53458e3c57df53698b3401ec0934bea8e8cfce034816873c0b0abbd83d7bac0d" + +[[package]] +name = "sp-storage" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +dependencies = [ + "impl-serde 0.4.0", + "parity-scale-codec", + "ref-cast", "serde", - "sp-core", - "sp-runtime", - "sp-std 5.0.0", + "sp-debug-derive 4.0.0", + "sp-std 4.0.0", +] + +[[package]] +name = "sp-storage" +version = "12.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ad1f8c52d4700ac7bc42b3375679a6c6fc1fe876f4b40c6efdf36f933ef0291" +dependencies = [ + "impl-serde 0.4.0", + "parity-scale-codec", + "ref-cast", + "serde", + "sp-debug-derive 7.0.0", + "sp-std 7.0.0", +] + +[[package]] +name = "sp-storage" +version = "13.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94294be83f11d4958cfea89ed5798f0b6605f5defc3a996948848458abbcc18e" +dependencies = [ + "impl-serde 0.4.0", + "parity-scale-codec", + "ref-cast", + "serde", + "sp-debug-derive 8.0.0", + "sp-std 8.0.0", +] + +[[package]] +name = "sp-tracing" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +dependencies = [ + "parity-scale-codec", + "sp-std 4.0.0", + "tracing", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "sp-tracing" +version = "9.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00fab60bf3d42255ce3f678903d3a2564662371c75623de4a1ffc7cac46143df" +dependencies = [ + "parity-scale-codec", + "sp-std 7.0.0", + "tracing", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "sp-tracing" +version = "10.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "357f7591980dd58305956d32f8f6646d0a8ea9ea0e7e868e46f53b68ddf00cec" +dependencies = [ + "parity-scale-codec", + "sp-std 8.0.0", + "tracing", + "tracing-core", + "tracing-subscriber", ] [[package]] -name = "sp-state-machine" -version = "0.13.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +name = "sp-trie" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ - "hash-db", - "log", + "ahash 0.7.6", + "hash-db 0.15.2", + "hashbrown 0.12.3", + "lazy_static", + "lru", + "memory-db 0.30.0", + "nohash-hasher", "parity-scale-codec", "parking_lot 0.12.1", - "rand 0.8.5", - "smallvec", - "sp-core", - "sp-externalities", - "sp-panic-handler", - "sp-std 5.0.0", - "sp-trie", + "scale-info", + "sp-core 6.0.0", + "sp-std 4.0.0", "thiserror", "tracing", + "trie-db 0.24.0", + "trie-root 0.17.0", ] [[package]] -name = "sp-std" -version = "5.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" - -[[package]] -name = "sp-std" -version = "8.0.0" +name = "sp-trie" +version = "21.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53458e3c57df53698b3401ec0934bea8e8cfce034816873c0b0abbd83d7bac0d" - -[[package]] -name = "sp-storage" -version = "7.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" -dependencies = [ - "impl-serde 0.4.0", - "parity-scale-codec", - "ref-cast", - "serde", - "sp-debug-derive", - "sp-std 5.0.0", -] - -[[package]] -name = "sp-tracing" -version = "6.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +checksum = "58401c53c08b6ecad83acd7e14534c8bbcb3fa73e81e26685e0ac70e51b00c56" dependencies = [ + "ahash 0.8.3", + "hash-db 0.16.0", + "hashbrown 0.13.2", + "lazy_static", + "memory-db 0.32.0", + "nohash-hasher", "parity-scale-codec", - "sp-std 5.0.0", + "parking_lot 0.12.1", + "scale-info", + "schnellru", + "sp-core 20.0.0", + "sp-std 7.0.0", + "thiserror", "tracing", - "tracing-core", - "tracing-subscriber", + "trie-db 0.27.1", + "trie-root 0.18.0", ] [[package]] name = "sp-trie" -version = "7.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4eeb7ef23f79eba8609db79ef9cef242f994f1f87a3c0387b4b5f177fda74" dependencies = [ "ahash 0.8.3", - "hash-db", + "hash-db 0.16.0", "hashbrown 0.13.2", "lazy_static", - "memory-db", + "memory-db 0.32.0", "nohash-hasher", "parity-scale-codec", "parking_lot 0.12.1", "scale-info", "schnellru", - "sp-core", - "sp-std 5.0.0", + "sp-core 21.0.0", + "sp-std 8.0.0", "thiserror", "tracing", - "trie-db", - "trie-root", + "trie-db 0.27.1", + "trie-root 0.18.0", ] [[package]] name = "sp-version" -version = "5.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "21.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34be5b74199bdda63e9ec48dc1e9dd605af947b76fba0c738a422a6d4ae14f47" dependencies = [ "impl-serde 0.4.0", "parity-scale-codec", @@ -5094,50 +5801,111 @@ dependencies = [ "scale-info", "serde", "sp-core-hashing-proc-macro", - "sp-runtime", - "sp-std 5.0.0", + "sp-runtime 23.0.0", + "sp-std 7.0.0", "sp-version-proc-macro", "thiserror", ] [[package]] name = "sp-version-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a42f1acfd2bbaa92c4d97f7a0840e900a5dfa8e8d57b91c031c64f1df2112e90" dependencies = [ "parity-scale-codec", "proc-macro2", "quote", - "syn 2.0.26", + "syn 1.0.109", ] [[package]] name = "sp-wasm-interface" -version = "7.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +dependencies = [ + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "sp-std 4.0.0", + "wasmi", +] + +[[package]] +name = "sp-wasm-interface" +version = "13.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "153b7374179439e2aa783c66ed439bd86920c67bbc95d34c76390561972bc02f" dependencies = [ "anyhow", "impl-trait-for-tuples", "log", "parity-scale-codec", - "sp-std 5.0.0", + "sp-std 7.0.0", "wasmi", - "wasmtime", + "wasmtime 6.0.2", +] + +[[package]] +name = "sp-wasm-interface" +version = "14.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19c122609ca5d8246be6386888596320d03c7bc880959eaa2c36bcd5acd6846" +dependencies = [ + "anyhow", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "sp-std 8.0.0", + "wasmtime 8.0.1", ] [[package]] name = "sp-weights" version = "4.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +dependencies = [ + "impl-trait-for-tuples", + "parity-scale-codec", + "scale-info", + "serde", + "smallvec", + "sp-arithmetic 5.0.0", + "sp-core 6.0.0", + "sp-debug-derive 4.0.0", + "sp-std 4.0.0", +] + +[[package]] +name = "sp-weights" +version = "19.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "123c661915e1bf328e21f8ecbe4e5247feba86f9149b782ea4348004547ce8ef" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "smallvec", + "sp-arithmetic 15.0.0", + "sp-core 20.0.0", + "sp-debug-derive 7.0.0", + "sp-std 7.0.0", +] + +[[package]] +name = "sp-weights" +version = "20.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45d084c735544f70625b821c3acdbc7a2fc1893ca98b85f1942631284692c75b" dependencies = [ "parity-scale-codec", "scale-info", "serde", "smallvec", - "sp-arithmetic", - "sp-core", - "sp-debug-derive", - "sp-std 5.0.0", + "sp-arithmetic 16.0.0", + "sp-core 21.0.0", + "sp-debug-derive 8.0.0", + "sp-std 8.0.0", ] [[package]] @@ -5197,9 +5965,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "statrs" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05bdbb8e4e78216a85785a85d3ec3183144f98d0097b9281802c019bb07a6f05" +checksum = "2d08e5e1748192713cc281da8b16924fb46be7b0c2431854eadc785823e5696e" dependencies = [ "approx", "lazy_static", @@ -5302,7 +6070,7 @@ dependencies = [ "quote", "scale-info", "subxt-metadata", - "syn 2.0.26", + "syn 2.0.27", "thiserror", "tokio", ] @@ -5316,7 +6084,7 @@ dependencies = [ "darling 0.20.3", "proc-macro-error", "subxt-codegen", - "syn 2.0.26", + "syn 2.0.27", ] [[package]] @@ -5345,15 +6113,27 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.26" +version = "2.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970" +checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "synstructure" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "unicode-xid", +] + [[package]] name = "sysinfo" version = "0.25.3" @@ -5408,15 +6188,14 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.6.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998" dependencies = [ - "autocfg", "cfg-if 1.0.0", "fastrand", "redox_syscall 0.3.5", - "rustix 0.37.23", + "rustix 0.38.4", "windows-sys 0.48.0", ] @@ -5437,22 +6216,22 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "thiserror" -version = "1.0.43" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.43" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.27", ] [[package]] @@ -5475,6 +6254,25 @@ dependencies = [ "winapi", ] +[[package]] +name = "tiny-bip39" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffc59cb9dfc85bb312c3a78fd6aa8a8582e310b0fa885d5bb877f6dcc601839d" +dependencies = [ + "anyhow", + "hmac 0.8.1", + "once_cell", + "pbkdf2 0.4.0", + "rand 0.7.3", + "rustc-hash", + "sha2 0.9.9", + "thiserror", + "unicode-normalization", + "wasm-bindgen", + "zeroize", +] + [[package]] name = "tiny-bip39" version = "1.0.0" @@ -5537,7 +6335,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.27", ] [[package]] @@ -5677,7 +6475,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.27", ] [[package]] @@ -5743,26 +6541,48 @@ dependencies = [ "tracing-serde", ] +[[package]] +name = "trie-db" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "004e1e8f92535694b4cb1444dc5a8073ecf0815e3357f729638b9f8fc4062908" +dependencies = [ + "hash-db 0.15.2", + "hashbrown 0.12.3", + "log", + "rustc-hex", + "smallvec", +] + [[package]] name = "trie-db" version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "767abe6ffed88a1889671a102c2861ae742726f52e0a5a425b92c9fbfa7e9c85" dependencies = [ - "hash-db", + "hash-db 0.16.0", "hashbrown 0.13.2", "log", "rustc-hex", "smallvec", ] +[[package]] +name = "trie-root" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a36c5ca3911ed3c9a5416ee6c679042064b93fc637ded67e25f92e68d783891" +dependencies = [ + "hash-db 0.15.2", +] + [[package]] name = "trie-root" version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4ed310ef5ab98f5fa467900ed906cb9232dd5376597e00fd4cba2a449d06c0b" dependencies = [ - "hash-db", + "hash-db 0.16.0", ] [[package]] @@ -6039,7 +6859,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.27", "wasm-bindgen-shared", ] @@ -6073,7 +6893,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.27", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6127,6 +6947,16 @@ dependencies = [ "url 2.4.0", ] +[[package]] +name = "wasmparser" +version = "0.102.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48134de3d7598219ab9eaf6b91b15d8e50d31da76b8519fe4ecfcec2cf35104b" +dependencies = [ + "indexmap 1.9.3", + "url 2.4.0", +] + [[package]] name = "wasmtime" version = "6.0.2" @@ -6145,13 +6975,38 @@ dependencies = [ "psm", "serde", "target-lexicon", - "wasmparser", - "wasmtime-environ", - "wasmtime-jit", - "wasmtime-runtime", + "wasmparser 0.100.0", + "wasmtime-environ 6.0.2", + "wasmtime-jit 6.0.2", + "wasmtime-runtime 6.0.2", "windows-sys 0.42.0", ] +[[package]] +name = "wasmtime" +version = "8.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f907fdead3153cb9bfb7a93bbd5b62629472dc06dee83605358c64c52ed3dda9" +dependencies = [ + "anyhow", + "bincode", + "cfg-if 1.0.0", + "indexmap 1.9.3", + "libc", + "log", + "object 0.30.4", + "once_cell", + "paste", + "psm", + "serde", + "target-lexicon", + "wasmparser 0.102.0", + "wasmtime-environ 8.0.1", + "wasmtime-jit 8.0.1", + "wasmtime-runtime 8.0.1", + "windows-sys 0.45.0", +] + [[package]] name = "wasmtime-asm-macros" version = "6.0.2" @@ -6161,6 +7016,15 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "wasmtime-asm-macros" +version = "8.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3b9daa7c14cd4fa3edbf69de994408d5f4b7b0959ac13fa69d465f6597f810d" +dependencies = [ + "cfg-if 1.0.0", +] + [[package]] name = "wasmtime-environ" version = "6.0.2" @@ -6168,7 +7032,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47b8b50962eae38ee319f7b24900b7cf371f03eebdc17400c1dc8575fc10c9a7" dependencies = [ "anyhow", - "cranelift-entity", + "cranelift-entity 0.93.2", "gimli 0.26.2", "indexmap 1.9.3", "log", @@ -6176,8 +7040,27 @@ dependencies = [ "serde", "target-lexicon", "thiserror", - "wasmparser", - "wasmtime-types", + "wasmparser 0.100.0", + "wasmtime-types 6.0.2", +] + +[[package]] +name = "wasmtime-environ" +version = "8.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a990198cee4197423045235bf89d3359e69bd2ea031005f4c2d901125955c949" +dependencies = [ + "anyhow", + "cranelift-entity 0.95.1", + "gimli 0.27.3", + "indexmap 1.9.3", + "log", + "object 0.30.4", + "serde", + "target-lexicon", + "thiserror", + "wasmparser 0.102.0", + "wasmtime-types 8.0.1", ] [[package]] @@ -6197,12 +7080,35 @@ dependencies = [ "rustc-demangle", "serde", "target-lexicon", - "wasmtime-environ", - "wasmtime-jit-icache-coherence", - "wasmtime-runtime", + "wasmtime-environ 6.0.2", + "wasmtime-jit-icache-coherence 6.0.2", + "wasmtime-runtime 6.0.2", "windows-sys 0.42.0", ] +[[package]] +name = "wasmtime-jit" +version = "8.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de48df552cfca1c9b750002d3e07b45772dd033b0b206d5c0968496abf31244" +dependencies = [ + "addr2line 0.19.0", + "anyhow", + "bincode", + "cfg-if 1.0.0", + "cpp_demangle", + "gimli 0.27.3", + "log", + "object 0.30.4", + "rustc-demangle", + "serde", + "target-lexicon", + "wasmtime-environ 8.0.1", + "wasmtime-jit-icache-coherence 8.0.1", + "wasmtime-runtime 8.0.1", + "windows-sys 0.45.0", +] + [[package]] name = "wasmtime-jit-debug" version = "6.0.2" @@ -6212,6 +7118,15 @@ dependencies = [ "once_cell", ] +[[package]] +name = "wasmtime-jit-debug" +version = "8.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e0554b84c15a27d76281d06838aed94e13a77d7bf604bbbaf548aa20eb93846" +dependencies = [ + "once_cell", +] + [[package]] name = "wasmtime-jit-icache-coherence" version = "6.0.2" @@ -6223,6 +7138,17 @@ dependencies = [ "windows-sys 0.42.0", ] +[[package]] +name = "wasmtime-jit-icache-coherence" +version = "8.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aecae978b13f7f67efb23bd827373ace4578f2137ec110bbf6a4a7cde4121bbd" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "windows-sys 0.45.0", +] + [[package]] name = "wasmtime-runtime" version = "6.0.2" @@ -6241,22 +7167,58 @@ dependencies = [ "paste", "rand 0.8.5", "rustix 0.36.15", - "wasmtime-asm-macros", - "wasmtime-environ", - "wasmtime-jit-debug", + "wasmtime-asm-macros 6.0.2", + "wasmtime-environ 6.0.2", + "wasmtime-jit-debug 6.0.2", "windows-sys 0.42.0", ] +[[package]] +name = "wasmtime-runtime" +version = "8.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "658cf6f325232b6760e202e5255d823da5e348fdea827eff0a2a22319000b441" +dependencies = [ + "anyhow", + "cc", + "cfg-if 1.0.0", + "indexmap 1.9.3", + "libc", + "log", + "mach", + "memfd", + "memoffset 0.8.0", + "paste", + "rand 0.8.5", + "rustix 0.36.15", + "wasmtime-asm-macros 8.0.1", + "wasmtime-environ 8.0.1", + "wasmtime-jit-debug 8.0.1", + "windows-sys 0.45.0", +] + [[package]] name = "wasmtime-types" version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83e5572c5727c1ee7e8f28717aaa8400e4d22dcbd714ea5457d85b5005206568" dependencies = [ - "cranelift-entity", + "cranelift-entity 0.93.2", + "serde", + "thiserror", + "wasmparser 0.100.0", +] + +[[package]] +name = "wasmtime-types" +version = "8.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4f6fffd2a1011887d57f07654dd112791e872e3ff4a2e626aee8059ee17f06f" +dependencies = [ + "cranelift-entity 0.95.1", "serde", "thiserror", - "wasmparser", + "wasmparser 0.102.0", ] [[package]] @@ -6288,6 +7250,16 @@ dependencies = [ "webpki", ] +[[package]] +name = "wide" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa469ffa65ef7e0ba0f164183697b89b854253fd31aeb92358b7b6155177d62f" +dependencies = [ + "bytemuck", + "safe_arch", +] + [[package]] name = "winapi" version = "0.3.9" @@ -6477,9 +7449,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winnow" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7" +checksum = "25b5872fa2e10bd067ae946f927e726d7d603eaeb6e02fa6a350e0722d2b8c11" dependencies = [ "memchr", ] @@ -6525,5 +7497,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.27", ] diff --git a/Cargo.toml b/Cargo.toml index b8cb87e78..e2f125af6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,38 +9,3 @@ members = [ "service", "runner" ] - -[patch.crates-io] -sp-core = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-state-machine = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-io = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-keyring = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-runtime = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } - -[patch."https://github.com/paritytech/substrate"] -frame-support = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -frame-support-procedural = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -frame-support-procedural-tools = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -frame-support-procedural-tools-derive = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-api = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-application-crypto = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-arithmetic = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-core = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-debug-derive = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-externalities = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-inherents = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-io = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-keyring = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-keystore = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-runtime = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-runtime-interface = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-runtime-interface-proc-macro = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-staking = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-state-machine = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-std = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-storage = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-tracing = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-trie = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-version = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-wasm-interface = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-weights = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } \ No newline at end of file diff --git a/bitcoin/Cargo.toml b/bitcoin/Cargo.toml index e4a0195ea..2b21d7ba3 100644 --- a/bitcoin/Cargo.toml +++ b/bitcoin/Cargo.toml @@ -35,7 +35,7 @@ serde = "1.0.139" serde_json = "1.0.82" # Substrate dependencies -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-core = { version = "21.0.0", default-features = false } [dev-dependencies] mockall = "0.8.1" diff --git a/faucet/Cargo.toml b/faucet/Cargo.toml index 54b995ac0..fd8a3c9eb 100644 --- a/faucet/Cargo.toml +++ b/faucet/Cargo.toml @@ -45,4 +45,4 @@ serial_test = "0.9.0" runtime = { path = "../runtime", features = ["testing-utils"] } # Substrate dependencies -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-keyring = "24.0.0" diff --git a/oracle/Cargo.toml b/oracle/Cargo.toml index 072e8184f..0893c50d8 100644 --- a/oracle/Cargo.toml +++ b/oracle/Cargo.toml @@ -23,7 +23,7 @@ backoff = { version = "0.3.0", features = ["tokio"] } git-version = "0.3.4" futures = "0.3.5" async-trait = "0.1.40" -statrs = "0.15" +statrs = "0.16" serde_json = "1.0" serde = "1.0" diff --git a/runner/Cargo.toml b/runner/Cargo.toml index 28400be4f..fb72c2617 100644 --- a/runner/Cargo.toml +++ b/runner/Cargo.toml @@ -10,7 +10,6 @@ clap = { version = "4.0.17", features = ["derive"]} hex = "0.4.3" tokio = { version = "1.8", features = ["rt-multi-thread", "macros", "time"] } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "full", "bit-vec"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } thiserror = "1.0.0" log = "0.4.0" env_logger = "0.7.1" @@ -27,6 +26,9 @@ backoff = { version = "0.3.0", features = ["tokio"] } subxt = { version = "0.29.0", default_features = false, features = ["jsonrpsee-ws"] } sha2 = "0.8.2" +# Substrate dependencies +sp-core = { version = "21.0.0", default-features = false } + [dev-dependencies] sysinfo = "0.25.1" tempdir = "0.3.7" diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 170ed773b..ea82ee91c 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -9,6 +9,7 @@ default = [] testing-utils = [ "tempdir", "rand", + "frame-support", ] parachain-metadata-interlay = [] parachain-metadata-kintsugi = [] @@ -28,17 +29,14 @@ url = "2" cfg-if = "1.0" prometheus = { version = "0.12.0", features = ["process"] } lazy_static = "1.4.0" -base58 = { version = "0.2.0" } -blake2 = { version = "0.10.4", default-features = false } scale-decode = { version = "0.7.0", features = ["derive"] } scale-encode = { version = "0.3.0", features = ["derive"] } # Substrate dependencies -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-core = { version = "21.0.0", default-features = false } +sp-runtime = "24.0.0" +sp-keyring = "24.0.0" +frame-support = { version = "21.0.0", optional = true } # Subxt dependencies subxt = { version = "0.29.0", default_features = false, features = ["jsonrpsee-ws"] } @@ -54,12 +52,17 @@ rand = { version = "0.7", optional = true } git = "https://github.com/interlay/interbtc" rev = "1b90616692dcce55749616b4c60bdab228279909" package = "interbtc-primitives" +default_features = false +# NOTE: sp-runtime still in lockfile but not used +# https://github.com/rust-lang/cargo/issues/10801 +features = ["std"] [dependencies.module-bitcoin] git = "https://github.com/interlay/interbtc" rev = "1b90616692dcce55749616b4c60bdab228279909" package = "bitcoin" -features = ["parser"] +default_features = false +features = ["std", "parser"] [dev-dependencies] runtime = { path = ".", features = ["testing-utils"] } diff --git a/runtime/src/cli.rs b/runtime/src/cli.rs index 4b6e6e034..7922654d8 100644 --- a/runtime/src/cli.rs +++ b/runtime/src/cli.rs @@ -1,7 +1,6 @@ use crate::{ error::{Error, KeyLoadingError}, - rpc::ShutdownSender, - InterBtcParachain, InterBtcSigner, + InterBtcParachain, InterBtcSigner, ShutdownSender, }; use clap::Parser; use sp_core::{sr25519, Pair}; diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index d5dd78e0a..f03513749 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -18,36 +18,38 @@ mod tests; #[cfg(feature = "testing-utils")] pub mod integration; -use subxt::config::SubstrateConfig; + pub mod utils; + pub use addr::PartialAddress; pub use assets::{AssetRegistry, LendingAssets, RuntimeCurrencyInfo, TryFromSymbol}; -use codec::{Decode, Encode}; pub use error::{Error, SubxtError}; pub use primitives::CurrencyInfo; pub use prometheus; pub use retry::{notify_retry, RetryPolicy}; -#[cfg(feature = "testing-utils")] -pub use rpc::SudoPallet; pub use rpc::{ BtcRelayPallet, CollateralBalancesPallet, FeePallet, FeeRateUpdateReceiver, InterBtcParachain, IssuePallet, - OraclePallet, RedeemPallet, ReplacePallet, SecurityPallet, TimestampPallet, UtilFuncs, VaultRegistryPallet, - DEFAULT_SPEC_NAME, SS58_PREFIX, + OraclePallet, RedeemPallet, ReplacePallet, SecurityPallet, SudoPallet, TimestampPallet, UtilFuncs, + VaultRegistryPallet, DEFAULT_SPEC_NAME, SS58_PREFIX, }; pub use shutdown::{ShutdownReceiver, ShutdownSender}; -pub use sp_arithmetic::{traits as FixedPointTraits, FixedI128, FixedPointNumber, FixedU128}; pub use sp_core; +pub use sp_runtime::{traits as FixedPointTraits, FixedPointNumber, FixedU128}; pub use std::collections::btree_set::BTreeSet; -use std::{marker::PhantomData, time::Duration}; -use subxt::{config::polkadot::PolkadotExtrinsicParams, subxt, Config}; pub use types::*; + +use std::time::Duration; +use subxt::{ + config::{polkadot::PolkadotExtrinsicParams, SubstrateConfig}, + subxt, Config, +}; + pub const TX_FEES: u128 = 2000000000; pub const MILLISECS_PER_BLOCK: u64 = 12000; pub const BLOCK_INTERVAL: Duration = Duration::from_millis(MILLISECS_PER_BLOCK); pub const BTC_RELAY_MODULE: &str = "BTCRelay"; pub const ISSUE_MODULE: &str = "Issue"; -pub const SECURITY_MODULE: &str = "Security"; pub const SYSTEM_MODULE: &str = "System"; pub const VAULT_REGISTRY_MODULE: &str = "VaultRegistry"; @@ -55,7 +57,6 @@ pub const STABLE_BITCOIN_CONFIRMATIONS: &str = "StableBitcoinConfirmations"; pub const STABLE_PARACHAIN_CONFIRMATIONS: &str = "StableParachainConfirmations"; pub const DISABLE_DIFFICULTY_CHECK: &str = "DisableDifficultyCheck"; -// TODO: possibly substitute CurrencyId, VaultId, H256Le #[cfg_attr( feature = "parachain-metadata-interlay", subxt( @@ -71,6 +72,11 @@ pub const DISABLE_DIFFICULTY_CHECK: &str = "DisableDifficultyCheck"; ), derive_for_type(path = "interbtc_primitives::VaultCurrencyPair", derive = "Eq, PartialEq"), derive_for_type(path = "interbtc_primitives::VaultId", derive = "Eq, PartialEq"), + derive_for_type(path = "sp_runtime::DispatchError", derive = "serde::Deserialize"), + derive_for_type(path = "sp_runtime::TransactionalError", derive = "serde::Deserialize"), + derive_for_type(path = "sp_arithmetic::ArithmeticError", derive = "serde::Deserialize"), + derive_for_type(path = "sp_runtime::TokenError", derive = "serde::Deserialize"), + derive_for_type(path = "sp_runtime::ModuleError", derive = "serde::Deserialize"), substitute_type(path = "primitive_types::H256", with = "::subxt::utils::Static"), substitute_type(path = "primitive_types::U256", with = "::subxt::utils::Static"), substitute_type(path = "primitive_types::H160", with = "::subxt::utils::Static"), @@ -88,10 +94,6 @@ pub const DISABLE_DIFFICULTY_CHECK: &str = "DisableDifficultyCheck"; with = "::subxt::utils::Static" ), substitute_type(path = "interbtc_primitives::CurrencyId", with = "crate::CurrencyId"), - substitute_type( - path = "frame_support::traits::misc::WrapperKeepOpaque", - with = "::subxt::utils::Static" - ), substitute_type( path = "bitcoin::types::BlockHeader", with = "::subxt::utils::Static<::module_bitcoin::types::BlockHeader>" @@ -125,6 +127,11 @@ pub const DISABLE_DIFFICULTY_CHECK: &str = "DisableDifficultyCheck"; ), derive_for_type(path = "interbtc_primitives::VaultCurrencyPair", derive = "Eq, PartialEq"), derive_for_type(path = "interbtc_primitives::VaultId", derive = "Eq, PartialEq"), + derive_for_type(path = "sp_runtime::DispatchError", derive = "serde::Deserialize"), + derive_for_type(path = "sp_runtime::TransactionalError", derive = "serde::Deserialize"), + derive_for_type(path = "sp_arithmetic::ArithmeticError", derive = "serde::Deserialize"), + derive_for_type(path = "sp_runtime::TokenError", derive = "serde::Deserialize"), + derive_for_type(path = "sp_runtime::ModuleError", derive = "serde::Deserialize"), substitute_type(path = "primitive_types::H256", with = "::subxt::utils::Static"), substitute_type(path = "primitive_types::U256", with = "::subxt::utils::Static"), substitute_type(path = "primitive_types::H160", with = "::subxt::utils::Static"), @@ -142,10 +149,6 @@ pub const DISABLE_DIFFICULTY_CHECK: &str = "DisableDifficultyCheck"; with = "::subxt::utils::Static" ), substitute_type(path = "interbtc_primitives::CurrencyId", with = "crate::CurrencyId"), - substitute_type( - path = "frame_support::traits::misc::WrapperKeepOpaque", - with = "::subxt::utils::Static" - ), substitute_type( path = "bitcoin::types::BlockHeader", with = "::subxt::utils::Static<::module_bitcoin::types::BlockHeader>" @@ -164,15 +167,8 @@ pub const DISABLE_DIFFICULTY_CHECK: &str = "DisableDifficultyCheck"; ), ) )] - pub mod metadata {} -#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Default, Clone, Decode, Encode)] -pub struct WrapperKeepOpaque { - data: Vec, - _phantom: PhantomData, -} - #[derive(Debug, Clone, Eq, PartialEq)] pub struct InterBtcRuntime; diff --git a/runtime/src/rpc.rs b/runtime/src/rpc.rs index f9b7e43dc..d45e38b69 100644 --- a/runtime/src/rpc.rs +++ b/runtime/src/rpc.rs @@ -1,10 +1,10 @@ -pub use crate::ShutdownSender; use crate::{ assets::LendingAssets, conn::{new_websocket_client, new_websocket_client_with_retry}, metadata, notify_retry, types::*, - AccountId, AssetRegistry, CurrencyId, Error, InterBtcRuntime, InterBtcSigner, RetryPolicy, RichH256Le, SubxtError, + AccountId, AssetRegistry, CurrencyId, Error, FixedU128 as UnsignedFixedPoint, InterBtcRuntime, InterBtcSigner, + RetryPolicy, RichH256Le, ShutdownSender, SubxtError, }; use async_trait::async_trait; use bitcoin::RawTransactionProof; @@ -15,7 +15,7 @@ use module_bitcoin::{ parser::{parse_block_header, parse_transaction}, types::FullTransactionProof, }; -use primitives::{BalanceWrapper, UnsignedFixedPoint}; +use primitives::BalanceWrapper; use serde_json::Value; use std::{convert::TryInto, future::Future, ops::Range, sync::Arc, time::Duration}; use subxt::{ @@ -557,8 +557,7 @@ impl InterBtcParachain { } #[cfg(test)] fn lending_mock_market_from_id(&self, id: u32) -> metadata::runtime_types::loans::types::Market { - use primitives::{Rate, Ratio}; - use sp_runtime::FixedPointNumber; + use sp_runtime::{FixedPointNumber, Rate, Ratio}; metadata::runtime_types::loans::types::Market:: { close_factor: Static(Ratio::from_percent(50)), diff --git a/runtime/src/types.rs b/runtime/src/types.rs index 3c169bb15..8092ac803 100644 --- a/runtime/src/types.rs +++ b/runtime/src/types.rs @@ -23,7 +23,7 @@ pub type BlockNumber = u32; pub type H160 = sp_core::H160; pub type H256 = sp_core::H256; pub type U256 = sp_core::U256; -pub type Ratio = primitives::Ratio; +pub type Ratio = sp_runtime::Permill; pub type InterBtcSigner = PairSigner; @@ -37,12 +37,88 @@ pub(crate) enum StorageMapHasher { mod metadata_aliases { use super::*; - pub use metadata::runtime_types::bitcoin::address::PublicKey as BtcPublicKey; use subxt::{storage::address::StaticStorageMapKey, utils::Static}; - pub use metadata::runtime_types::interbtc_primitives::oracle::Key as OracleKey; + // AssetRegistry + pub use metadata::{ + asset_registry::events::{RegisteredAsset as RegisteredAssetEvent, UpdatedAsset as UpdatedAssetEvent}, + runtime_types::{ + interbtc_primitives::CustomMetadata as InterBtcAdditionalMetadata, + orml_traits::asset_registry::AssetMetadata as GenericAssetMetadata, + }, + }; + pub type AssetMetadata = GenericAssetMetadata; + + // BTCRelay + pub use metadata::{ + btc_relay::events::StoreMainChainHeader as StoreMainChainHeaderEvent, + runtime_types::{bitcoin::types::H256Le, btc_relay::pallet::Error as BtcRelayPalletError}, + }; + pub type InterBtcRichBlockHeader = metadata::runtime_types::btc_relay::types::RichBlockHeader; + pub use metadata::runtime_types::bitcoin::address::PublicKey as BtcPublicKey; + pub type BitcoinBlockHeight = u32; + + // ClientsInfo + pub use metadata::runtime_types::clients_info::ClientRelease; + + // Issue + pub use metadata::{ + issue::events::{ + CancelIssue as CancelIssueEvent, ExecuteIssue as ExecuteIssueEvent, RequestIssue as RequestIssueEvent, + }, + runtime_types::{interbtc_primitives::issue::IssueRequestStatus, issue::pallet::Error as IssuePalletError}, + }; + pub type InterBtcIssueRequest = + metadata::runtime_types::interbtc_primitives::issue::IssueRequest; + + // Loans + pub use metadata::loans::events::{NewMarket as NewMarketEvent, UpdatedMarket as UpdatedMarketEvent}; + pub type LendingMarket = metadata::runtime_types::loans::types::Market; - pub use metadata::runtime_types::vault_registry::types::VaultStatus; + // Oracle + pub use metadata::{ + oracle::events::FeedValues as FeedValuesEvent, runtime_types::interbtc_primitives::oracle::Key as OracleKey, + }; + + // Redeem + pub use metadata::{ + redeem::events::{ExecuteRedeem as ExecuteRedeemEvent, RequestRedeem as RequestRedeemEvent}, + runtime_types::interbtc_primitives::{redeem::RedeemRequestStatus, replace::ReplaceRequestStatus}, + }; + pub type InterBtcRedeemRequest = metadata::runtime_types::interbtc_primitives::redeem::RedeemRequest< + AccountId, + BlockNumber, + Balance, + CurrencyId, + >; + + // Replace + pub use metadata::replace::events::{ + AcceptReplace as AcceptReplaceEvent, CancelReplace as CancelReplaceEvent, + ExecuteReplace as ExecuteReplaceEvent, RequestReplace as RequestReplaceEvent, + WithdrawReplace as WithdrawReplaceEvent, + }; + pub type InterBtcReplaceRequest = metadata::runtime_types::interbtc_primitives::replace::ReplaceRequest< + AccountId, + BlockNumber, + Balance, + CurrencyId, + >; + + // Security + pub use metadata::security::events::UpdateActiveBlock as UpdateActiveBlockEvent; + + // System + pub use metadata::runtime_types::frame_system::pallet::Error as SystemPalletError; + + // Tokens + pub use metadata::tokens::events::Endowed as EndowedEvent; + + // VaultRegistry + pub use metadata::{ + runtime_types::vault_registry::{pallet::Error as VaultRegistryPalletError, types::VaultStatus}, + vault_registry::events::{LiquidateVault as LiquidateVaultEvent, RegisterVault as RegisterVaultEvent}, + }; pub type InterBtcVault = metadata::runtime_types::vault_registry::types::Vault; pub type InterBtcVaultStatic = metadata::runtime_types::vault_registry::types::Vault< @@ -52,6 +128,8 @@ mod metadata_aliases { CurrencyId, Static, >; + pub type VaultId = metadata::runtime_types::interbtc_primitives::VaultId; + pub type VaultCurrencyPair = metadata::runtime_types::interbtc_primitives::VaultCurrencyPair; impl From for InterBtcVault { fn from(val: InterBtcVaultStatic) -> Self { @@ -85,89 +163,15 @@ mod metadata_aliases { } } - pub type InterBtcRichBlockHeader = metadata::runtime_types::btc_relay::types::RichBlockHeader; - pub type BitcoinBlockHeight = u32; - - pub use metadata::{ - asset_registry::events::{RegisteredAsset as RegisteredAssetEvent, UpdatedAsset as UpdatedAssetEvent}, - oracle::events::FeedValues as FeedValuesEvent, - }; - - pub use metadata::loans::events::{NewMarket as NewMarketEvent, UpdatedMarket as UpdatedMarketEvent}; - - pub use metadata::issue::events::{ - CancelIssue as CancelIssueEvent, ExecuteIssue as ExecuteIssueEvent, RequestIssue as RequestIssueEvent, - }; - - pub use metadata::replace::events::{ - AcceptReplace as AcceptReplaceEvent, CancelReplace as CancelReplaceEvent, - ExecuteReplace as ExecuteReplaceEvent, RequestReplace as RequestReplaceEvent, - WithdrawReplace as WithdrawReplaceEvent, - }; - - pub use metadata::redeem::events::{ExecuteRedeem as ExecuteRedeemEvent, RequestRedeem as RequestRedeemEvent}; - - pub use metadata::security::events::UpdateActiveBlock as UpdateActiveBlockEvent; - - pub use metadata::vault_registry::events::{ - LiquidateVault as LiquidateVaultEvent, RegisterAddress as RegisterAddressEvent, - RegisterVault as RegisterVaultEvent, - }; - - pub use metadata::btc_relay::events::StoreMainChainHeader as StoreMainChainHeaderEvent; - - pub use metadata::tokens::events::Endowed as EndowedEvent; - - pub use metadata::runtime_types::{ - interbtc_primitives::CustomMetadata as InterBtcAdditionalMetadata, - orml_traits::asset_registry::AssetMetadata as GenericAssetMetadata, - }; - pub type AssetMetadata = GenericAssetMetadata; - pub type LendingMarket = metadata::runtime_types::loans::types::Market; - pub type KeyStorageAddress = Address; - - pub use metadata::runtime_types::{ - btc_relay::pallet::Error as BtcRelayPalletError, frame_system::pallet::Error as SystemPalletError, - issue::pallet::Error as IssuePalletError, redeem::pallet::Error as RedeemPalletError, - security::pallet::Error as SecurityPalletError, vault_registry::pallet::Error as VaultRegistryPalletError, - }; - - pub use metadata::runtime_types::bitcoin::types::H256Le; - - pub use metadata::runtime_types::clients_info::ClientRelease; - - pub type InterBtcHeader = ::Header; - - pub type InterBtcIssueRequest = - metadata::runtime_types::interbtc_primitives::issue::IssueRequest; - pub use metadata::runtime_types::interbtc_primitives::issue::IssueRequestStatus; - pub type InterBtcRedeemRequest = metadata::runtime_types::interbtc_primitives::redeem::RedeemRequest< - AccountId, - BlockNumber, - Balance, - CurrencyId, - >; - pub use metadata::runtime_types::interbtc_primitives::{ - redeem::RedeemRequestStatus, replace::ReplaceRequestStatus, - }; - - pub type InterBtcReplaceRequest = metadata::runtime_types::interbtc_primitives::replace::ReplaceRequest< - AccountId, - BlockNumber, - Balance, - CurrencyId, - >; - pub type VaultId = metadata::runtime_types::interbtc_primitives::VaultId; - pub type VaultCurrencyPair = metadata::runtime_types::interbtc_primitives::VaultCurrencyPair; - #[cfg(feature = "parachain-metadata-interlay")] pub type EncodedCall = metadata::runtime_types::interlay_runtime_parachain::RuntimeCall; #[cfg(feature = "parachain-metadata-kintsugi")] pub type EncodedCall = metadata::runtime_types::kintsugi_runtime_parachain::RuntimeCall; - pub use metadata::runtime_types::security::pallet::Call as SecurityCall; + pub type InterBtcHeader = ::Header; pub use metadata::runtime_types::bounded_collections::bounded_vec::BoundedVec; + pub type KeyStorageAddress = Address; } pub struct RawBlockHeader(pub Vec); @@ -340,87 +344,3 @@ mod h256_le { } } } - -mod dispatch_error { - use crate::metadata::{ - runtime_types::{ - sp_arithmetic::ArithmeticError, - sp_runtime::{ModuleError, TokenError, TransactionalError}, - }, - DispatchError, - }; - - type RichTokenError = sp_runtime::TokenError; - type RichArithmeticError = sp_arithmetic::ArithmeticError; - type RichDispatchError = sp_runtime::DispatchError; - type RichModuleError = sp_runtime::ModuleError; - type RichTransactionalError = sp_runtime::TransactionalError; - - macro_rules! convert_enum{($src: ident, $dst: ident, $($variant: ident,)*)=> { - impl From<$src> for $dst { - fn from(src: $src) -> Self { - match src { - $($src::$variant => Self::$variant,)* - } - } - } - }} - - convert_enum!( - RichTokenError, - TokenError, - FundsUnavailable, - OnlyProvider, - BelowMinimum, - CannotCreate, - UnknownAsset, - Frozen, - Unsupported, - CannotCreateHold, - NotExpendable, - ); - - convert_enum!( - RichArithmeticError, - ArithmeticError, - Underflow, - Overflow, - DivisionByZero, - ); - - convert_enum!(RichTransactionalError, TransactionalError, LimitReached, NoLayer,); - - impl From for DispatchError { - fn from(value: RichDispatchError) -> Self { - match value { - RichDispatchError::Other(_) => DispatchError::Other, - RichDispatchError::CannotLookup => DispatchError::CannotLookup, - RichDispatchError::BadOrigin => DispatchError::BadOrigin, - RichDispatchError::Module(RichModuleError { index, error, .. }) => { - DispatchError::Module(ModuleError { index, error }) - } - RichDispatchError::ConsumerRemaining => DispatchError::ConsumerRemaining, - RichDispatchError::NoProviders => DispatchError::NoProviders, - RichDispatchError::TooManyConsumers => DispatchError::TooManyConsumers, - RichDispatchError::Token(token_error) => DispatchError::Token(token_error.into()), - RichDispatchError::Arithmetic(arithmetic_error) => DispatchError::Arithmetic(arithmetic_error.into()), - RichDispatchError::Transactional(transactional_error) => { - DispatchError::Transactional(transactional_error.into()) - } - RichDispatchError::Exhausted => DispatchError::Exhausted, - RichDispatchError::Corruption => DispatchError::Corruption, - RichDispatchError::Unavailable => DispatchError::Unavailable, - } - } - } - - impl<'de> serde::Deserialize<'de> for DispatchError { - fn deserialize(deserializer: D) -> Result - where - D: serde::Deserializer<'de>, - { - let value = RichDispatchError::deserialize(deserializer)?; - Ok(value.into()) - } - } -} diff --git a/vault/Cargo.toml b/vault/Cargo.toml index 9f6b9f9b0..1b98d74c1 100644 --- a/vault/Cargo.toml +++ b/vault/Cargo.toml @@ -49,7 +49,7 @@ service = { path = "../service" } faucet-rpc = { package = "faucet", path = "../faucet" } # Substrate dependencies -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-keyring = "24.0.0" [dev-dependencies] mockall = "0.8.1" @@ -60,4 +60,4 @@ runtime = { path = "../runtime", features = ["testing-utils"] } bitcoin = { path = "../bitcoin", features = ["cli", "regtest-manual-mining"] } # Substrate dependencies -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +frame-support = "21.0.0" \ No newline at end of file