diff --git a/Cargo.lock b/Cargo.lock index 7e0a3c97..56c932f0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -385,7 +385,7 @@ dependencies = [ "futures", "futures-utils-wasm", "lru 0.13.0", - "parking_lot 0.12.4", + "parking_lot", "pin-project", "serde", "serde_json", @@ -631,7 +631,7 @@ dependencies = [ "derive_more 2.0.1", "futures", "futures-utils-wasm", - "parking_lot 0.12.4", + "parking_lot", "serde", "serde_json", "thiserror 2.0.16", @@ -1074,7 +1074,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5493c3bedbacf7fd7382c6346bbd66687d12bbaad3a89a2d2c303ee6cf20b048" dependencies = [ - "asn1-rs-derive 0.5.1", + "asn1-rs-derive", "asn1-rs-impl", "displaydoc", "nom", @@ -1084,22 +1084,6 @@ dependencies = [ "time", ] -[[package]] -name = "asn1-rs" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56624a96882bb8c26d61312ae18cb45868e5a9992ea73c58e45c3101e56a1e60" -dependencies = [ - "asn1-rs-derive 0.6.0", - "asn1-rs-impl", - "displaydoc", - "nom", - "num-traits", - "rusticata-macros", - "thiserror 2.0.16", - "time", -] - [[package]] name = "asn1-rs-derive" version = "0.5.1" @@ -1112,18 +1096,6 @@ dependencies = [ "synstructure 0.13.2", ] -[[package]] -name = "asn1-rs-derive" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3109e49b1e4909e9db6515a30c633684d68cdeaa252f215214cb4fa1a5bfee2c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.106", - "synstructure 0.13.2", -] - [[package]] name = "asn1-rs-impl" version = "0.2.0" @@ -1823,18 +1795,6 @@ dependencies = [ "windows-link", ] -[[package]] -name = "cid" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3147d8272e8fa0ccd29ce51194dd98f79ddfb8191ba9e3409884e751798acf3a" -dependencies = [ - "core2", - "multibase", - "multihash 0.19.3", - "unsigned-varint 0.8.0", -] - [[package]] name = "cipher" version = "0.4.4" @@ -2254,21 +2214,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "critical-section" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b" - -[[package]] -name = "crossbeam-channel" -version = "0.5.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "crossbeam-deque" version = "0.8.6" @@ -2563,21 +2508,7 @@ version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553" dependencies = [ - "asn1-rs 0.6.2", - "displaydoc", - "nom", - "num-bigint", - "num-traits", - "rusticata-macros", -] - -[[package]] -name = "der-parser" -version = "10.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07da5016415d5a3c4dd39b11ed26f915f52fc4e0dc197d87908bc916e51bc1a6" -dependencies = [ - "asn1-rs 0.7.1", + "asn1-rs", "displaydoc", "nom", "num-bigint", @@ -3247,7 +3178,7 @@ dependencies = [ "log", "num-traits", "parity-scale-codec", - "parking_lot 0.12.4", + "parking_lot", "scale-info", ] @@ -3301,7 +3232,7 @@ checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" [[package]] name = "fork-tree" version = "13.0.1" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "parity-scale-codec", ] @@ -3334,7 +3265,7 @@ checksum = "28dd6caf6059519a65843af8fe2a3ae298b14b80179855aeb4adc2c1934ee619" [[package]] name = "frame-benchmarking" version = "40.2.1" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "frame-support", "frame-support-procedural", @@ -3343,7 +3274,6 @@ dependencies = [ "log", "parity-scale-codec", "paste", - "scale-info", "serde", "sp-api", "sp-application-crypto", @@ -3358,49 +3288,33 @@ dependencies = [ [[package]] name = "frame-executive" version = "40.0.1" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "frame-support", "frame-system", "frame-try-runtime", "log", "parity-scale-codec", - "scale-info", "sp-core", "sp-io", "sp-runtime", "sp-tracing", ] -[[package]] -name = "frame-metadata" -version = "20.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26de808fa6461f2485dc51811aefed108850064994fb4a62b3ac21ffa62ac8df" -dependencies = [ - "cfg-if", - "parity-scale-codec", - "scale-info", - "serde", -] - [[package]] name = "frame-support" version = "40.1.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "array-bytes", "bitflags 1.3.2", "environmental", - "frame-metadata", "frame-support-procedural", "impl-trait-for-tuples", - "k256", "log", "macro_magic", "parity-scale-codec", "paste", - "scale-info", "serde", "serde_json", "sp-api", @@ -3411,7 +3325,6 @@ dependencies = [ "sp-genesis-builder", "sp-inherents", "sp-io", - "sp-metadata-ir", "sp-runtime", "sp-staking", "sp-state-machine", @@ -3425,7 +3338,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "33.0.1" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "Inflector", "cfg-expr", @@ -3444,7 +3357,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "13.0.1" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 3.3.0", @@ -3456,7 +3369,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "12.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "proc-macro2", "quote", @@ -3466,13 +3379,12 @@ dependencies = [ [[package]] name = "frame-system" version = "40.2.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "cfg-if", "frame-support", "log", "parity-scale-codec", - "scale-info", "serde", "sp-core", "sp-io", @@ -3484,7 +3396,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.46.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "frame-support", "parity-scale-codec", @@ -3843,7 +3755,7 @@ dependencies = [ "getrandom 0.3.2", "hashbrown 0.15.5", "nonzero_ext", - "parking_lot 0.12.4", + "parking_lot", "portable-atomic", "quanta", "rand 0.9.2", @@ -4040,31 +3952,6 @@ dependencies = [ "url", ] -[[package]] -name = "hickory-proto" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8a6fe56c0038198998a6f217ca4e7ef3a5e51f46163bd6dd60b5c71ca6c6502" -dependencies = [ - "async-trait", - "cfg-if", - "data-encoding", - "enum-as-inner", - "futures-channel", - "futures-io", - "futures-util", - "idna", - "ipnet", - "once_cell", - "rand 0.9.2", - "ring 0.17.14", - "thiserror 2.0.16", - "tinyvec", - "tokio", - "tracing", - "url", -] - [[package]] name = "hickory-resolver" version = "0.24.4" @@ -4073,11 +3960,11 @@ checksum = "cbb117a1ca520e111743ab2f6688eddee69db4e0ea242545a604dce8a66fd22e" dependencies = [ "cfg-if", "futures-util", - "hickory-proto 0.24.4", + "hickory-proto", "ipconfig", "lru-cache", "once_cell", - "parking_lot 0.12.4", + "parking_lot", "rand 0.8.5", "resolv-conf", "smallvec", @@ -4086,27 +3973,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "hickory-resolver" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc62a9a99b0bfb44d2ab95a7208ac952d31060efc16241c87eaf36406fecf87a" -dependencies = [ - "cfg-if", - "futures-util", - "hickory-proto 0.25.2", - "ipconfig", - "moka", - "once_cell", - "parking_lot 0.12.4", - "rand 0.9.2", - "resolv-conf", - "smallvec", - "thiserror 2.0.16", - "tokio", - "tracing", -] - [[package]] name = "hkdf" version = "0.12.4" @@ -4671,7 +4537,7 @@ dependencies = [ "http-body 1.0.1", "http-body-util", "jsonrpsee-types", - "parking_lot 0.12.4", + "parking_lot", "rand 0.8.5", "rustc-hash", "serde", @@ -4790,7 +4656,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf7a85fe66f9ff9cd74e169fdd2c94c6e1e74c412c99a73b4df3200b5d3760b2" dependencies = [ "kvdb", - "parking_lot 0.12.4", + "parking_lot", ] [[package]] @@ -4801,7 +4667,7 @@ checksum = "e8beb5ce840610e5a945f0306f6e7a2d5b3e68ea3e64e9a4f081fa4ee5aa6525" dependencies = [ "kvdb", "num_cpus", - "parking_lot 0.12.4", + "parking_lot", "regex", "rocksdb", ] @@ -4904,7 +4770,7 @@ dependencies = [ "multihash 0.19.3", "multistream-select", "once_cell", - "parking_lot 0.12.4", + "parking_lot", "pin-project", "quick-protobuf", "rand 0.8.5", @@ -4925,10 +4791,10 @@ checksum = "97f37f30d5c7275db282ecd86e54f29dd2176bd3ac656f06abf43bedb21eb8bd" dependencies = [ "async-trait", "futures", - "hickory-resolver 0.24.4", + "hickory-resolver", "libp2p-core", "libp2p-identity", - "parking_lot 0.12.4", + "parking_lot", "smallvec", "tracing", ] @@ -5042,7 +4908,7 @@ checksum = "14b8546b6644032565eb29046b42744aee1e9f261ed99671b2c93fb140dba417" dependencies = [ "data-encoding", "futures", - "hickory-proto 0.24.4", + "hickory-proto", "if-watch", "libp2p-core", "libp2p-identity", @@ -5131,7 +4997,7 @@ dependencies = [ "libp2p-core", "libp2p-identity", "libp2p-tls", - "parking_lot 0.12.4", + "parking_lot", "quinn", "rand 0.8.5", "ring 0.17.14", @@ -5230,7 +5096,7 @@ dependencies = [ "rustls", "rustls-webpki 0.101.7", "thiserror 1.0.69", - "x509-parser 0.16.0", + "x509-parser", "yasna", ] @@ -5261,7 +5127,7 @@ dependencies = [ "futures-rustls", "libp2p-core", "libp2p-identity", - "parking_lot 0.12.4", + "parking_lot", "pin-project-lite", "rw-stream-sink", "soketto", @@ -5407,53 +5273,6 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" -[[package]] -name = "litep2p" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14fb10e63363204b89d91e1292df83322fd9de5d7fa76c3d5c78ddc2f8f3efa9" -dependencies = [ - "async-trait", - "bs58", - "bytes", - "cid", - "ed25519-dalek", - "futures", - "futures-timer", - "hickory-resolver 0.25.2", - "indexmap 2.11.0", - "libc", - "mockall", - "multiaddr 0.17.1", - "multihash 0.17.0", - "network-interface", - "parking_lot 0.12.4", - "pin-project", - "prost 0.13.5", - "prost-build 0.13.5", - "rand 0.8.5", - "serde", - "sha2 0.10.9", - "simple-dns", - "smallvec", - "snow", - "socket2 0.5.10", - "thiserror 2.0.16", - "tokio", - "tokio-stream", - "tokio-tungstenite", - "tokio-util", - "tracing", - "uint 0.10.0", - "unsigned-varint 0.8.0", - "url", - "x25519-dalek", - "x509-parser 0.17.0", - "yamux 0.13.6", - "yasna", - "zeroize", -] - [[package]] name = "lock_api" version = "0.4.13" @@ -5784,25 +5603,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "moka" -version = "0.12.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9321642ca94a4282428e6ea4af8cc2ca4eac48ac7a6a4ea8f33f76d0ce70926" -dependencies = [ - "crossbeam-channel", - "crossbeam-epoch", - "crossbeam-utils", - "loom", - "parking_lot 0.12.4", - "portable-atomic", - "rustc_version 0.4.1", - "smallvec", - "tagptr", - "thiserror 1.0.69", - "uuid", -] - [[package]] name = "monero-address" version = "0.1.0" @@ -6011,7 +5811,6 @@ dependencies = [ "serde", "static_assertions", "unsigned-varint 0.7.2", - "url", ] [[package]] @@ -6064,7 +5863,6 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40" dependencies = [ - "blake2b_simd", "core2", "digest 0.10.7", "multihash-derive", @@ -6204,18 +6002,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "network-interface" -version = "2.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07709a6d4eba90ab10ec170a0530b3aafc81cb8a2d380e4423ae41fc55fe5745" -dependencies = [ - "cc", - "libc", - "thiserror 2.0.16", - "winapi", -] - [[package]] name = "nix" version = "0.26.4" @@ -6427,16 +6213,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8d8034d9489cdaf79228eb9f6a3b8d7bb32ba00d6645ebd48eef4077ceb5bd9" dependencies = [ - "asn1-rs 0.6.2", -] - -[[package]] -name = "oid-registry" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f40cff3dde1b6087cc5d5f5d4d65712f34016a03ed60e9c08dcc392736b5b7" -dependencies = [ - "asn1-rs 0.7.1", + "asn1-rs", ] [[package]] @@ -6444,10 +6221,6 @@ name = "once_cell" version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" -dependencies = [ - "critical-section", - "portable-atomic", -] [[package]] name = "opaque-debug" @@ -6479,20 +6252,19 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "40.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "frame-support", "frame-system", "impl-trait-for-tuples", "parity-scale-codec", - "scale-info", "sp-runtime", ] [[package]] name = "pallet-babe" version = "40.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "frame-benchmarking", "frame-support", @@ -6502,7 +6274,6 @@ dependencies = [ "pallet-session", "pallet-timestamp", "parity-scale-codec", - "scale-info", "sp-application-crypto", "sp-consensus-babe", "sp-core", @@ -6515,7 +6286,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "40.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "frame-benchmarking", "frame-support", @@ -6524,7 +6295,6 @@ dependencies = [ "pallet-authorship", "pallet-session", "parity-scale-codec", - "scale-info", "sp-application-crypto", "sp-consensus-grandpa", "sp-core", @@ -6537,7 +6307,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "40.0.1" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "frame-support", "frame-system", @@ -6545,7 +6315,6 @@ dependencies = [ "log", "pallet-timestamp", "parity-scale-codec", - "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -6558,14 +6327,13 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "39.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", "parity-scale-codec", - "scale-info", "sp-inherents", "sp-io", "sp-runtime", @@ -6600,7 +6368,7 @@ dependencies = [ "log", "lz4", "memmap2 0.5.10", - "parking_lot 0.12.4", + "parking_lot", "rand 0.8.5", "siphasher 0.3.11", "snap", @@ -6621,7 +6389,7 @@ dependencies = [ "log", "lz4", "memmap2 0.9.8", - "parking_lot 0.12.4", + "parking_lot", "rand 0.9.2", "siphasher 1.0.1", "snap", @@ -6669,13 +6437,6 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" -[[package]] -name = "parking_lot" -version = "0.11.2" -dependencies = [ - "parking_lot 0.12.4", -] - [[package]] name = "parking_lot" version = "0.12.4" @@ -6845,37 +6606,11 @@ version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" -[[package]] -name = "polkavm" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd044ab1d3b11567ab6b98ca71259a992b4034220d5972988a0e96518e5d343d" -dependencies = [ - "libc", - "log", - "polkavm-assembler", - "polkavm-common", - "polkavm-linux-raw", -] - -[[package]] -name = "polkavm-assembler" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaad38dc420bfed79e6f731471c973ce5ff5e47ab403e63cf40358fef8a6368f" -dependencies = [ - "log", -] - [[package]] name = "polkavm-common" version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31ff33982a807d8567645d4784b9b5d7ab87bcb494f534a57cadd9012688e102" -dependencies = [ - "log", - "polkavm-assembler", -] [[package]] name = "polkavm-derive" @@ -6908,12 +6643,6 @@ dependencies = [ "syn 2.0.106", ] -[[package]] -name = "polkavm-linux-raw" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23eff02c070c70f31878a3d915e88a914ecf3e153741e2fb572dde28cce20fde" - [[package]] name = "polling" version = "3.10.0" @@ -7161,7 +6890,7 @@ dependencies = [ "fnv", "lazy_static", "memchr", - "parking_lot 0.12.4", + "parking_lot", "thiserror 1.0.69", ] @@ -7173,7 +6902,7 @@ checksum = "504ee9ff529add891127c4827eb481bd69dc0ebc72e9a682e187db4caa60c3ca" dependencies = [ "dtoa", "itoa", - "parking_lot 0.12.4", + "parking_lot", "prometheus-client-derive-encode", ] @@ -7208,16 +6937,6 @@ dependencies = [ "unarray", ] -[[package]] -name = "prost" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5" -dependencies = [ - "bytes", - "prost-derive 0.13.5", -] - [[package]] name = "prost" version = "0.14.1" @@ -7225,27 +6944,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7231bd9b3d3d33c86b58adbac74b5ec0ad9f496b19d22801d773636feaa95f3d" dependencies = [ "bytes", - "prost-derive 0.14.1", -] - -[[package]] -name = "prost-build" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf" -dependencies = [ - "heck 0.5.0", - "itertools 0.14.0", - "log", - "multimap", - "once_cell", - "petgraph", - "prettyplease", - "prost 0.13.5", - "prost-types 0.13.5", - "regex", - "syn 2.0.106", - "tempfile", + "prost-derive", ] [[package]] @@ -7261,26 +6960,13 @@ dependencies = [ "once_cell", "petgraph", "prettyplease", - "prost 0.14.1", - "prost-types 0.14.1", + "prost", + "prost-types", "regex", "syn 2.0.106", "tempfile", ] -[[package]] -name = "prost-derive" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" -dependencies = [ - "anyhow", - "itertools 0.14.0", - "proc-macro2", - "quote", - "syn 2.0.106", -] - [[package]] name = "prost-derive" version = "0.14.1" @@ -7294,22 +6980,13 @@ dependencies = [ "syn 2.0.106", ] -[[package]] -name = "prost-types" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52c2c1bf36ddb1a1c396b3601a3cec27c2462e45f07c386894ec3ccf5332bd16" -dependencies = [ - "prost 0.13.5", -] - [[package]] name = "prost-types" version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9b4db3d6da204ed77bb26ba83b6122a73aeb2e87e25fbf7ad2e84c4ccbf8f72" dependencies = [ - "prost 0.14.1", + "prost", ] [[package]] @@ -8199,7 +7876,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "31.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "log", "sp-core", @@ -8210,7 +7887,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.50.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "async-trait", "futures", @@ -8219,8 +7896,8 @@ dependencies = [ "linked_hash_set", "log", "parity-scale-codec", - "prost 0.14.1", - "prost-build 0.14.1", + "prost", + "prost-build", "rand 0.8.5", "sc-client-api", "sc-network", @@ -8238,7 +7915,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.49.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "futures", "log", @@ -8259,7 +7936,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.44.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "parity-scale-codec", "sp-api", @@ -8274,7 +7951,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "43.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "array-bytes", "memmap2 0.9.8", @@ -8299,7 +7976,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "12.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "proc-macro-crate 3.3.0", "proc-macro2", @@ -8310,7 +7987,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.52.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "array-bytes", "chrono", @@ -8351,13 +8028,13 @@ dependencies = [ [[package]] name = "sc-client-api" version = "39.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "fnv", "futures", "log", "parity-scale-codec", - "parking_lot 0.12.4", + "parking_lot", "sc-executor", "sc-transaction-pool-api", "sc-utils", @@ -8377,7 +8054,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.46.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "hash-db", "kvdb", @@ -8387,7 +8064,7 @@ dependencies = [ "log", "parity-db 0.5.4", "parity-scale-codec", - "parking_lot 0.12.4", + "parking_lot", "sc-client-api", "sc-state-db", "schnellru", @@ -8403,13 +8080,13 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.49.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "async-trait", "futures", "log", "mockall", - "parking_lot 0.12.4", + "parking_lot", "sc-client-api", "sc-network-types", "sc-utils", @@ -8426,7 +8103,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.50.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "async-trait", "fork-tree", @@ -8436,7 +8113,7 @@ dependencies = [ "num-rational", "num-traits", "parity-scale-codec", - "parking_lot 0.12.4", + "parking_lot", "sc-client-api", "sc-consensus", "sc-consensus-epochs", @@ -8462,7 +8139,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.49.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "fork-tree", "parity-scale-codec", @@ -8475,7 +8152,7 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa" version = "0.35.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "ahash", "array-bytes", @@ -8487,7 +8164,7 @@ dependencies = [ "futures-timer", "log", "parity-scale-codec", - "parking_lot 0.12.4", + "parking_lot", "rand 0.8.5", "sc-block-builder", "sc-chain-spec", @@ -8519,7 +8196,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.49.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "async-trait", "futures", @@ -8542,12 +8219,11 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.42.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "parity-scale-codec", - "parking_lot 0.12.4", + "parking_lot", "sc-executor-common", - "sc-executor-polkavm", "sc-executor-wasmtime", "schnellru", "sp-api", @@ -8565,9 +8241,8 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.38.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ - "polkavm", "sc-allocator", "sp-maybe-compressed-blob", "sp-wasm-interface", @@ -8575,25 +8250,14 @@ dependencies = [ "wasm-instrument", ] -[[package]] -name = "sc-executor-polkavm" -version = "0.35.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" -dependencies = [ - "log", - "polkavm", - "sc-executor-common", - "sp-wasm-interface", -] - [[package]] name = "sc-executor-wasmtime" version = "0.38.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "anyhow", "log", - "parking_lot 0.12.4", + "parking_lot", "rustix", "sc-allocator", "sc-executor-common", @@ -8605,7 +8269,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.49.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "console", "futures", @@ -8621,10 +8285,10 @@ dependencies = [ [[package]] name = "sc-keystore" version = "35.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "array-bytes", - "parking_lot 0.12.4", + "parking_lot", "serde_json", "sp-application-crypto", "sp-core", @@ -8635,7 +8299,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.50.1" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "array-bytes", "async-channel", @@ -8649,11 +8313,10 @@ dependencies = [ "ip_network", "libp2p", "linked_hash_set", - "litep2p", "log", "mockall", "parity-scale-codec", - "parking_lot 0.12.4", + "parking_lot", "partial_sort", "pin-project", "rand 0.8.5", @@ -8675,14 +8338,14 @@ dependencies = [ "tokio-stream", "unsigned-varint 0.8.0", "void", - "wasm-timer", + "wasmtimer", "zeroize", ] [[package]] name = "sc-network-common" version = "0.48.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "bitflags 1.3.2", "parity-scale-codec", @@ -8692,7 +8355,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.50.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "ahash", "futures", @@ -8711,15 +8374,15 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.49.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "array-bytes", "async-channel", "futures", "log", "parity-scale-codec", - "prost 0.14.1", - "prost-build 0.14.1", + "prost", + "prost-build", "sc-client-api", "sc-network", "sc-network-types", @@ -8732,7 +8395,7 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.49.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "array-bytes", "async-channel", @@ -8742,8 +8405,8 @@ dependencies = [ "log", "mockall", "parity-scale-codec", - "prost 0.14.1", - "prost-build 0.14.1", + "prost", + "prost-build", "sc-client-api", "sc-consensus", "sc-network", @@ -8767,7 +8430,7 @@ dependencies = [ [[package]] name = "sc-network-transactions" version = "0.49.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "array-bytes", "futures", @@ -8786,51 +8449,27 @@ dependencies = [ [[package]] name = "sc-network-types" version = "0.16.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "bs58", "bytes", "ed25519-dalek", "libp2p-identity", "libp2p-kad", - "litep2p", "log", + "multiaddr 0.17.1", "multiaddr 0.18.2", + "multihash 0.17.0", "multihash 0.19.3", "rand 0.8.5", "thiserror 2.0.16", "zeroize", ] -[[package]] -name = "sc-offchain" -version = "45.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" -dependencies = [ - "futures", - "futures-timer", - "num_cpus", - "parity-scale-codec", - "parking_lot 0.12.4", - "rand 0.8.5", - "sc-client-api", - "sc-network", - "sc-network-types", - "sc-transaction-pool-api", - "sp-api", - "sp-core", - "sp-externalities", - "sp-keystore", - "sp-offchain", - "sp-runtime", - "threadpool", - "tracing", -] - [[package]] name = "sc-proposer-metrics" version = "0.20.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -8839,13 +8478,13 @@ dependencies = [ [[package]] name = "sc-rpc" version = "45.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "futures", "jsonrpsee", "log", "parity-scale-codec", - "parking_lot 0.12.4", + "parking_lot", "sc-block-builder", "sc-chain-spec", "sc-client-api", @@ -8869,13 +8508,12 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.49.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "jsonrpsee", "parity-scale-codec", "sc-chain-spec", "sc-transaction-pool-api", - "scale-info", "serde", "serde_json", "sp-core", @@ -8888,7 +8526,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "22.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "dyn-clone", "forwarded-header-value", @@ -8912,7 +8550,7 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" version = "0.50.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "array-bytes", "futures", @@ -8922,7 +8560,7 @@ dependencies = [ "jsonrpsee", "log", "parity-scale-codec", - "parking_lot 0.12.4", + "parking_lot", "rand 0.8.5", "sc-chain-spec", "sc-client-api", @@ -8945,7 +8583,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.51.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "async-trait", "directories", @@ -8955,7 +8593,7 @@ dependencies = [ "jsonrpsee", "log", "parity-scale-codec", - "parking_lot 0.12.4", + "parking_lot", "pin-project", "rand 0.8.5", "sc-chain-spec", @@ -9008,18 +8646,18 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.38.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "log", "parity-scale-codec", - "parking_lot 0.12.4", + "parking_lot", "sp-core", ] [[package]] name = "sc-sysinfo" version = "42.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "derive_more 1.0.0", "futures", @@ -9039,26 +8677,26 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "28.1.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "chrono", "futures", "libp2p", "log", - "parking_lot 0.12.4", + "parking_lot", "pin-project", "rand 0.8.5", "sc-utils", "serde", "serde_json", "thiserror 2.0.16", - "wasm-timer", + "wasmtimer", ] [[package]] name = "sc-tracing" version = "39.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "chrono", "console", @@ -9066,7 +8704,7 @@ dependencies = [ "libc", "log", "parity-scale-codec", - "parking_lot 0.12.4", + "parking_lot", "rustc-hash", "sc-client-api", "sc-tracing-proc-macro", @@ -9086,7 +8724,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "11.1.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "proc-macro-crate 3.3.0", "proc-macro2", @@ -9097,7 +8735,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "39.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "async-trait", "futures", @@ -9107,7 +8745,7 @@ dependencies = [ "linked-hash-map", "log", "parity-scale-codec", - "parking_lot 0.12.4", + "parking_lot", "sc-client-api", "sc-transaction-pool-api", "sc-utils", @@ -9129,7 +8767,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "39.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "async-trait", "futures", @@ -9146,13 +8784,13 @@ dependencies = [ [[package]] name = "sc-utils" version = "18.0.1" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "async-channel", "futures", "futures-timer", "log", - "parking_lot 0.12.4", + "parking_lot", "prometheus", "sp-arithmetic", ] @@ -9168,7 +8806,6 @@ dependencies = [ "derive_more 1.0.0", "parity-scale-codec", "scale-info-derive", - "serde", ] [[package]] @@ -9423,7 +9060,6 @@ dependencies = [ "borsh", "frame-support", "parity-scale-codec", - "scale-info", "serai-primitives", "serde", "sp-core", @@ -9499,7 +9135,6 @@ dependencies = [ "frame-support", "frame-system", "parity-scale-codec", - "scale-info", "serai-primitives", "sp-core", "sp-io", @@ -9658,7 +9293,6 @@ dependencies = [ "frame-system", "parity-scale-codec", "rand_core 0.6.4", - "scale-info", "serai-coins-pallet", "serai-primitives", "sp-api", @@ -9685,7 +9319,6 @@ dependencies = [ "pallet-grandpa", "pallet-timestamp", "parity-scale-codec", - "scale-info", "serai-coins-pallet", "serai-dex-pallet", "serai-primitives", @@ -9703,7 +9336,6 @@ dependencies = [ "frame-support", "frame-system", "parity-scale-codec", - "scale-info", "serai-coins-pallet", "serai-dex-pallet", "serai-economic-security-pallet", @@ -9788,7 +9420,6 @@ dependencies = [ "frame-support", "frame-system", "parity-scale-codec", - "scale-info", "serai-coins-pallet", "serai-dex-pallet", "serai-economic-security-pallet", @@ -9810,7 +9441,6 @@ dependencies = [ "pallet-grandpa", "pallet-timestamp", "parity-scale-codec", - "scale-info", "serai-coins-pallet", "serai-dex-pallet", "serai-economic-security-pallet", @@ -9941,7 +9571,6 @@ dependencies = [ "sc-executor", "sc-network", "sc-network-common", - "sc-offchain", "sc-rpc-api", "sc-service", "sc-telemetry", @@ -9993,7 +9622,6 @@ dependencies = [ "embedwards25519", "parity-scale-codec", "rand_core 0.6.4", - "scale-info", "schnorr-signatures", "schnorrkel", "secq256k1", @@ -10289,7 +9917,6 @@ dependencies = [ "frame-support", "frame-system", "parity-scale-codec", - "scale-info", "serai-abi", "serai-coins-pallet", "sp-api", @@ -10306,7 +9933,6 @@ dependencies = [ "frame-support", "frame-system", "parity-scale-codec", - "scale-info", "serai-in-instructions-pallet", "serai-primitives", "serai-validator-sets-pallet", @@ -10332,7 +9958,6 @@ dependencies = [ "frame-system", "parity-scale-codec", "rand_core 0.6.4", - "scale-info", "serai-coins-pallet", "serai-primitives", "sp-api", @@ -10590,9 +10215,9 @@ dependencies = [ [[package]] name = "simba" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3a386a501cd104797982c15ae17aafe8b9261315b5d07e3ec803f2ea26be0fa" +checksum = "c99284beb21666094ba2b75bbceda012e610f5479dfcc2d6e2426f53197ffd95" dependencies = [ "approx", "num-complex", @@ -10601,15 +10226,6 @@ dependencies = [ "wide", ] -[[package]] -name = "simple-dns" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee851d0e5e7af3721faea1843e8015e820a234f81fda3dea9247e15bac9a86a" -dependencies = [ - "bitflags 2.9.3", -] - [[package]] name = "simple-request" version = "0.1.0" @@ -10713,16 +10329,14 @@ dependencies = [ [[package]] name = "sp-api" version = "36.0.1" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "hash-db", "log", "parity-scale-codec", - "scale-info", "sp-api-proc-macro", "sp-core", "sp-externalities", - "sp-metadata-ir", "sp-runtime", "sp-runtime-interface", "sp-state-machine", @@ -10734,7 +10348,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "22.0.1" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "Inflector", "blake2 0.10.6", @@ -10748,10 +10362,9 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "40.1.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "parity-scale-codec", - "scale-info", "serde", "sp-core", "sp-io", @@ -10760,12 +10373,11 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "26.1.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "integer-sqrt", "num-traits", "parity-scale-codec", - "scale-info", "serde", "static_assertions", ] @@ -10773,10 +10385,9 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "36.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "parity-scale-codec", - "scale-info", "sp-api", "sp-application-crypto", "sp-runtime", @@ -10785,7 +10396,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "36.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "sp-api", "sp-inherents", @@ -10795,11 +10406,11 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "39.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "futures", "parity-scale-codec", - "parking_lot 0.12.4", + "parking_lot", "schnellru", "sp-api", "sp-consensus", @@ -10814,7 +10425,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.42.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "async-trait", "futures", @@ -10828,11 +10439,10 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.42.1" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "async-trait", "parity-scale-codec", - "scale-info", "serde", "sp-api", "sp-application-crypto", @@ -10846,12 +10456,11 @@ dependencies = [ [[package]] name = "sp-consensus-grandpa" version = "23.1.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "finality-grandpa", "log", "parity-scale-codec", - "scale-info", "serde", "sp-api", "sp-application-crypto", @@ -10863,10 +10472,9 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.42.1" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "parity-scale-codec", - "scale-info", "serde", "sp-timestamp", ] @@ -10874,7 +10482,7 @@ dependencies = [ [[package]] name = "sp-core" version = "36.1.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "array-bytes", "bitflags 1.3.2", @@ -10887,16 +10495,14 @@ dependencies = [ "hash256-std-hasher", "impl-serde", "itertools 0.14.0", - "k256", "log", "merlin", "parity-bip39", "parity-scale-codec", - "parking_lot 0.12.4", + "parking_lot", "paste", "primitive-types 0.13.1", "rand 0.8.5", - "scale-info", "schnorrkel", "secrecy", "serde", @@ -10915,7 +10521,7 @@ dependencies = [ [[package]] name = "sp-crypto-hashing" version = "0.1.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "blake2b_simd", "byteorder", @@ -10928,7 +10534,7 @@ dependencies = [ [[package]] name = "sp-crypto-hashing-proc-macro" version = "0.1.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "quote", "sp-crypto-hashing", @@ -10938,16 +10544,16 @@ dependencies = [ [[package]] name = "sp-database" version = "10.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "kvdb", - "parking_lot 0.12.4", + "parking_lot", ] [[package]] name = "sp-debug-derive" version = "14.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "proc-macro2", "quote", @@ -10957,7 +10563,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.30.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "environmental", "parity-scale-codec", @@ -10967,10 +10573,9 @@ dependencies = [ [[package]] name = "sp-genesis-builder" version = "0.17.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "parity-scale-codec", - "scale-info", "serde_json", "sp-api", "sp-runtime", @@ -10979,12 +10584,11 @@ dependencies = [ [[package]] name = "sp-inherents" version = "36.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "async-trait", "impl-trait-for-tuples", "parity-scale-codec", - "scale-info", "sp-runtime", "thiserror 2.0.16", ] @@ -10992,7 +10596,7 @@ dependencies = [ [[package]] name = "sp-io" version = "40.0.1" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "bytes", "log", @@ -11014,7 +10618,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "41.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "sp-core", "sp-runtime", @@ -11024,10 +10628,10 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.42.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "parity-scale-codec", - "parking_lot 0.12.4", + "parking_lot", "sp-core", "sp-externalities", ] @@ -11035,26 +10639,16 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "11.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "thiserror 2.0.16", "zstd", ] -[[package]] -name = "sp-metadata-ir" -version = "0.10.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" -dependencies = [ - "frame-metadata", - "parity-scale-codec", - "scale-info", -] - [[package]] name = "sp-offchain" version = "36.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "sp-api", "sp-core", @@ -11064,7 +10658,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "13.0.2" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "backtrace", "regex", @@ -11073,7 +10667,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "34.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "rustc-hash", "serde", @@ -11083,7 +10677,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "41.1.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "either", "hash256-std-hasher", @@ -11093,7 +10687,6 @@ dependencies = [ "parity-scale-codec", "paste", "rand 0.8.5", - "scale-info", "serde", "sp-application-crypto", "sp-arithmetic", @@ -11109,7 +10702,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "29.0.1" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -11128,7 +10721,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "18.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "Inflector", "expander", @@ -11141,10 +10734,9 @@ dependencies = [ [[package]] name = "sp-session" version = "38.1.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "parity-scale-codec", - "scale-info", "sp-api", "sp-core", "sp-keystore", @@ -11155,11 +10747,10 @@ dependencies = [ [[package]] name = "sp-staking" version = "38.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", - "scale-info", "serde", "sp-core", "sp-runtime", @@ -11168,12 +10759,12 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.45.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "hash-db", "log", "parity-scale-codec", - "parking_lot 0.12.4", + "parking_lot", "rand 0.8.5", "smallvec", "sp-core", @@ -11188,12 +10779,12 @@ dependencies = [ [[package]] name = "sp-std" version = "14.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" [[package]] name = "sp-storage" version = "22.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "impl-serde", "parity-scale-codec", @@ -11205,7 +10796,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "36.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "async-trait", "parity-scale-codec", @@ -11217,7 +10808,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "17.1.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "parity-scale-codec", "tracing", @@ -11228,7 +10819,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "36.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "sp-api", "sp-runtime", @@ -11237,16 +10828,15 @@ dependencies = [ [[package]] name = "sp-trie" version = "39.1.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "ahash", "hash-db", "memory-db", "nohash-hasher", "parity-scale-codec", - "parking_lot 0.12.4", + "parking_lot", "rand 0.8.5", - "scale-info", "schnellru", "sp-core", "sp-externalities", @@ -11259,12 +10849,11 @@ dependencies = [ [[package]] name = "sp-version" version = "39.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "impl-serde", "parity-scale-codec", "parity-wasm", - "scale-info", "serde", "sp-crypto-hashing-proc-macro", "sp-runtime", @@ -11276,7 +10865,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "15.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "parity-scale-codec", "proc-macro-warning", @@ -11288,7 +10877,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "21.0.1" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "anyhow", "impl-trait-for-tuples", @@ -11300,11 +10889,10 @@ dependencies = [ [[package]] name = "sp-weights" version = "31.1.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "bounded-collections", "parity-scale-codec", - "scale-info", "serde", "smallvec", "sp-arithmetic", @@ -11378,7 +10966,7 @@ dependencies = [ "bitflags 1.3.2", "cfg_aliases 0.2.1", "libc", - "parking_lot 0.12.4", + "parking_lot", "parking_lot_core", "static_init_macro", "winapi", @@ -11477,7 +11065,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.17.3" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "http-body-util", "hyper 1.4.1", @@ -11491,7 +11079,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "26.0.1" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0#9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=749e7a1a664813ea3ae15e646f352a410e39653c#749e7a1a664813ea3ae15e646f352a410e39653c" dependencies = [ "build-helper", "cargo_metadata", @@ -11597,12 +11185,6 @@ dependencies = [ "libc", ] -[[package]] -name = "tagptr" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417" - [[package]] name = "tap" version = "1.0.1" @@ -11801,7 +11383,7 @@ dependencies = [ "io-uring", "libc", "mio", - "parking_lot 0.12.4", + "parking_lot", "pin-project-lite", "signal-hook-registry", "slab", @@ -11843,22 +11425,6 @@ dependencies = [ "tokio-util", ] -[[package]] -name = "tokio-tungstenite" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a9daff607c6d2bf6c16fd681ccb7eecc83e4e2cdc1ca067ffaadfca5de7f084" -dependencies = [ - "futures-util", - "log", - "rustls", - "rustls-native-certs", - "rustls-pki-types", - "tokio", - "tokio-rustls", - "tungstenite", -] - [[package]] name = "tokio-util" version = "0.7.16" @@ -12054,7 +11620,7 @@ dependencies = [ "matchers", "nu-ansi-term", "once_cell", - "parking_lot 0.12.4", + "parking_lot", "regex-automata", "sharded-slab", "smallvec", @@ -12122,26 +11688,6 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4f195fd851901624eee5a58c4bb2b4f06399148fcd0ed336e6f1cb60a9881df" -[[package]] -name = "tungstenite" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4793cb5e56680ecbb1d843515b23b6de9a75eb04b66643e256a396d43be33c13" -dependencies = [ - "bytes", - "data-encoding", - "http 1.3.1", - "httparse", - "log", - "rand 0.9.2", - "rustls", - "rustls-pki-types", - "sha1", - "thiserror 2.0.16", - "url", - "utf-8", -] - [[package]] name = "tuplex" version = "0.1.2" @@ -12261,7 +11807,6 @@ dependencies = [ "bytes", "futures-io", "futures-util", - "tokio-util", ] [[package]] @@ -12288,12 +11833,6 @@ dependencies = [ "serde", ] -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - [[package]] name = "utf8_iter" version = "1.0.4" @@ -12306,17 +11845,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" -[[package]] -name = "uuid" -version = "1.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2" -dependencies = [ - "getrandom 0.3.2", - "js-sys", - "wasm-bindgen", -] - [[package]] name = "valuable" version = "0.1.1" @@ -12410,19 +11938,6 @@ dependencies = [ "wasm-bindgen-shared", ] -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" -dependencies = [ - "cfg-if", - "js-sys", - "once_cell", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "wasm-bindgen-macro" version = "0.2.100" @@ -12514,21 +12029,6 @@ dependencies = [ "cxx-build", ] -[[package]] -name = "wasm-timer" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" -dependencies = [ - "futures", - "js-sys", - "parking_lot 0.11.2", - "pin-utils", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - [[package]] name = "wasmparser" version = "0.236.1" @@ -12760,7 +12260,7 @@ checksum = "1c598d6b99ea013e35844697fc4670d08339d5cda15588f193c6beedd12f644b" dependencies = [ "futures", "js-sys", - "parking_lot 0.12.4", + "parking_lot", "pin-utils", "slab", "wasm-bindgen", @@ -13180,9 +12680,9 @@ dependencies = [ [[package]] name = "wit-bindgen" -version = "0.45.0" +version = "0.45.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052283831dbae3d879dc7f51f3d92703a316ca49f91540417d38591826127814" +checksum = "5c573471f125075647d03df72e026074b7203790d41351cd6edc96f46bcccd36" [[package]] name = "wyz" @@ -13211,34 +12711,17 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcbc162f30700d6f3f82a24bf7cc62ffe7caea42c0b2cba8bf7f3ae50cf51f69" dependencies = [ - "asn1-rs 0.6.2", + "asn1-rs", "data-encoding", - "der-parser 9.0.0", + "der-parser", "lazy_static", "nom", - "oid-registry 0.7.1", + "oid-registry", "rusticata-macros", "thiserror 1.0.69", "time", ] -[[package]] -name = "x509-parser" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4569f339c0c402346d4a75a9e39cf8dad310e287eef1ff56d4c68e5067f53460" -dependencies = [ - "asn1-rs 0.7.1", - "data-encoding", - "der-parser 10.0.0", - "lazy_static", - "nom", - "oid-registry 0.8.1", - "rusticata-macros", - "thiserror 2.0.16", - "time", -] - [[package]] name = "xml-rs" version = "0.8.27" @@ -13263,7 +12746,7 @@ dependencies = [ "futures", "log", "nohash-hasher", - "parking_lot 0.12.4", + "parking_lot", "pin-project", "rand 0.8.5", "static_assertions", @@ -13278,7 +12761,7 @@ dependencies = [ "futures", "log", "nohash-hasher", - "parking_lot 0.12.4", + "parking_lot", "pin-project", "rand 0.9.2", "static_assertions", diff --git a/Cargo.toml b/Cargo.toml index 9f776d6e..6ce35ae0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,9 +1,6 @@ [workspace] resolver = "2" members = [ - # Version patches - "patches/parking_lot", - # Rewrites/redirects "patches/option-ext", "patches/directories-next", @@ -186,8 +183,6 @@ modular-frost = { path = "crypto/frost" } # https://github.com/rust-lang-nursery/lazy-static.rs/issues/201 lazy_static = { git = "https://github.com/rust-lang-nursery/lazy-static.rs", rev = "5735630d46572f1e5377c8f2ba0f79d18f53b10c" } -parking_lot = { path = "patches/parking_lot" } - # directories-next was created because directories was unmaintained # directories-next is now unmaintained while directories is maintained # The directories author pulls in ridiculously pointless crates and prefers diff --git a/patches/parking_lot/Cargo.toml b/patches/parking_lot/Cargo.toml deleted file mode 100644 index 20cdd271..00000000 --- a/patches/parking_lot/Cargo.toml +++ /dev/null @@ -1,16 +0,0 @@ -[package] -name = "parking_lot" -version = "0.11.2" -description = "parking_lot which patches to the latest update" -license = "MIT" -repository = "https://github.com/serai-dex/serai/tree/develop/patches/parking_lot" -authors = ["Luke Parker "] -keywords = [] -edition = "2021" - -[package.metadata.docs.rs] -all-features = true -rustdoc-args = ["--cfg", "docsrs"] - -[dependencies] -parking_lot = "0.12" diff --git a/patches/parking_lot/src/lib.rs b/patches/parking_lot/src/lib.rs deleted file mode 100644 index df10a74d..00000000 --- a/patches/parking_lot/src/lib.rs +++ /dev/null @@ -1 +0,0 @@ -pub use parking_lot::*; diff --git a/substrate/abi/Cargo.toml b/substrate/abi/Cargo.toml index e7bf55e1..5a0125ce 100644 --- a/substrate/abi/Cargo.toml +++ b/substrate/abi/Cargo.toml @@ -22,13 +22,12 @@ workspace = true borsh = { version = "1", default-features = false, features = ["derive", "de_strict_order"] } bitvec = { version = "1", default-features = false, features = ["alloc"] } -sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } +sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } serde = { version = "1", default-features = false, features = ["derive"], optional = true } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"], optional = true } -scale-info = { version = "2", default-features = false, features = ["derive"], optional = true } -sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false, features = ["serde"], optional = true } -frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false, optional = true } +sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false, features = ["serde"], optional = true } +frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false, optional = true } serai-primitives = { path = "../primitives", version = "0.1", default-features = false } @@ -41,12 +40,11 @@ std = [ "serde?/std", "scale?/std", - "scale-info?/std", "sp-runtime?/std", "frame-support?/std", "serai-primitives/std", ] -substrate = ["serde", "scale", "scale-info", "sp-runtime", "frame-support", "serai-primitives/serde", "serai-primitives/non_canonical_scale_derivations"] +substrate = ["serde", "scale", "sp-runtime", "frame-support", "serai-primitives/serde", "serai-primitives/non_canonical_scale_derivations"] try-runtime = ["sp-runtime/try-runtime"] default = ["std"] diff --git a/substrate/abi/src/block.rs b/substrate/abi/src/block.rs index 0f48be98..3fd18934 100644 --- a/substrate/abi/src/block.rs +++ b/substrate/abi/src/block.rs @@ -106,7 +106,6 @@ mod substrate { use core::fmt::Debug; use scale::{Encode, Decode, DecodeWithMemTracking}; - use scale_info::TypeInfo; use sp_core::H256; use sp_runtime::{ @@ -182,7 +181,6 @@ mod substrate { Encode, Decode, DecodeWithMemTracking, - TypeInfo, sp_runtime::Serialize, sp_runtime::Deserialize, )] @@ -208,7 +206,6 @@ mod substrate { Encode, Decode, DecodeWithMemTracking, - TypeInfo, sp_runtime::Serialize, sp_runtime::Deserialize, )] @@ -226,7 +223,6 @@ mod substrate { Encode, Decode, DecodeWithMemTracking, - TypeInfo, sp_runtime::Serialize, sp_runtime::Deserialize, )] @@ -285,7 +281,7 @@ mod substrate { } /// A block, as needed by Substrate. - #[derive(Clone, Debug, PartialEq, Eq, Encode, Decode, DecodeWithMemTracking, TypeInfo)] + #[derive(Clone, Debug, PartialEq, Eq, Encode, Decode, DecodeWithMemTracking)] pub struct SubstrateBlock { header: SubstrateHeader, transactions: Vec, diff --git a/substrate/abi/src/transaction.rs b/substrate/abi/src/transaction.rs index be2cd691..dde1ca25 100644 --- a/substrate/abi/src/transaction.rs +++ b/substrate/abi/src/transaction.rs @@ -256,23 +256,10 @@ mod substrate { } } - // Clean `Transaction` tracks its memory during decoding, as we do call + // Clean `Transaction` tracks its memory during decoding, as `read_scale_as_borsh` does call // `Input::on_before_alloc_mem` impl scale::DecodeWithMemTracking for Transaction {} - // Shim `TypeInfo` for `Transaction` - impl scale_info::TypeInfo for Transaction { - type Identity = Self; - fn type_info() -> scale_info::Type { - scale_info::Type { - path: scale_info::Path { segments: vec!["serai_abi", "transaction", "Transaction"] }, - type_params: vec![], - type_def: (scale_info::TypeDefComposite { fields: vec![] }).into(), - docs: vec![], - } - } - } - /// The context which transactions are executed in. pub trait TransactionContext: 'static + Send + Sync + Clone + PartialEq + Eq + Debug { /// The base weight for a signed transaction. diff --git a/substrate/client/Cargo.toml b/substrate/client/Cargo.toml index 0fad368e..085cd6f3 100644 --- a/substrate/client/Cargo.toml +++ b/substrate/client/Cargo.toml @@ -31,9 +31,9 @@ serde_json = { version = "1", optional = true } serai-abi = { path = "../abi", version = "0.1" } multiaddr = { version = "0.18", optional = true } -sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", optional = true } -sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", optional = true } -frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", optional = true } +sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", optional = true } +sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", optional = true } +frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", optional = true } async-lock = "3" diff --git a/substrate/coins/Cargo.toml b/substrate/coins/Cargo.toml index 648e6ffb..e0c69e33 100644 --- a/substrate/coins/Cargo.toml +++ b/substrate/coins/Cargo.toml @@ -12,27 +12,23 @@ rust-version = "1.85" all-features = true rustdoc-args = ["--cfg", "docsrs"] -[package.metadata.cargo-machete] -ignored = ["scale", "scale-info"] - [lints] workspace = true [dependencies] scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } -sp-std = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } -sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } +sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } +sp-std = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } +sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } -frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } -frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } +frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } +frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } serai-primitives = { path = "../primitives", default-features = false, features = ["serde", "non_canonical_scale_derivations"] } [dev-dependencies] -sp-io = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false, features = ["std"] } +sp-io = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false, features = ["std"] } [features] std = [ diff --git a/substrate/dex/Cargo.toml b/substrate/dex/Cargo.toml index 583a4bbc..4f7e8443 100644 --- a/substrate/dex/Cargo.toml +++ b/substrate/dex/Cargo.toml @@ -13,24 +13,23 @@ all-features = true rustdoc-args = ["--cfg", "docsrs"] [package.metadata.cargo-machete] -ignored = ["scale", "scale-info"] +ignored = ["scale"] [lints] workspace = true [dependencies] scale = { package = "parity-scale-codec", version = "3.6.1", default-features = false } -scale-info = { version = "2.5.0", default-features = false, features = ["derive"] } -sp-std = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } -sp-io = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } -sp-api = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } -sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } -sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } +sp-std = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } +sp-io = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } +sp-api = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } +sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } +sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } -frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } -frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } -frame-benchmarking = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false, optional = true } +frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } +frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } +frame-benchmarking = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false, optional = true } coins-pallet = { package = "serai-coins-pallet", path = "../coins", default-features = false } @@ -43,7 +42,6 @@ rand_core = { version = "0.6", default-features = false, features = ["getrandom" default = ["std"] std = [ "scale/std", - "scale-info/std", "sp-std/std", "sp-io/std", diff --git a/substrate/economic-security/Cargo.toml b/substrate/economic-security/Cargo.toml index bdaa86be..d5caa108 100644 --- a/substrate/economic-security/Cargo.toml +++ b/substrate/economic-security/Cargo.toml @@ -13,17 +13,16 @@ all-features = true rustdoc-args = ["--cfg", "docsrs"] [package.metadata.cargo-machete] -ignored = ["scale", "scale-info"] +ignored = ["scale"] [lints] workspace = true [dependencies] scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2", default-features = false, features = ["derive"] } -frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } -frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } +frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } +frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } dex-pallet = { package = "serai-dex-pallet", path = "../dex", default-features = false } coins-pallet = { package = "serai-coins-pallet", path = "../coins", default-features = false } @@ -31,21 +30,20 @@ coins-pallet = { package = "serai-coins-pallet", path = "../coins", default-feat serai-primitives = { path = "../primitives", default-features = false } [dev-dependencies] -pallet-babe = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } -pallet-grandpa = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } -pallet-timestamp = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } +pallet-babe = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } +pallet-grandpa = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } +pallet-timestamp = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } validator-sets-pallet = { package = "serai-validator-sets-pallet", path = "../validator-sets", default-features = false } -sp-io = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } -sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } -sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } -sp-consensus-babe = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } +sp-io = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } +sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } +sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } +sp-consensus-babe = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } [features] std = [ "scale/std", - "scale-info/std", "frame-system/std", "frame-support/std", diff --git a/substrate/emissions/Cargo.toml b/substrate/emissions/Cargo.toml index 339a4788..260c6e18 100644 --- a/substrate/emissions/Cargo.toml +++ b/substrate/emissions/Cargo.toml @@ -13,20 +13,19 @@ all-features = true rustdoc-args = ["--cfg", "docsrs"] [package.metadata.cargo-machete] -ignored = ["scale", "scale-info"] +ignored = ["scale"] [lints] workspace = true [dependencies] scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2", default-features = false, features = ["derive"] } -frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } -frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } +frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } +frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } -sp-std = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } -sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } +sp-std = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } +sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } coins-pallet = { package = "serai-coins-pallet", path = "../coins", default-features = false } validator-sets-pallet = { package = "serai-validator-sets-pallet", path = "../validator-sets", default-features = false } @@ -40,7 +39,6 @@ serai-primitives = { path = "../primitives", default-features = false } [features] std = [ "scale/std", - "scale-info/std", "frame-system/std", "frame-support/std", diff --git a/substrate/genesis-liquidity/Cargo.toml b/substrate/genesis-liquidity/Cargo.toml index 4084f33c..a51f0999 100644 --- a/substrate/genesis-liquidity/Cargo.toml +++ b/substrate/genesis-liquidity/Cargo.toml @@ -13,21 +13,20 @@ all-features = true rustdoc-args = ["--cfg", "docsrs"] [package.metadata.cargo-machete] -ignored = ["scale", "scale-info"] +ignored = ["scale"] [lints] workspace = true [dependencies] scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2", default-features = false, features = ["derive"] } -frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } -frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } +frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } +frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } -sp-std = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } -sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } -sp-application-crypto = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } +sp-std = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } +sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } +sp-application-crypto = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } dex-pallet = { package = "serai-dex-pallet", path = "../dex", default-features = false } coins-pallet = { package = "serai-coins-pallet", path = "../coins", default-features = false } @@ -40,7 +39,6 @@ serai-primitives = { path = "../primitives", default-features = false } [features] std = [ "scale/std", - "scale-info/std", "frame-system/std", "frame-support/std", diff --git a/substrate/in-instructions/Cargo.toml b/substrate/in-instructions/Cargo.toml index f265fe93..ca1edc45 100644 --- a/substrate/in-instructions/Cargo.toml +++ b/substrate/in-instructions/Cargo.toml @@ -14,7 +14,7 @@ all-features = true rustdoc-args = ["--cfg", "docsrs"] [package.metadata.cargo-machete] -ignored = ["scale", "scale-info"] +ignored = ["scale"] [lints] workspace = true @@ -23,16 +23,15 @@ workspace = true bitvec = { version = "1", default-features = false, features = ["alloc"] } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "max-encoded-len"] } -scale-info = { version = "2", default-features = false, features = ["derive"] } -sp-std = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } -sp-application-crypto = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } -sp-io = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } -sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } -sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } +sp-std = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } +sp-application-crypto = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } +sp-io = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } +sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } +sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } -frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } -frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } +frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } +frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } serai-primitives = { path = "../primitives", default-features = false } @@ -43,16 +42,15 @@ genesis-liquidity-pallet = { package = "serai-genesis-liquidity-pallet", path = emissions-pallet = { package = "serai-emissions-pallet", path = "../emissions", default-features = false } [dev-dependencies] -pallet-babe = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } -pallet-grandpa = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } -pallet-timestamp = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } +pallet-babe = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } +pallet-grandpa = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } +pallet-timestamp = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } economic-security-pallet = { package = "serai-economic-security-pallet", path = "../economic-security", default-features = false } [features] std = [ "scale/std", - "scale-info/std", "sp-std/std", "sp-application-crypto/std", diff --git a/substrate/node/Cargo.toml b/substrate/node/Cargo.toml index ed55aaa8..e8a86709 100644 --- a/substrate/node/Cargo.toml +++ b/substrate/node/Cargo.toml @@ -34,16 +34,16 @@ secq256k1 = { path = "../../crypto/secq256k1" } libp2p = "0.54" -sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" } -sp-keystore = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" } -sp-timestamp = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" } -sp-io = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" } -sp-blockchain = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" } -sp-api = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" } -sp-block-builder = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" } -sp-consensus-babe = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" } +sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c" } +sp-keystore = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c" } +sp-timestamp = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c" } +sp-io = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c" } +sp-blockchain = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c" } +sp-api = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c" } +sp-block-builder = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c" } +sp-consensus-babe = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c" } -frame-benchmarking = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" } +frame-benchmarking = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c" } serai-runtime = { path = "../runtime", features = ["std"] } @@ -55,25 +55,24 @@ jsonrpsee = { version = "0.24", features = ["server"] } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -sc-offchain = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" } -sc-transaction-pool = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" } -sc-transaction-pool-api = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" } -sc-basic-authorship = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" } -sc-executor = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" } -sc-service = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" } -sc-client-api = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" } -sc-network-common = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" } -sc-network = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false, features = [] } +sc-transaction-pool = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c" } +sc-transaction-pool-api = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c" } +sc-basic-authorship = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c" } +sc-executor = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c" } +sc-service = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c" } +sc-client-api = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c" } +sc-network-common = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c" } +sc-network = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false, features = [] } -sc-consensus = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" } -sc-consensus-babe = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" } -sc-consensus-grandpa = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" } -sc-authority-discovery = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" } +sc-consensus = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c" } +sc-consensus-babe = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c" } +sc-consensus-grandpa = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c" } +sc-authority-discovery = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c" } -sc-telemetry = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" } -sc-cli = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false, features = ["rocksdb"] } +sc-telemetry = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c" } +sc-cli = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false, features = ["rocksdb"] } -sc-rpc-api = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" } +sc-rpc-api = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c" } serai-env = { path = "../../common/env" } diff --git a/substrate/primitives/Cargo.toml b/substrate/primitives/Cargo.toml index 76098829..13d93c72 100644 --- a/substrate/primitives/Cargo.toml +++ b/substrate/primitives/Cargo.toml @@ -21,8 +21,7 @@ borsh = { version = "1", default-features = false, features = ["derive", "de_str bitvec = { version = "1", default-features = false, features = ["alloc"] } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"], optional = true } -scale-info = { version = "2", default-features = false, features = ["derive"], optional = true } -sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } +sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } ciphersuite = { path = "../../crypto/ciphersuite", default-features = false, features = ["alloc"] } schnorr-signatures = { path = "../../crypto/schnorr", default-features = false } @@ -44,7 +43,6 @@ std = [ "borsh/std", "bitvec/std", "scale?/std", - "scale-info?/std", "sp-core/std", "ciphersuite/std", "schnorr-signatures/std", @@ -56,5 +54,5 @@ std = [ "bech32/std" ] serde = [] -non_canonical_scale_derivations = ["scale", "scale-info"] +non_canonical_scale_derivations = ["scale"] default = ["std"] diff --git a/substrate/primitives/src/address.rs b/substrate/primitives/src/address.rs index a5ddf304..18a10708 100644 --- a/substrate/primitives/src/address.rs +++ b/substrate/primitives/src/address.rs @@ -24,10 +24,7 @@ const HUMAN_READABLE_PART: bech32::Hrp = bech32::Hrp::parse_unchecked("sri"); /// The address for an account on Serai. #[derive(Clone, Copy, PartialEq, Eq, Hash, Debug, Zeroize, BorshSerialize, BorshDeserialize)] -#[cfg_attr( - feature = "non_canonical_scale_derivations", - derive(scale::Encode, scale::Decode, scale_info::TypeInfo) -)] +#[cfg_attr(feature = "non_canonical_scale_derivations", derive(scale::Encode, scale::Decode))] pub struct SeraiAddress(pub [u8; 32]); // These share encodings as 32-byte arrays @@ -117,13 +114,7 @@ impl core::str::FromStr for SeraiAddress { #[derive(Clone, PartialEq, Eq, Debug, borsh::BorshSerialize, borsh::BorshDeserialize)] #[cfg_attr( feature = "non_canonical_scale_derivations", - derive( - scale::Encode, - scale::Decode, - scale::MaxEncodedLen, - scale::DecodeWithMemTracking, - scale_info::TypeInfo - ) + derive(scale::Encode, scale::Decode, scale::MaxEncodedLen, scale::DecodeWithMemTracking) )] pub struct ExternalAddress( #[borsh( diff --git a/substrate/primitives/src/balance.rs b/substrate/primitives/src/balance.rs index 84b9b015..fa1cd38f 100644 --- a/substrate/primitives/src/balance.rs +++ b/substrate/primitives/src/balance.rs @@ -15,7 +15,7 @@ pub type AmountRepr = u64; #[derive(Zeroize, BorshSerialize, BorshDeserialize)] #[cfg_attr( feature = "non_canonical_scale_derivations", - derive(scale::Encode, scale::Decode, scale::MaxEncodedLen, scale::DecodeWithMemTracking, scale_info::TypeInfo) + derive(scale::Encode, scale::Decode, scale::MaxEncodedLen, scale::DecodeWithMemTracking) )] #[cfg_attr(feature = "serde", derive(sp_core::serde::Serialize, sp_core::serde::Deserialize))] #[cfg_attr(feature = "serde", serde(crate = "sp_core::serde"))] @@ -46,13 +46,7 @@ impl Mul for Amount { #[derive(Clone, Copy, PartialEq, Eq, Debug, Zeroize, BorshSerialize, BorshDeserialize)] #[cfg_attr( feature = "non_canonical_scale_derivations", - derive( - scale::Encode, - scale::Decode, - scale::MaxEncodedLen, - scale::DecodeWithMemTracking, - scale_info::TypeInfo - ) + derive(scale::Encode, scale::Decode, scale::MaxEncodedLen, scale::DecodeWithMemTracking) )] #[cfg_attr(feature = "serde", derive(sp_core::serde::Serialize, sp_core::serde::Deserialize))] #[cfg_attr(feature = "serde", serde(crate = "sp_core::serde"))] @@ -88,13 +82,7 @@ impl Mul for ExternalBalance { #[derive(Clone, Copy, PartialEq, Eq, Debug, Zeroize, BorshSerialize, BorshDeserialize)] #[cfg_attr( feature = "non_canonical_scale_derivations", - derive( - scale::Encode, - scale::Decode, - scale::MaxEncodedLen, - scale::DecodeWithMemTracking, - scale_info::TypeInfo - ) + derive(scale::Encode, scale::Decode, scale::MaxEncodedLen, scale::DecodeWithMemTracking) )] #[cfg_attr(feature = "serde", derive(sp_core::serde::Serialize, sp_core::serde::Deserialize))] #[cfg_attr(feature = "serde", serde(crate = "sp_core::serde"))] diff --git a/substrate/primitives/src/coin.rs b/substrate/primitives/src/coin.rs index 45e061a0..d9bc5c0a 100644 --- a/substrate/primitives/src/coin.rs +++ b/substrate/primitives/src/coin.rs @@ -11,13 +11,7 @@ use crate::network_id::{ExternalNetworkId, NetworkId}; #[borsh(use_discriminant = true)] #[cfg_attr( feature = "non_canonical_scale_derivations", - derive( - scale::Encode, - scale::Decode, - scale::MaxEncodedLen, - scale::DecodeWithMemTracking, - scale_info::TypeInfo - ) + derive(scale::Encode, scale::Decode, scale::MaxEncodedLen, scale::DecodeWithMemTracking) )] #[cfg_attr(feature = "serde", derive(sp_core::serde::Serialize, sp_core::serde::Deserialize))] #[cfg_attr(feature = "serde", serde(crate = "sp_core::serde"))] @@ -45,13 +39,7 @@ impl ExternalCoin { #[derive(Clone, Copy, PartialEq, Eq, Hash, Debug, Zeroize)] #[cfg_attr( feature = "non_canonical_scale_derivations", - derive( - scale::Encode, - scale::Decode, - scale::MaxEncodedLen, - scale::DecodeWithMemTracking, - scale_info::TypeInfo - ) + derive(scale::Encode, scale::Decode, scale::MaxEncodedLen, scale::DecodeWithMemTracking) )] #[cfg_attr(feature = "non_canonical_scale_derivations", allow(clippy::cast_possible_truncation))] #[cfg_attr(feature = "serde", derive(sp_core::serde::Serialize, sp_core::serde::Deserialize))] diff --git a/substrate/primitives/src/crypto.rs b/substrate/primitives/src/crypto.rs index a3df8cbf..699e991d 100644 --- a/substrate/primitives/src/crypto.rs +++ b/substrate/primitives/src/crypto.rs @@ -17,13 +17,7 @@ use crate::network_id::ExternalNetworkId; #[derive(Clone, Copy, PartialEq, Eq, Debug, Zeroize, BorshSerialize, BorshDeserialize)] #[cfg_attr( feature = "non_canonical_scale_derivations", - derive( - scale::Encode, - scale::Decode, - scale::MaxEncodedLen, - scale::DecodeWithMemTracking, - scale_info::TypeInfo - ) + derive(scale::Encode, scale::Decode, scale::MaxEncodedLen, scale::DecodeWithMemTracking) )] pub struct Public(pub [u8; 32]); impl From for Public { @@ -41,13 +35,7 @@ impl From for sp_core::sr25519::Public { #[derive(Clone, Copy, PartialEq, Eq, Debug, Zeroize, BorshSerialize, BorshDeserialize)] #[cfg_attr( feature = "non_canonical_scale_derivations", - derive( - scale::Encode, - scale::Decode, - scale::MaxEncodedLen, - scale::DecodeWithMemTracking, - scale_info::TypeInfo - ) + derive(scale::Encode, scale::Decode, scale::MaxEncodedLen, scale::DecodeWithMemTracking) )] pub struct Signature(pub [u8; 64]); impl From for Signature { @@ -70,13 +58,7 @@ impl From for sp_core::sr25519::Signature { #[derive(Clone, PartialEq, Eq, Debug, BorshSerialize, BorshDeserialize)] #[cfg_attr( feature = "non_canonical_scale_derivations", - derive( - scale::Encode, - scale::Decode, - scale::MaxEncodedLen, - scale::DecodeWithMemTracking, - scale_info::TypeInfo - ) + derive(scale::Encode, scale::Decode, scale::MaxEncodedLen, scale::DecodeWithMemTracking) )] pub struct ExternalKey( #[borsh( @@ -373,12 +355,6 @@ impl scale::DecodeWithMemTracking for SignedEmbeddedEllipticCurveKeys {} #[derive(Clone, PartialEq, Eq, Debug, Zeroize, BorshSerialize, BorshDeserialize)] #[cfg_attr( feature = "non_canonical_scale_derivations", - derive( - scale::Encode, - scale::Decode, - scale::MaxEncodedLen, - scale::DecodeWithMemTracking, - scale_info::TypeInfo - ) + derive(scale::Encode, scale::Decode, scale::MaxEncodedLen, scale::DecodeWithMemTracking) )] pub struct KeyPair(pub Public, pub ExternalKey); diff --git a/substrate/primitives/src/instructions/out.rs b/substrate/primitives/src/instructions/out.rs index fd895719..ada43931 100644 --- a/substrate/primitives/src/instructions/out.rs +++ b/substrate/primitives/src/instructions/out.rs @@ -8,13 +8,7 @@ use crate::{address::ExternalAddress, balance::ExternalBalance}; #[derive(Clone, PartialEq, Eq, Debug, Zeroize, BorshSerialize, BorshDeserialize)] #[cfg_attr( feature = "non_canonical_scale_derivations", - derive( - scale::Encode, - scale::Decode, - scale::MaxEncodedLen, - scale::DecodeWithMemTracking, - scale_info::TypeInfo - ) + derive(scale::Encode, scale::Decode, scale::MaxEncodedLen, scale::DecodeWithMemTracking) )] #[cfg_attr(feature = "non_canonical_scale_derivations", allow(clippy::cast_possible_truncation))] pub enum OutInstruction { @@ -26,13 +20,7 @@ pub enum OutInstruction { #[derive(Clone, PartialEq, Eq, Debug, Zeroize, BorshSerialize, BorshDeserialize)] #[cfg_attr( feature = "non_canonical_scale_derivations", - derive( - scale::Encode, - scale::Decode, - scale::MaxEncodedLen, - scale::DecodeWithMemTracking, - scale_info::TypeInfo - ) + derive(scale::Encode, scale::Decode, scale::MaxEncodedLen, scale::DecodeWithMemTracking) )] pub struct OutInstructionWithBalance { /// The instruction on how to transfer coins out. diff --git a/substrate/primitives/src/lib.rs b/substrate/primitives/src/lib.rs index c321b77b..49d0df31 100644 --- a/substrate/primitives/src/lib.rs +++ b/substrate/primitives/src/lib.rs @@ -67,10 +67,7 @@ impl From for BlockNumber { hash it into a 32-byte hash or truncate it. */ #[derive(Clone, Copy, PartialEq, Eq, Hash, Debug, Zeroize, BorshSerialize, BorshDeserialize)] -#[cfg_attr( - feature = "non_canonical_scale_derivations", - derive(scale::Encode, scale::Decode, scale_info::TypeInfo) -)] +#[cfg_attr(feature = "non_canonical_scale_derivations", derive(scale::Encode, scale::Decode))] #[cfg_attr(feature = "serde", derive(sp_core::serde::Serialize, sp_core::serde::Deserialize))] #[cfg_attr(feature = "serde", serde(crate = "sp_core::serde"))] pub struct BlockHash(pub [u8; 32]); diff --git a/substrate/primitives/src/merkle.rs b/substrate/primitives/src/merkle.rs index d431aa0c..e133d2db 100644 --- a/substrate/primitives/src/merkle.rs +++ b/substrate/primitives/src/merkle.rs @@ -76,7 +76,7 @@ impl UnbalancedMerkleTree { #[derive(Clone, PartialEq, Eq, Debug)] #[cfg_attr( feature = "non_canonical_scale_derivations", - derive(scale::Encode, scale::Decode, scale::DecodeWithMemTracking, scale_info::TypeInfo) + derive(scale::Encode, scale::Decode, scale::DecodeWithMemTracking) )] pub struct IncrementalUnbalancedMerkleTree { /// (number of children under branch, branch hash) diff --git a/substrate/primitives/src/network_id.rs b/substrate/primitives/src/network_id.rs index d71fd542..6522a4b4 100644 --- a/substrate/primitives/src/network_id.rs +++ b/substrate/primitives/src/network_id.rs @@ -8,13 +8,7 @@ use crate::coin::{ExternalCoin, Coin}; #[derive(Clone, Copy, PartialEq, Eq, Debug, Zeroize, BorshSerialize, BorshDeserialize)] #[cfg_attr( feature = "non_canonical_scale_derivations", - derive( - scale::Encode, - scale::Decode, - scale::MaxEncodedLen, - scale::DecodeWithMemTracking, - scale_info::TypeInfo - ) + derive(scale::Encode, scale::Decode, scale::MaxEncodedLen, scale::DecodeWithMemTracking) )] pub enum EmbeddedEllipticCurve { /// The Embedwards25519 curve, defined over (embedded into) Ed25519's/Ristretto's scalar field. @@ -30,13 +24,7 @@ pub enum EmbeddedEllipticCurve { #[borsh(use_discriminant = true)] #[cfg_attr( feature = "non_canonical_scale_derivations", - derive( - scale::Encode, - scale::Decode, - scale::MaxEncodedLen, - scale::DecodeWithMemTracking, - scale_info::TypeInfo - ) + derive(scale::Encode, scale::Decode, scale::MaxEncodedLen, scale::DecodeWithMemTracking) )] #[non_exhaustive] pub enum ExternalNetworkId { @@ -88,13 +76,7 @@ impl ExternalNetworkId { #[derive(Clone, Copy, PartialEq, Eq, Hash, Debug, Zeroize)] #[cfg_attr( feature = "non_canonical_scale_derivations", - derive( - scale::Encode, - scale::Decode, - scale::MaxEncodedLen, - scale::DecodeWithMemTracking, - scale_info::TypeInfo - ) + derive(scale::Encode, scale::Decode, scale::MaxEncodedLen, scale::DecodeWithMemTracking) )] #[cfg_attr(feature = "non_canonical_scale_derivations", allow(clippy::cast_possible_truncation))] pub enum NetworkId { diff --git a/substrate/primitives/src/validator_sets/mod.rs b/substrate/primitives/src/validator_sets/mod.rs index 8ab94d8d..3329553f 100644 --- a/substrate/primitives/src/validator_sets/mod.rs +++ b/substrate/primitives/src/validator_sets/mod.rs @@ -19,13 +19,7 @@ pub use slashes::*; #[derive(Clone, Copy, PartialEq, Eq, Hash, Debug, Zeroize, BorshSerialize, BorshDeserialize)] #[cfg_attr( feature = "non_canonical_scale_derivations", - derive( - scale::Encode, - scale::Decode, - scale::MaxEncodedLen, - scale::DecodeWithMemTracking, - scale_info::TypeInfo - ) + derive(scale::Encode, scale::Decode, scale::MaxEncodedLen, scale::DecodeWithMemTracking) )] pub struct Session(pub u32); @@ -33,13 +27,7 @@ pub struct Session(pub u32); #[derive(Clone, Copy, PartialEq, Eq, Hash, Debug, Zeroize, BorshSerialize, BorshDeserialize)] #[cfg_attr( feature = "non_canonical_scale_derivations", - derive( - scale::Encode, - scale::Decode, - scale::MaxEncodedLen, - scale::DecodeWithMemTracking, - scale_info::TypeInfo - ) + derive(scale::Encode, scale::Decode, scale::MaxEncodedLen, scale::DecodeWithMemTracking) )] pub struct ExternalValidatorSet { /// The network this set of validators are for. @@ -52,13 +40,7 @@ pub struct ExternalValidatorSet { #[derive(Clone, Copy, PartialEq, Eq, Hash, Debug, Zeroize, BorshSerialize, BorshDeserialize)] #[cfg_attr( feature = "non_canonical_scale_derivations", - derive( - scale::Encode, - scale::Decode, - scale::MaxEncodedLen, - scale::DecodeWithMemTracking, - scale_info::TypeInfo - ) + derive(scale::Encode, scale::Decode, scale::MaxEncodedLen, scale::DecodeWithMemTracking) )] pub struct ValidatorSet { /// The network this set of validators are for. diff --git a/substrate/primitives/src/validator_sets/slashes.rs b/substrate/primitives/src/validator_sets/slashes.rs index 689a64c8..e9956670 100644 --- a/substrate/primitives/src/validator_sets/slashes.rs +++ b/substrate/primitives/src/validator_sets/slashes.rs @@ -22,13 +22,7 @@ fn downtime_per_slash_point(validators: NonZero) -> Duration { #[derive(Clone, Copy, PartialEq, Eq, Debug, Zeroize, BorshSerialize, BorshDeserialize)] #[cfg_attr( feature = "non_canonical_scale_derivations", - derive( - scale::Encode, - scale::Decode, - scale::MaxEncodedLen, - scale::DecodeWithMemTracking, - scale_info::TypeInfo - ) + derive(scale::Encode, scale::Decode, scale::MaxEncodedLen, scale::DecodeWithMemTracking) )] #[cfg_attr(feature = "non_canonical_scale_derivations", allow(clippy::cast_possible_truncation))] pub enum Slash { @@ -211,13 +205,7 @@ impl Slash { #[derive(Clone, PartialEq, Eq, Debug, BorshSerialize, BorshDeserialize)] #[cfg_attr( feature = "non_canonical_scale_derivations", - derive( - scale::Encode, - scale::Decode, - scale::MaxEncodedLen, - scale::DecodeWithMemTracking, - scale_info::TypeInfo - ) + derive(scale::Encode, scale::Decode, scale::MaxEncodedLen, scale::DecodeWithMemTracking) )] pub struct SlashReport( #[borsh( diff --git a/substrate/runtime/Cargo.toml b/substrate/runtime/Cargo.toml index f4921c3d..0577d09a 100644 --- a/substrate/runtime/Cargo.toml +++ b/substrate/runtime/Cargo.toml @@ -12,7 +12,7 @@ all-features = true rustdoc-args = ["--cfg", "docsrs"] [package.metadata.cargo-machete] -ignored = ["scale", "scale-info"] +ignored = ["scale"] [lints] workspace = true @@ -21,28 +21,26 @@ workspace = true borsh = { version = "1", default-features = false, features = ["derive", "de_strict_order"] } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } -sp-version = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } -sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } -sp-api = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } +sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } +sp-version = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } +sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } +sp-api = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } serai-abi = { path = "../abi", default-features = false, features = ["substrate"] } -frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } -frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } -frame-executive = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } +frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } +frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } +frame-executive = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } serai-coins-pallet = { path = "../coins", default-features = false } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0" } +substrate-wasm-builder = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c" } [features] std = [ "scale/std", - "scale-info/std", "sp-core/std", "sp-version/std", diff --git a/substrate/signals/Cargo.toml b/substrate/signals/Cargo.toml index b082d6b0..850e62fd 100644 --- a/substrate/signals/Cargo.toml +++ b/substrate/signals/Cargo.toml @@ -13,20 +13,19 @@ all-features = true rustdoc-args = ["--cfg", "docsrs"] [package.metadata.cargo-machete] -ignored = ["scale", "scale-info"] +ignored = ["scale"] [lints] workspace = true [dependencies] scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } -sp-io = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } +sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } +sp-io = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } -frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } -frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } +frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } +frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } serai-primitives = { path = "../primitives", default-features = false } @@ -36,7 +35,6 @@ in-instructions-pallet = { package = "serai-in-instructions-pallet", path = "../ [features] std = [ "scale/std", - "scale-info/std", "sp-core/std", "sp-io/std", diff --git a/substrate/signals/src/lib.rs b/substrate/signals/src/lib.rs index a682123d..96ae8a08 100644 --- a/substrate/signals/src/lib.rs +++ b/substrate/signals/src/lib.rs @@ -9,8 +9,6 @@ )] // TODO #[frame_support::pallet] pub mod pallet { - use scale_info::TypeInfo; - use sp_core::sr25519::Public; use sp_io::hashing::blake2_256; @@ -25,9 +23,7 @@ pub mod pallet { use in_instructions_pallet::{Config as IiConfig, Pallet as InInstructions}; #[pallet::config] - pub trait Config: - frame_system::Config + VsConfig + IiConfig + TypeInfo - { + pub trait Config: frame_system::Config + VsConfig + IiConfig { type RuntimeEvent: IsType<::RuntimeEvent> + From>; type RetirementValidityDuration: Get; @@ -56,7 +52,7 @@ pub mod pallet { #[pallet::pallet] pub struct Pallet(PhantomData); - #[derive(Clone, PartialEq, Eq, Debug, Encode, Decode, TypeInfo, MaxEncodedLen)] + #[derive(Clone, PartialEq, Eq, Debug, Encode, Decode, MaxEncodedLen)] pub struct RegisteredRetirementSignal { in_favor_of: [u8; 32], registrant: T::AccountId, diff --git a/substrate/validator-sets/Cargo.toml b/substrate/validator-sets/Cargo.toml index 4a5d203e..7e5a8a24 100644 --- a/substrate/validator-sets/Cargo.toml +++ b/substrate/validator-sets/Cargo.toml @@ -19,24 +19,23 @@ workspace = true bitvec = { version = "1", default-features = false, features = ["alloc", "serde"] } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "bit-vec"] } -scale-info = { version = "2", default-features = false, features = ["derive", "bit-vec"] } -sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } -sp-io = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } -sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } -sp-api = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } +sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } +sp-io = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } +sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } +sp-api = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } -frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } -frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } +frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } +frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } serai-primitives = { path = "../primitives", default-features = false, features = ["non_canonical_scale_derivations"] } coins-pallet = { package = "serai-coins-pallet", path = "../coins", default-features = false } [dev-dependencies] -#pallet-timestamp = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } +#pallet-timestamp = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } -#sp-consensus-babe = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "9451a7e8d8ff28571bd9bc8cdea91dacd80e1ab0", default-features = false } +#sp-consensus-babe = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "749e7a1a664813ea3ae15e646f352a410e39653c", default-features = false } #ciphersuite = { path = "../../../crypto/ciphersuite", default-features = false, features = ["std"] } #dalek-ff-group = { path = "../../../crypto/dalek-ff-group", default-features = false, features = ["std"] } @@ -54,7 +53,6 @@ std = [ "bitvec/std", "scale/std", - "scale-info/std", "sp-core/std", "sp-io/std", diff --git a/substrate/validator-sets/src/lib.rs b/substrate/validator-sets/src/lib.rs index 72d8cf4a..39ef2d59 100644 --- a/substrate/validator-sets/src/lib.rs +++ b/substrate/validator-sets/src/lib.rs @@ -17,7 +17,6 @@ use sessions::{*, GenesisValidators as GenesisValidatorsContainer}; use core::marker::PhantomData; use scale::{Encode, Decode}; -use scale_info::TypeInfo; use sp_std::{vec, vec::Vec}; use sp_core::sr25519::{Public, Signature}; @@ -49,7 +48,7 @@ use pallet_grandpa::{ EquivocationOffence as GrandpaEquivocationOffence, }; -#[derive(Debug, Encode, Decode, TypeInfo, PartialEq, Eq, Clone)] +#[derive(Debug, Encode, Decode, PartialEq, Eq, Clone)] pub struct MembershipProof(pub Public, pub PhantomData); impl GetSessionNumber for MembershipProof { fn session(&self) -> u32 { diff --git a/substrate/validator-sets/src/sessions.rs b/substrate/validator-sets/src/sessions.rs index d186bcef..6824bc44 100644 --- a/substrate/validator-sets/src/sessions.rs +++ b/substrate/validator-sets/src/sessions.rs @@ -94,11 +94,7 @@ fn clear_selected_validators>(set: ValidatorSet /// An error when allocating. #[derive( - scale::Encode, - scale::Decode, - scale::DecodeWithMemTracking, - scale_info::TypeInfo, - frame_support::PalletError, + scale::Encode, scale::Decode, scale::DecodeWithMemTracking, frame_support::PalletError, )] pub enum AllocationError { /// The validator set didn't define an allocation requirement for a key share. @@ -118,11 +114,7 @@ pub(crate) enum DeallocationTimeline { /// An error when deallocating. #[derive( - scale::Encode, - scale::Decode, - scale::DecodeWithMemTracking, - scale_info::TypeInfo, - frame_support::PalletError, + scale::Encode, scale::Decode, scale::DecodeWithMemTracking, frame_support::PalletError, )] pub enum DeallocationError { /// The validator set didn't define an allocation requirement for a key share.