diff --git a/Cargo.lock b/Cargo.lock
index ef3357307916f..9bc2b8339af0d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -83,7 +83,7 @@ version = "0.7.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
dependencies = [
- "getrandom",
+ "getrandom 0.2.10",
"once_cell",
"version_check",
]
@@ -95,10 +95,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
dependencies = [
"cfg-if",
- "getrandom",
+ "getrandom 0.2.10",
"once_cell",
"version_check",
- "zerocopy",
+ "zerocopy 0.7.32",
]
[[package]]
@@ -130,13 +130,44 @@ dependencies = [
"hex-literal",
"itoa",
"proptest",
- "rand",
+ "rand 0.8.5",
+ "ruint",
+ "serde",
+ "tiny-keccak",
+]
+
+[[package]]
+<<<<<<< HEAD
+=======
+name = "alloy-primitives"
+version = "0.8.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6259a506ab13e1d658796c31e6e39d2e2ee89243bcc505ddc613b35732e0a430"
+dependencies = [
+ "alloy-rlp",
+ "bytes",
+ "cfg-if",
+ "const-hex",
+ "derive_more 1.0.0",
+ "foldhash",
+ "hashbrown 0.15.2",
+ "hex-literal",
+ "indexmap 2.7.1",
+ "itoa",
+ "k256",
+ "keccak-asm",
+ "paste",
+ "proptest",
+ "rand 0.8.5",
"ruint",
+ "rustc-hash 2.0.0",
"serde",
+ "sha3 0.10.8",
"tiny-keccak",
]
[[package]]
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
name = "alloy-rlp"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -165,6 +196,66 @@ dependencies = [
]
[[package]]
+<<<<<<< HEAD
+=======
+name = "alloy-sol-macro"
+version = "0.8.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9d64f851d95619233f74b310f12bcf16e0cbc27ee3762b6115c14a84809280a"
+dependencies = [
+ "alloy-sol-macro-expander",
+ "alloy-sol-macro-input",
+ "proc-macro-error2",
+ "proc-macro2 1.0.93",
+ "quote 1.0.38",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "alloy-sol-macro-expander"
+version = "0.8.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6bf7ed1574b699f48bf17caab4e6e54c6d12bc3c006ab33d58b1e227c1c3559f"
+dependencies = [
+ "alloy-sol-macro-input",
+ "const-hex",
+ "heck 0.5.0",
+ "indexmap 2.7.1",
+ "proc-macro-error2",
+ "proc-macro2 1.0.93",
+ "quote 1.0.38",
+ "syn 2.0.98",
+ "syn-solidity 0.8.15",
+ "tiny-keccak",
+]
+
+[[package]]
+name = "alloy-sol-macro-input"
+version = "0.8.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c02997ccef5f34f9c099277d4145f183b422938ed5322dc57a089fe9b9ad9ee"
+dependencies = [
+ "const-hex",
+ "dunce",
+ "heck 0.5.0",
+ "proc-macro2 1.0.93",
+ "quote 1.0.38",
+ "syn 2.0.98",
+ "syn-solidity 0.8.15",
+]
+
+[[package]]
+name = "alloy-sol-type-parser"
+version = "0.8.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce13ff37285b0870d0a0746992a4ae48efaf34b766ae4c2640fa15e5305f8e73"
+dependencies = [
+ "serde",
+ "winnow 0.6.18",
+]
+
+[[package]]
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
name = "alloy-sol-types"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -603,7 +694,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c"
dependencies = [
"num-traits",
- "rand",
+ "rand 0.8.5",
]
[[package]]
@@ -613,7 +704,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185"
dependencies = [
"num-traits",
- "rand",
+ "rand 0.8.5",
"rayon",
]
@@ -667,12 +758,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22ad1373757efa0f70ec53939aabc7152e1591cb485208052993070ac8d2429d"
dependencies = [
"asn1-rs-derive 0.5.0",
+<<<<<<< HEAD
"asn1-rs-impl 0.2.0",
+=======
+ "asn1-rs-impl",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"displaydoc",
"nom",
"num-traits",
"rusticata-macros",
- "thiserror",
+ "thiserror 1.0.65",
+ "time",
+]
+
+[[package]]
+name = "asn1-rs"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "607495ec7113b178fbba7a6166a27f99e774359ef4823adbefd756b5b81d7970"
+dependencies = [
+ "asn1-rs-derive 0.6.0",
+ "asn1-rs-impl",
+ "displaydoc",
+ "nom",
+ "num-traits",
+ "rusticata-macros",
+ "thiserror 2.0.11",
"time",
]
@@ -700,6 +811,18 @@ dependencies = [
"synstructure 0.13.1",
]
+[[package]]
+name = "asn1-rs-derive"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3109e49b1e4909e9db6515a30c633684d68cdeaa252f215214cb4fa1a5bfee2c"
+dependencies = [
+ "proc-macro2 1.0.93",
+ "quote 1.0.38",
+ "syn 2.0.98",
+ "synstructure 0.13.1",
+]
+
[[package]]
name = "asn1-rs-impl"
version = "0.1.0"
@@ -1339,9 +1462,9 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1"
dependencies = [
- "getrandom",
+ "getrandom 0.2.10",
"instant",
- "rand",
+ "rand 0.8.5",
]
[[package]]
@@ -1360,6 +1483,30 @@ dependencies = [
]
[[package]]
+<<<<<<< HEAD
+=======
+name = "bandersnatch_vrfs"
+version = "0.0.4"
+source = "git+https://github.com/w3f/ring-vrf?rev=0fef826#0fef8266d851932ad25d6b41bc4b34d834d1e11d"
+dependencies = [
+ "ark-bls12-381",
+ "ark-ec",
+ "ark-ed-on-bls12-381-bandersnatch",
+ "ark-ff 0.4.2",
+ "ark-serialize 0.4.2",
+ "ark-std 0.4.0",
+ "dleq_vrf",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
+ "ring 0.1.0",
+ "sha2 0.10.8",
+ "sp-ark-bls12-381",
+ "sp-ark-ed-on-bls12-381-bandersnatch",
+ "zeroize",
+]
+
+[[package]]
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
name = "base-x"
version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1646,7 +1793,7 @@ version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68534a48cbf63a4b1323c433cf21238c9ec23711e0df13b08c33e5c2082663ce"
dependencies = [
- "thiserror",
+ "thiserror 1.0.65",
]
[[package]]
@@ -2388,9 +2535,18 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
[[package]]
name = "bytes"
+<<<<<<< HEAD
version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+=======
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9"
+dependencies = [
+ "serde",
+]
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
[[package]]
name = "bzip2-sys"
@@ -2442,7 +2598,7 @@ dependencies = [
"semver 1.0.18",
"serde",
"serde_json",
- "thiserror",
+ "thiserror 1.0.65",
]
[[package]]
@@ -2790,7 +2946,7 @@ checksum = "a90d114103adbc625300f346d4d09dfb4ab1c4a8df6868435dd903392ecf4354"
dependencies = [
"libc",
"once_cell",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
"wasm-bindgen",
]
@@ -2994,6 +3150,25 @@ dependencies = [
]
[[package]]
+<<<<<<< HEAD
+=======
+name = "common"
+version = "0.1.0"
+source = "git+https://github.com/w3f/ring-proof?rev=665f5f5#665f5f51af5734c7b6d90b985dd6861d4c5b4752"
+dependencies = [
+ "ark-ec",
+ "ark-ff 0.4.2",
+ "ark-poly",
+ "ark-serialize 0.4.2",
+ "ark-std 0.4.0",
+ "fflonk",
+ "getrandom_or_panic",
+ "merlin",
+ "rand_chacha 0.3.1",
+]
+
+[[package]]
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
name = "common-path"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3066,7 +3241,7 @@ version = "0.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb"
dependencies = [
- "getrandom",
+ "getrandom 0.2.10",
"once_cell",
"proc-macro-hack",
"tiny-keccak",
@@ -3753,10 +3928,17 @@ dependencies = [
"async-trait",
"cumulus-primitives-parachain-inherent",
"sp-consensus",
+<<<<<<< HEAD
"sp-inherents",
"sp-runtime",
"sp-state-machine",
"thiserror",
+=======
+ "sp-inherents 26.0.0",
+ "sp-runtime 31.0.1",
+ "sp-state-machine 0.35.0",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -3855,9 +4037,14 @@ dependencies = [
"polkadot-node-primitives",
"polkadot-node-subsystem",
"polkadot-overseer",
+<<<<<<< HEAD
"polkadot-primitives",
"portpicker",
"rand",
+=======
+ "polkadot-primitives 7.0.0",
+ "rand 0.8.5",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"rstest",
"sc-cli",
"sc-client-api",
@@ -3969,10 +4156,16 @@ dependencies = [
"log",
"pallet-message-queue",
"parity-scale-codec",
+<<<<<<< HEAD
"polkadot-parachain-primitives",
"polkadot-runtime-common",
"polkadot-runtime-parachains",
"rand",
+=======
+ "polkadot-parachain-primitives 6.0.0",
+ "polkadot-runtime-parachains 7.0.0",
+ "rand 0.8.5",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"sc-client-api",
"scale-info",
"sp-consensus-slots",
@@ -4224,9 +4417,15 @@ dependencies = [
"sc-client-api",
"sp-api",
"sp-blockchain",
+<<<<<<< HEAD
"sp-state-machine",
"sp-version",
"thiserror",
+=======
+ "sp-state-machine 0.35.0",
+ "sp-version 29.0.0",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -4277,13 +4476,20 @@ dependencies = [
"parity-scale-codec",
"pin-project",
"polkadot-overseer",
+<<<<<<< HEAD
"rand",
+=======
+ "portpicker",
+ "prometheus",
+ "rand 0.8.5",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"sc-client-api",
"sc-rpc-api",
"sc-service",
"schnellru",
"serde",
"serde_json",
+<<<<<<< HEAD
"smoldot",
"smoldot-light",
"sp-api",
@@ -4295,6 +4501,20 @@ dependencies = [
"sp-storage",
"sp-version",
"thiserror",
+=======
+ "smoldot 0.11.0",
+ "smoldot-light 0.9.0",
+ "sp-api 26.0.0",
+ "sp-authority-discovery 26.0.0",
+ "sp-consensus-babe 0.32.0",
+ "sp-core 28.0.0",
+ "sp-runtime 31.0.1",
+ "sp-state-machine 0.35.0",
+ "sp-storage 19.0.0",
+ "sp-version 29.0.0",
+ "substrate-prometheus-endpoint",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"tokio",
"tokio-util",
"tracing",
@@ -4430,8 +4650,13 @@ dependencies = [
"polkadot-primitives",
"polkadot-service",
"polkadot-test-service",
+<<<<<<< HEAD
"portpicker",
"rand",
+=======
+ "prometheus",
+ "rand 0.8.5",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"sc-basic-authorship",
"sc-block-builder",
"sc-chain-spec",
@@ -4482,7 +4707,7 @@ dependencies = [
"openssl-probe",
"openssl-sys",
"schannel",
- "socket2 0.5.7",
+ "socket2 0.5.8",
"windows-sys 0.52.0",
]
@@ -4665,6 +4890,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553"
dependencies = [
"asn1-rs 0.6.1",
+<<<<<<< HEAD
+=======
+ "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.0",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"displaydoc",
"nom",
"num-bigint",
@@ -5213,8 +5455,20 @@ version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
dependencies = [
+<<<<<<< HEAD
"cc",
"libc",
+=======
+ "ethereum-types 0.14.1",
+ "hex",
+ "once_cell",
+ "regex",
+ "serde",
+ "serde_json",
+ "sha3 0.10.8",
+ "thiserror 1.0.65",
+ "uint 0.9.5",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -5364,7 +5618,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec6f82451ff7f0568c6181287189126d492b5654e30a788add08027b6363d019"
dependencies = [
"fatality-proc-macro",
- "thiserror",
+ "thiserror 1.0.65",
]
[[package]]
@@ -5374,7 +5628,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eb42427514b063d97ce21d5199f36c0c307d981434a6be32582bc79fe5bd2303"
dependencies = [
"expander",
+<<<<<<< HEAD
"indexmap 2.2.3",
+=======
+ "indexmap 2.7.1",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"proc-macro-crate 3.1.0",
"proc-macro2 1.0.82",
"quote 1.0.35",
@@ -5388,7 +5646,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e182f7dbc2ef73d9ef67351c5fbbea084729c48362d3ce9dd44c28e32e277fe5"
dependencies = [
"libc",
- "thiserror",
+ "thiserror 1.0.65",
]
[[package]]
@@ -5468,7 +5726,7 @@ dependencies = [
"num-traits",
"parity-scale-codec",
"parking_lot 0.12.3",
- "rand",
+ "rand 0.8.5",
"scale-info",
]
@@ -5506,7 +5764,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534"
dependencies = [
"byteorder",
- "rand",
+ "rand 0.8.5",
"rustc-hex",
"static_assertions",
]
@@ -5580,7 +5838,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8835f84f38484cc86f110a805655697908257fb9a7af005234060891557198e9"
dependencies = [
"nonempty",
- "thiserror",
+ "thiserror 1.0.65",
]
[[package]]
@@ -5644,7 +5902,13 @@ dependencies = [
"linked-hash-map",
"log",
"parity-scale-codec",
+<<<<<<< HEAD
"rand",
+=======
+ "polkadot-parachain-primitives 6.0.0",
+ "polkadot-primitives 7.0.0",
+ "rand 0.8.5",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"rand_pcg",
"sc-block-builder",
"sc-chain-spec",
@@ -5660,6 +5924,7 @@ dependencies = [
"sp-blockchain",
"sp-core",
"sp-database",
+<<<<<<< HEAD
"sp-externalities",
"sp-genesis-builder",
"sp-inherents",
@@ -5671,6 +5936,25 @@ dependencies = [
"sp-trie",
"sp-wasm-interface",
"thiserror",
+=======
+ "sp-externalities 0.25.0",
+ "sp-genesis-builder 0.8.0",
+ "sp-inherents 26.0.0",
+ "sp-io 30.0.0",
+ "sp-keystore 0.34.0",
+ "sp-runtime 31.0.1",
+ "sp-state-machine 0.35.0",
+ "sp-storage 19.0.0",
+ "sp-timestamp 26.0.0",
+ "sp-transaction-pool 26.0.0",
+ "sp-trie 29.0.0",
+ "sp-version 29.0.0",
+ "sp-wasm-interface 20.0.0",
+ "substrate-test-runtime",
+ "subxt",
+ "subxt-signer",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"thousands",
]
@@ -5711,7 +5995,7 @@ dependencies = [
"frame-support",
"frame-system",
"parity-scale-codec",
- "rand",
+ "rand 0.8.5",
"scale-info",
"sp-arithmetic",
"sp-core",
@@ -5730,7 +6014,7 @@ dependencies = [
"frame-support",
"honggfuzz",
"parity-scale-codec",
- "rand",
+ "rand 0.8.5",
"scale-info",
"sp-arithmetic",
"sp-npos-elections",
@@ -6270,7 +6554,19 @@ checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
dependencies = [
"cfg-if",
"libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.13.3+wasi-0.2.2",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -6279,8 +6575,13 @@ version = "0.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ea1015b5a70616b688dc230cfe50c8af89d972cb132d5a622814d29773b10b9"
dependencies = [
+<<<<<<< HEAD
"rand",
"rand_core",
+=======
+ "rand 0.8.5",
+ "rand_core 0.6.4",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -6321,6 +6622,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
[[package]]
+<<<<<<< HEAD
+=======
+name = "glob-match"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9985c9503b412198aa4197559e9a318524ebc4519c229bfa05a535828c950b9d"
+
+[[package]]
+name = "gloo-net"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c06f627b1a58ca3d42b45d6104bf1e1a03799df472df00988b6ba21accc10580"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-sink",
+ "gloo-utils",
+ "http 1.1.0",
+ "js-sys",
+ "pin-project",
+ "serde",
+ "serde_json",
+ "thiserror 1.0.65",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
+[[package]]
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
name = "gloo-timers"
version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -6391,7 +6722,7 @@ dependencies = [
"nonzero_ext",
"parking_lot 0.12.3",
"quanta",
- "rand",
+ "rand 0.8.5",
"smallvec",
]
@@ -6418,7 +6749,11 @@ dependencies = [
"futures-sink",
"futures-util",
"http 0.2.9",
+<<<<<<< HEAD
"indexmap 2.2.3",
+=======
+ "indexmap 2.7.1",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"slab",
"tokio",
"tokio-util",
@@ -6437,7 +6772,11 @@ dependencies = [
"futures-core",
"futures-sink",
"http 1.1.0",
+<<<<<<< HEAD
"indexmap 2.2.3",
+=======
+ "indexmap 2.7.1",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"slab",
"tokio",
"tokio-util",
@@ -6461,7 +6800,7 @@ dependencies = [
"pest_derive",
"serde",
"serde_json",
- "thiserror",
+ "thiserror 1.0.65",
]
[[package]]
@@ -6572,6 +6911,55 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
[[package]]
+<<<<<<< HEAD
+=======
+name = "hickory-proto"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07698b8420e2f0d6447a436ba999ec85d8fbf2a398bbd737b82cac4a2e96e512"
+dependencies = [
+ "async-trait",
+ "cfg-if",
+ "data-encoding",
+ "enum-as-inner",
+ "futures-channel",
+ "futures-io",
+ "futures-util",
+ "idna 0.4.0",
+ "ipnet",
+ "once_cell",
+ "rand 0.8.5",
+ "socket2 0.5.8",
+ "thiserror 1.0.65",
+ "tinyvec",
+ "tokio",
+ "tracing",
+ "url",
+]
+
+[[package]]
+name = "hickory-resolver"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a2e2aba9c389ce5267d31cf1e4dace82390ae276b0b364ea55630b1fa1b44b4"
+dependencies = [
+ "cfg-if",
+ "futures-util",
+ "hickory-proto",
+ "ipconfig",
+ "lru-cache",
+ "once_cell",
+ "parking_lot 0.12.3",
+ "rand 0.8.5",
+ "resolv-conf",
+ "smallvec",
+ "thiserror 1.0.65",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
name = "hkdf"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -6724,7 +7112,7 @@ dependencies = [
"httpdate",
"itoa",
"pin-project-lite",
- "socket2 0.5.7",
+ "socket2 0.4.9",
"tokio",
"tower-service",
"tracing",
@@ -6799,7 +7187,7 @@ dependencies = [
"http-body 1.0.0",
"hyper 1.3.1",
"pin-project-lite",
- "socket2 0.5.7",
+ "socket2 0.5.8",
"tokio",
"tower",
"tower-service",
@@ -6830,70 +7218,204 @@ dependencies = [
]
[[package]]
+<<<<<<< HEAD
name = "idna"
version = "0.2.3"
+=======
+name = "icu_collections"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
dependencies = [
- "matches",
- "unicode-bidi",
- "unicode-normalization",
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
]
[[package]]
-name = "idna"
-version = "0.4.0"
+name = "icu_locid"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
]
[[package]]
-name = "idna"
-version = "0.5.0"
+name = "icu_locid_transform"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
]
[[package]]
-name = "if-addrs"
-version = "0.10.2"
+name = "icu_locid_transform_data"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cabb0019d51a643781ff15c9c8a3e5dedc365c47211270f4e8f82812fedd8f0a"
-dependencies = [
- "libc",
- "windows-sys 0.48.0",
-]
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
[[package]]
-name = "if-watch"
-version = "3.2.0"
+name = "icu_normalizer"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6b0422c86d7ce0e97169cc42e04ae643caf278874a7a3c87b8150a220dc7e1e"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
dependencies = [
- "async-io 2.3.3",
- "core-foundation",
- "fnv",
- "futures",
- "if-addrs",
- "ipnet",
- "log",
- "rtnetlink",
- "system-configuration",
- "tokio",
- "windows 0.51.1",
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
]
[[package]]
-name = "igd-next"
-version = "0.14.3"
+name = "icu_normalizer_data"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "064d90fec10d541084e7b39ead8875a5a80d9114a2b18791565253bae25f49e4"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2 1.0.93",
+ "quote 1.0.38",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
+dependencies = [
+ "matches",
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "idna"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "idna"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
+]
+
+[[package]]
+name = "if-addrs"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cabb0019d51a643781ff15c9c8a3e5dedc365c47211270f4e8f82812fedd8f0a"
+dependencies = [
+ "libc",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "if-watch"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6b0422c86d7ce0e97169cc42e04ae643caf278874a7a3c87b8150a220dc7e1e"
+dependencies = [
+ "async-io 2.3.3",
+ "core-foundation",
+ "fnv",
+ "futures",
+ "if-addrs",
+ "ipnet",
+ "log",
+ "rtnetlink",
+ "system-configuration",
+ "tokio",
+ "windows 0.51.1",
+]
+
+[[package]]
+name = "igd-next"
+version = "0.14.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "064d90fec10d541084e7b39ead8875a5a80d9114a2b18791565253bae25f49e4"
dependencies = [
"async-trait",
"attohttpc",
@@ -6902,7 +7424,7 @@ dependencies = [
"http 0.2.9",
"hyper 0.14.29",
"log",
- "rand",
+ "rand 0.8.5",
"tokio",
"url",
"xmltree",
@@ -6995,9 +7517,15 @@ dependencies = [
[[package]]
name = "indexmap"
+<<<<<<< HEAD
version = "2.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177"
+=======
+version = "2.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
dependencies = [
"equivalent",
"hashbrown 0.14.3",
@@ -7078,13 +7606,39 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f"
dependencies = [
- "socket2 0.5.7",
+ "socket2 0.5.8",
"widestring",
"windows-sys 0.48.0",
"winreg",
]
[[package]]
+<<<<<<< HEAD
+=======
+name = "ipfs-hasher"
+version = "0.21.3"
+source = "git+https://github.com/chevdor/subwasm?rev=v0.21.3#aa8acb6fdfb34144ac51ab95618a9b37fa251295"
+dependencies = [
+ "ipfs-unixfs",
+ "thiserror 1.0.65",
+]
+
+[[package]]
+name = "ipfs-unixfs"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67d1cf65363f3d01682283456651d1cea436019de5be7a974bb61716c940d44f"
+dependencies = [
+ "cid 0.5.1",
+ "either",
+ "filetime",
+ "multihash 0.11.4",
+ "quick-protobuf 0.7.0",
+ "sha2 0.9.9",
+]
+
+[[package]]
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
name = "ipnet"
version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -7171,7 +7725,7 @@ dependencies = [
"combine",
"jni-sys",
"log",
- "thiserror",
+ "thiserror 1.0.65",
"walkdir",
]
@@ -7206,6 +7760,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd"
[[package]]
+<<<<<<< HEAD
+=======
+name = "json-patch"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec9ad60d674508f3ca8f380a928cfe7b096bc729c4e2dbfe3852bc45da3ab30b"
+dependencies = [
+ "serde",
+ "serde_json",
+ "thiserror 1.0.65",
+]
+
+[[package]]
+name = "jsonpath-rust"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06cc127b7c3d270be504572364f9569761a180b981919dd0d87693a7f5fb7829"
+dependencies = [
+ "pest",
+ "pest_derive",
+ "regex",
+ "serde_json",
+ "thiserror 1.0.65",
+]
+
+[[package]]
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
name = "jsonpath_lib"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -7247,7 +7828,7 @@ dependencies = [
"rustls-pki-types",
"rustls-platform-verifier",
"soketto 0.8.0",
- "thiserror",
+ "thiserror 1.0.65",
"tokio",
"tokio-rustls 0.26.0",
"tokio-util",
@@ -7273,11 +7854,16 @@ dependencies = [
"jsonrpsee-types",
"parking_lot 0.12.3",
"pin-project",
+<<<<<<< HEAD
"rand",
"rustc-hash",
+=======
+ "rand 0.8.5",
+ "rustc-hash 2.0.0",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"serde",
"serde_json",
- "thiserror",
+ "thiserror 1.0.65",
"tokio",
"tokio-stream",
"tracing",
@@ -7301,7 +7887,7 @@ dependencies = [
"rustls-platform-verifier",
"serde",
"serde_json",
- "thiserror",
+ "thiserror 1.0.65",
"tokio",
"tower",
"tracing",
@@ -7341,7 +7927,7 @@ dependencies = [
"serde",
"serde_json",
"soketto 0.8.0",
- "thiserror",
+ "thiserror 1.0.65",
"tokio",
"tokio-stream",
"tokio-util",
@@ -7359,7 +7945,7 @@ dependencies = [
"http 1.1.0",
"serde",
"serde_json",
- "thiserror",
+ "thiserror 1.0.65",
]
[[package]]
@@ -7429,7 +8015,104 @@ dependencies = [
"scale-info",
"serde_json",
"static_assertions",
+<<<<<<< HEAD
"substrate-wasm-builder",
+=======
+ "substrate-wasm-builder 17.0.0",
+]
+
+[[package]]
+name = "kube"
+version = "0.87.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3499c8d60c763246c7a213f51caac1e9033f46026904cb89bc8951ae8601f26e"
+dependencies = [
+ "k8s-openapi",
+ "kube-client",
+ "kube-core",
+ "kube-runtime",
+]
+
+[[package]]
+name = "kube-client"
+version = "0.87.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "033450dfa0762130565890dadf2f8835faedf749376ca13345bcd8ecd6b5f29f"
+dependencies = [
+ "base64 0.21.7",
+ "bytes",
+ "chrono",
+ "either",
+ "futures",
+ "home",
+ "http 0.2.9",
+ "http-body 0.4.5",
+ "hyper 0.14.29",
+ "hyper-rustls 0.24.2",
+ "hyper-timeout",
+ "jsonpath-rust",
+ "k8s-openapi",
+ "kube-core",
+ "pem 3.0.4",
+ "pin-project",
+ "rand 0.8.5",
+ "rustls 0.21.7",
+ "rustls-pemfile 1.0.3",
+ "secrecy 0.8.0",
+ "serde",
+ "serde_json",
+ "serde_yaml",
+ "thiserror 1.0.65",
+ "tokio",
+ "tokio-tungstenite 0.20.1",
+ "tokio-util",
+ "tower",
+ "tower-http 0.4.4",
+ "tracing",
+]
+
+[[package]]
+name = "kube-core"
+version = "0.87.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5bba93d054786eba7994d03ce522f368ef7d48c88a1826faa28478d85fb63ae"
+dependencies = [
+ "chrono",
+ "form_urlencoded",
+ "http 0.2.9",
+ "json-patch",
+ "k8s-openapi",
+ "once_cell",
+ "serde",
+ "serde_json",
+ "thiserror 1.0.65",
+]
+
+[[package]]
+name = "kube-runtime"
+version = "0.87.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d8893eb18fbf6bb6c80ef6ee7dd11ec32b1dc3c034c988ac1b3a84d46a230ae"
+dependencies = [
+ "ahash 0.8.11",
+ "async-trait",
+ "backoff",
+ "derivative",
+ "futures",
+ "hashbrown 0.14.5",
+ "json-patch",
+ "k8s-openapi",
+ "kube-client",
+ "parking_lot 0.12.3",
+ "pin-project",
+ "serde",
+ "serde_json",
+ "smallvec",
+ "thiserror 1.0.65",
+ "tokio",
+ "tokio-util",
+ "tracing",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -7491,7 +8174,7 @@ checksum = "1530c5b973eeed4ac216af7e24baf5737645a6272e361f1fb95710678b67d9cc"
dependencies = [
"enumflags2",
"libc",
- "thiserror",
+ "thiserror 1.0.65",
]
[[package]]
@@ -7585,8 +8268,12 @@ dependencies = [
"either",
"futures",
"futures-timer",
+<<<<<<< HEAD
"getrandom",
"instant",
+=======
+ "getrandom 0.2.10",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"libp2p-allow-block-list",
"libp2p-connection-limits",
"libp2p-core",
@@ -7609,7 +8296,7 @@ dependencies = [
"multiaddr 0.18.1",
"pin-project",
"rw-stream-sink",
- "thiserror",
+ "thiserror 1.0.65",
]
[[package]]
@@ -7655,12 +8342,22 @@ dependencies = [
"once_cell",
"parking_lot 0.12.3",
"pin-project",
+<<<<<<< HEAD
"quick-protobuf",
"rand",
"rw-stream-sink",
"smallvec",
"thiserror",
"unsigned-varint 0.7.2",
+=======
+ "quick-protobuf 0.8.1",
+ "rand 0.8.5",
+ "rw-stream-sink",
+ "smallvec",
+ "thiserror 1.0.65",
+ "tracing",
+ "unsigned-varint 0.8.0",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"void",
]
@@ -7699,7 +8396,12 @@ dependencies = [
"quick-protobuf",
"quick-protobuf-codec",
"smallvec",
+<<<<<<< HEAD
"thiserror",
+=======
+ "thiserror 1.0.65",
+ "tracing",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"void",
]
@@ -7713,10 +8415,15 @@ dependencies = [
"ed25519-dalek",
"hkdf",
"multihash 0.19.1",
+<<<<<<< HEAD
"quick-protobuf",
"rand",
+=======
+ "quick-protobuf 0.8.1",
+ "rand 0.8.5",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"sha2 0.10.8",
- "thiserror",
+ "thiserror 1.0.65",
"tracing",
"zeroize",
]
@@ -7741,12 +8448,18 @@ dependencies = [
"log",
"quick-protobuf",
"quick-protobuf-codec",
- "rand",
+ "rand 0.8.5",
"sha2 0.10.8",
"smallvec",
+<<<<<<< HEAD
"thiserror",
"uint",
"unsigned-varint 0.7.2",
+=======
+ "thiserror 1.0.65",
+ "tracing",
+ "uint 0.9.5",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"void",
]
@@ -7762,10 +8475,14 @@ dependencies = [
"libp2p-core",
"libp2p-identity",
"libp2p-swarm",
+<<<<<<< HEAD
"log",
"rand",
+=======
+ "rand 0.8.5",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"smallvec",
- "socket2 0.5.7",
+ "socket2 0.5.8",
"tokio",
"trust-dns-proto 0.22.0",
"void",
@@ -7803,12 +8520,22 @@ dependencies = [
"multiaddr 0.18.1",
"multihash 0.19.1",
"once_cell",
+<<<<<<< HEAD
"quick-protobuf",
"rand",
"sha2 0.10.8",
"snow",
"static_assertions",
"thiserror",
+=======
+ "quick-protobuf 0.8.1",
+ "rand 0.8.5",
+ "sha2 0.10.8",
+ "snow",
+ "static_assertions",
+ "thiserror 1.0.65",
+ "tracing",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"x25519-dalek",
"zeroize",
]
@@ -7826,8 +8553,13 @@ dependencies = [
"libp2p-core",
"libp2p-identity",
"libp2p-swarm",
+<<<<<<< HEAD
"log",
"rand",
+=======
+ "rand 0.8.5",
+ "tracing",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"void",
]
@@ -7846,12 +8578,21 @@ dependencies = [
"libp2p-tls",
"log",
"parking_lot 0.12.3",
+<<<<<<< HEAD
"quinn 0.10.2",
"rand",
"ring 0.16.20",
"rustls 0.21.7",
"socket2 0.5.7",
"thiserror",
+=======
+ "quinn",
+ "rand 0.8.5",
+ "ring 0.17.8",
+ "rustls 0.23.18",
+ "socket2 0.5.8",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"tokio",
]
@@ -7867,8 +8608,12 @@ dependencies = [
"libp2p-core",
"libp2p-identity",
"libp2p-swarm",
+<<<<<<< HEAD
"log",
"rand",
+=======
+ "rand 0.8.5",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"smallvec",
"void",
]
@@ -7890,7 +8635,7 @@ dependencies = [
"log",
"multistream-select",
"once_cell",
- "rand",
+ "rand 0.8.5",
"smallvec",
"tokio",
"void",
@@ -7921,8 +8666,12 @@ dependencies = [
"libc",
"libp2p-core",
"libp2p-identity",
+<<<<<<< HEAD
"log",
"socket2 0.5.7",
+=======
+ "socket2 0.5.8",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"tokio",
]
@@ -7940,8 +8689,13 @@ dependencies = [
"ring 0.16.20",
"rustls 0.21.7",
"rustls-webpki 0.101.4",
+<<<<<<< HEAD
"thiserror",
"x509-parser 0.15.1",
+=======
+ "thiserror 1.0.65",
+ "x509-parser 0.16.0",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"yasna",
]
@@ -7991,7 +8745,12 @@ dependencies = [
"pin-project-lite",
"rw-stream-sink",
"soketto 0.8.0",
+<<<<<<< HEAD
"thiserror",
+=======
+ "thiserror 1.0.65",
+ "tracing",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"url",
"webpki-roots 0.25.2",
]
@@ -8004,9 +8763,16 @@ checksum = "8eedcb62824c4300efb9cfd4e2a6edaf3ca097b9e68b36dabe45a44469fd6a85"
dependencies = [
"futures",
"libp2p-core",
+<<<<<<< HEAD
"log",
"thiserror",
"yamux",
+=======
+ "thiserror 1.0.65",
+ "tracing",
+ "yamux 0.12.1",
+ "yamux 0.13.4",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -8037,7 +8803,7 @@ dependencies = [
"libsecp256k1-core",
"libsecp256k1-gen-ecmult",
"libsecp256k1-gen-genmult",
- "rand",
+ "rand 0.8.5",
"serde",
"sha2 0.9.9",
"typenum",
@@ -8166,10 +8932,23 @@ dependencies = [
]
[[package]]
+<<<<<<< HEAD
name = "litep2p"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f46c51c205264b834ceed95c8b195026e700494bc3991aaba3b4ea9e20626d9"
+=======
+name = "litemap"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
+
+[[package]]
+name = "litep2p"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e5a3d13ee6af6f01bb2093aa6d5f29b79ede7de6277e5d0394e8f5d8eaa5a86"
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
dependencies = [
"async-trait",
"bs58 0.4.0",
@@ -8179,20 +8958,32 @@ dependencies = [
"futures",
"futures-timer",
"hex-literal",
+<<<<<<< HEAD
"indexmap 2.2.3",
"libc",
"mockall 0.12.1",
+=======
+ "hickory-resolver",
+ "indexmap 2.7.1",
+ "libc",
+ "mockall 0.13.1",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"multiaddr 0.17.1",
"multihash 0.17.0",
"network-interface",
- "nohash-hasher",
"parking_lot 0.12.3",
"pin-project",
"prost 0.12.6",
+<<<<<<< HEAD
"prost-build 0.11.9",
"quinn 0.9.4",
"rand",
"rcgen",
+=======
+ "prost-build",
+ "rand 0.8.5",
+ "rcgen 0.10.0",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"ring 0.16.20",
"rustls 0.20.9",
"serde",
@@ -8200,22 +8991,36 @@ dependencies = [
"simple-dns",
"smallvec",
"snow",
+<<<<<<< HEAD
"socket2 0.5.7",
"static_assertions",
"str0m",
"thiserror",
+=======
+ "socket2 0.5.8",
+ "thiserror 2.0.11",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"tokio",
"tokio-stream",
- "tokio-tungstenite",
+ "tokio-tungstenite 0.26.2",
"tokio-util",
"tracing",
+<<<<<<< HEAD
"trust-dns-resolver",
"uint",
+=======
+ "uint 0.10.0",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"unsigned-varint 0.8.0",
"url",
"webpki",
"x25519-dalek",
+<<<<<<< HEAD
"x509-parser 0.16.0",
+=======
+ "x509-parser 0.17.0",
+ "yamux 0.13.4",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"yasna",
"zeroize",
]
@@ -8605,8 +9410,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
dependencies = [
"libc",
+<<<<<<< HEAD
"wasi",
"windows-sys 0.48.0",
+=======
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "windows-sys 0.52.0",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -8626,11 +9436,11 @@ dependencies = [
"lioness",
"log",
"parking_lot 0.12.3",
- "rand",
- "rand_chacha",
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
"rand_distr",
"subtle 2.5.0",
- "thiserror",
+ "thiserror 1.0.65",
"zeroize",
]
@@ -8689,15 +9499,25 @@ dependencies = [
[[package]]
name = "mockall"
+<<<<<<< HEAD
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43766c2b5203b10de348ffe19f7e54564b64f3d6018ff7648d1e2d6d3a0f0a48"
+=======
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39a6bfcc6c8c7eed5ee98b9c3e33adc726054389233e201c95dab2d41a3839d2"
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
dependencies = [
"cfg-if",
"downcast",
"fragile",
+<<<<<<< HEAD
"lazy_static",
"mockall_derive 0.12.1",
+=======
+ "mockall_derive 0.13.1",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"predicates 3.0.3",
"predicates-tree",
]
@@ -8716,9 +9536,15 @@ dependencies = [
[[package]]
name = "mockall_derive"
+<<<<<<< HEAD
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af7cbce79ec385a1d4f54baa90a76401eb15d9cab93685f62e7e9f942aa00ae2"
+=======
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25ca3004c2efe9011bd4e461bd8256445052b9615405b4f7ea43fc8ca5c20898"
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
dependencies = [
"cfg-if",
"proc-macro2 1.0.82",
@@ -8893,7 +9719,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7bddcd3bf5144b6392de80e04c347cd7fab2508f6df16a85fc496ecd5cec39bc"
dependencies = [
"clap 3.2.25",
- "rand",
+ "rand 0.8.5",
]
[[package]]
@@ -8937,7 +9763,7 @@ dependencies = [
"anyhow",
"byteorder",
"paste",
- "thiserror",
+ "thiserror 1.0.65",
]
[[package]]
@@ -8951,7 +9777,7 @@ dependencies = [
"log",
"netlink-packet-core",
"netlink-sys",
- "thiserror",
+ "thiserror 1.0.65",
"tokio",
]
@@ -8976,7 +9802,7 @@ checksum = "ae72fd9dbd7f55dda80c00d66acc3b2130436fcba9ea89118fc508eaae48dfb0"
dependencies = [
"cc",
"libc",
- "thiserror",
+ "thiserror 1.0.65",
"winapi",
]
@@ -9045,7 +9871,7 @@ dependencies = [
"node-primitives",
"node-testing",
"parity-db",
- "rand",
+ "rand 0.8.5",
"sc-basic-authorship",
"sc-client-api",
"sc-transaction-pool",
@@ -9254,6 +10080,26 @@ dependencies = [
]
[[package]]
+<<<<<<< HEAD
+=======
+name = "num-bigint-dig"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151"
+dependencies = [
+ "byteorder",
+ "lazy_static",
+ "libm",
+ "num-integer",
+ "num-iter",
+ "num-traits",
+ "rand 0.8.5",
+ "smallvec",
+ "zeroize",
+]
+
+[[package]]
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
name = "num-complex"
version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -9394,6 +10240,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1c958dd45046245b9c3c2547369bb634eb461670b2e7e0de552905801a648d1d"
dependencies = [
"asn1-rs 0.6.1",
+<<<<<<< HEAD
+=======
+]
+
+[[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.0",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -9493,7 +10351,7 @@ dependencies = [
"orchestra-proc-macro",
"pin-project",
"prioritized-metered-channel",
- "thiserror",
+ "thiserror 1.0.65",
"tracing",
]
@@ -9504,7 +10362,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7b1d40dd8f367db3c65bec8d3dd47d4a604ee8874480738f93191bddab4e0e0"
dependencies = [
"expander",
+<<<<<<< HEAD
"indexmap 2.2.3",
+=======
+ "indexmap 2.7.1",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"itertools 0.11.0",
"petgraph",
"proc-macro-crate 3.1.0",
@@ -9803,8 +10665,13 @@ version = "4.0.0"
dependencies = [
"frame-election-provider-support",
"honggfuzz",
+<<<<<<< HEAD
"pallet-bags-list",
"rand",
+=======
+ "pallet-bags-list 27.0.0",
+ "rand 0.8.5",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -9925,7 +10792,7 @@ dependencies = [
"pallet-beefy-mmr",
"pallet-mmr",
"parity-scale-codec",
- "rand",
+ "rand 0.8.5",
"scale-info",
"serde",
"sp-consensus-beefy",
@@ -10087,9 +10954,95 @@ dependencies = [
name = "pallet-collective"
version = "37.0.0"
dependencies = [
+<<<<<<< HEAD
"frame-benchmarking",
"frame-support",
"frame-system",
+=======
+ "frame-benchmarking 38.0.0",
+ "frame-support 38.0.0",
+ "frame-system 38.0.0",
+ "log",
+ "pallet-bounties 37.0.0",
+ "pallet-treasury 37.0.0",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-core 34.0.0",
+ "sp-io 38.0.0",
+ "sp-runtime 39.0.2",
+]
+
+[[package]]
+name = "pallet-collator-selection"
+version = "9.0.0"
+dependencies = [
+ "frame-benchmarking 28.0.0",
+ "frame-support 28.0.0",
+ "frame-system 28.0.0",
+ "log",
+ "pallet-aura 27.0.0",
+ "pallet-authorship 28.0.0",
+ "pallet-balances 28.0.0",
+ "pallet-session 28.0.0",
+ "pallet-timestamp 27.0.0",
+ "parity-scale-codec",
+ "rand 0.8.5",
+ "scale-info",
+ "sp-consensus-aura 0.32.0",
+ "sp-core 28.0.0",
+ "sp-io 30.0.0",
+ "sp-runtime 31.0.1",
+ "sp-staking 26.0.0",
+ "sp-tracing 16.0.0",
+]
+
+[[package]]
+name = "pallet-collator-selection"
+version = "19.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "658798d70c9054165169f6a6a96cfa9d6a5e7d24a524bc19825bf17fcbc5cc5a"
+dependencies = [
+ "frame-benchmarking 38.0.0",
+ "frame-support 38.0.0",
+ "frame-system 38.0.0",
+ "log",
+ "pallet-authorship 38.0.0",
+ "pallet-balances 39.0.0",
+ "pallet-session 38.0.0",
+ "parity-scale-codec",
+ "rand 0.8.5",
+ "scale-info",
+ "sp-runtime 39.0.2",
+ "sp-staking 36.0.0",
+]
+
+[[package]]
+name = "pallet-collective"
+version = "28.0.0"
+dependencies = [
+ "docify",
+ "frame-benchmarking 28.0.0",
+ "frame-support 28.0.0",
+ "frame-system 28.0.0",
+ "log",
+ "pallet-balances 28.0.0",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-core 28.0.0",
+ "sp-io 30.0.0",
+ "sp-runtime 31.0.1",
+]
+
+[[package]]
+name = "pallet-collective"
+version = "38.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e149f1aefd444c9a1da6ec5a94bc8a7671d7a33078f85dd19ae5b06e3438e60"
+dependencies = [
+ "frame-benchmarking 38.0.0",
+ "frame-support 38.0.0",
+ "frame-system 38.0.0",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"log",
"parity-scale-codec",
"scale-info",
@@ -10139,7 +11092,7 @@ dependencies = [
"parity-scale-codec",
"paste",
"pretty_assertions",
- "rand",
+ "rand 0.8.5",
"rand_pcg",
"scale-info",
"serde",
@@ -10159,6 +11112,42 @@ dependencies = [
]
[[package]]
+<<<<<<< HEAD
+=======
+name = "pallet-contracts"
+version = "38.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5df77077745d891c822b4275f273f336077a97e69e62a30134776aa721c96fee"
+dependencies = [
+ "bitflags 1.3.2",
+ "environmental",
+ "frame-benchmarking 38.0.0",
+ "frame-support 38.0.0",
+ "frame-system 38.0.0",
+ "impl-trait-for-tuples",
+ "log",
+ "pallet-balances 39.0.0",
+ "pallet-contracts-proc-macro 23.0.1",
+ "pallet-contracts-uapi 12.0.0",
+ "parity-scale-codec",
+ "paste",
+ "rand 0.8.5",
+ "scale-info",
+ "serde",
+ "smallvec",
+ "sp-api 34.0.0",
+ "sp-core 34.0.0",
+ "sp-io 38.0.0",
+ "sp-runtime 39.0.2",
+ "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "staging-xcm 14.2.0",
+ "staging-xcm-builder 17.0.1",
+ "wasm-instrument",
+ "wasmi 0.32.3",
+]
+
+[[package]]
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
name = "pallet-contracts-fixtures"
version = "1.0.0"
dependencies = [
@@ -10351,6 +11340,7 @@ dependencies = [
"parity-scale-codec",
"parking_lot 0.12.3",
"scale-info",
+<<<<<<< HEAD
"sp-core",
"sp-io",
"sp-npos-elections",
@@ -10358,6 +11348,37 @@ dependencies = [
"sp-staking",
"sp-std",
"sp-tracing",
+=======
+ "sp-core 28.0.0",
+ "sp-io 30.0.0",
+ "sp-npos-elections 26.0.0",
+ "sp-runtime 31.0.1",
+ "sp-staking 26.0.0",
+ "sp-tracing 16.0.0",
+]
+
+[[package]]
+name = "pallet-election-provider-multi-block"
+version = "0.9.0"
+dependencies = [
+ "frame-benchmarking 28.0.0",
+ "frame-election-provider-support 28.0.0",
+ "frame-support 28.0.0",
+ "frame-system 28.0.0",
+ "log",
+ "pallet-balances 28.0.0",
+ "parity-scale-codec",
+ "parking_lot 0.12.3",
+ "rand 0.8.5",
+ "scale-info",
+ "sp-arithmetic 23.0.0",
+ "sp-core 28.0.0",
+ "sp-io 30.0.0",
+ "sp-npos-elections 26.0.0",
+ "sp-runtime 31.0.1",
+ "sp-std 14.0.0",
+ "sp-tracing 16.0.0",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -10373,8 +11394,9 @@ dependencies = [
"pallet-election-provider-support-benchmarking",
"parity-scale-codec",
"parking_lot 0.12.3",
- "rand",
+ "rand 0.8.5",
"scale-info",
+<<<<<<< HEAD
"sp-arithmetic",
"sp-core",
"sp-io",
@@ -10382,6 +11404,38 @@ dependencies = [
"sp-runtime",
"sp-tracing",
"strum 0.26.2",
+=======
+ "sp-arithmetic 23.0.0",
+ "sp-core 28.0.0",
+ "sp-io 30.0.0",
+ "sp-npos-elections 26.0.0",
+ "sp-runtime 31.0.1",
+ "sp-tracing 16.0.0",
+ "strum 0.26.3",
+]
+
+[[package]]
+name = "pallet-election-provider-multi-phase"
+version = "37.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62f9ad5ae0c13ba3727183dadf1825b6b7b0b0598ed5c366f8697e13fd540f7d"
+dependencies = [
+ "frame-benchmarking 38.0.0",
+ "frame-election-provider-support 38.0.0",
+ "frame-support 38.0.0",
+ "frame-system 38.0.0",
+ "log",
+ "pallet-election-provider-support-benchmarking 37.0.0",
+ "parity-scale-codec",
+ "rand 0.8.5",
+ "scale-info",
+ "sp-arithmetic 26.0.0",
+ "sp-core 34.0.0",
+ "sp-io 38.0.0",
+ "sp-npos-elections 34.0.0",
+ "sp-runtime 39.0.2",
+ "strum 0.26.3",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -10729,7 +11783,7 @@ dependencies = [
"frame-system",
"log",
"parity-scale-codec",
- "rand",
+ "rand 0.8.5",
"rand_distr",
"scale-info",
"serde",
@@ -10951,11 +12005,19 @@ dependencies = [
"frame-system",
"honggfuzz",
"log",
+<<<<<<< HEAD
"pallet-nomination-pools",
"rand",
"sp-io",
"sp-runtime",
"sp-tracing",
+=======
+ "pallet-nomination-pools 25.0.0",
+ "rand 0.8.5",
+ "sp-io 30.0.0",
+ "sp-runtime 31.0.1",
+ "sp-tracing 16.0.0",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -11214,9 +12276,288 @@ dependencies = [
"parity-scale-codec",
"scale-info",
"serde",
+<<<<<<< HEAD
"sp-core",
"sp-io",
"sp-runtime",
+=======
+ "sp-core 28.0.0",
+ "sp-io 30.0.0",
+ "sp-runtime 31.0.1",
+]
+
+[[package]]
+name = "pallet-remark"
+version = "38.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3e8cae0e20888065ec73dda417325c6ecabf797f4002329484b59c25ecc34d4"
+dependencies = [
+ "frame-benchmarking 38.0.0",
+ "frame-support 38.0.0",
+ "frame-system 38.0.0",
+ "parity-scale-codec",
+ "scale-info",
+ "serde",
+ "sp-core 34.0.0",
+ "sp-io 38.0.0",
+ "sp-runtime 39.0.2",
+]
+
+[[package]]
+name = "pallet-revive"
+version = "0.1.0"
+dependencies = [
+ "alloy-core",
+ "array-bytes",
+ "assert_matches",
+ "derive_more 0.99.17",
+ "environmental",
+ "ethabi-decode 2.0.0",
+ "ethereum-types 0.15.1",
+ "frame-benchmarking 28.0.0",
+ "frame-support 28.0.0",
+ "frame-system 28.0.0",
+ "hex",
+ "hex-literal",
+ "impl-trait-for-tuples",
+ "log",
+ "pallet-balances 28.0.0",
+ "pallet-proxy 28.0.0",
+ "pallet-revive-fixtures 0.1.0",
+ "pallet-revive-proc-macro 0.1.0",
+ "pallet-revive-uapi 0.1.0",
+ "pallet-timestamp 27.0.0",
+ "pallet-transaction-payment 28.0.0",
+ "pallet-utility 28.0.0",
+ "parity-scale-codec",
+ "paste",
+ "polkavm 0.21.0",
+ "polkavm-common 0.21.0",
+ "pretty_assertions",
+ "rlp 0.6.1",
+ "scale-info",
+ "secp256k1 0.28.2",
+ "serde",
+ "serde_json",
+ "sp-api 26.0.0",
+ "sp-arithmetic 23.0.0",
+ "sp-consensus-aura 0.32.0",
+ "sp-consensus-babe 0.32.0",
+ "sp-consensus-slots 0.32.0",
+ "sp-core 28.0.0",
+ "sp-io 30.0.0",
+ "sp-keystore 0.34.0",
+ "sp-runtime 31.0.1",
+ "sp-tracing 16.0.0",
+ "staging-xcm 7.0.0",
+ "staging-xcm-builder 7.0.0",
+ "subxt-signer",
+]
+
+[[package]]
+name = "pallet-revive"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be02c94dcbadd206a910a244ec19b493aac793eed95e23d37d6699547234569f"
+dependencies = [
+ "bitflags 1.3.2",
+ "environmental",
+ "frame-benchmarking 38.0.0",
+ "frame-support 38.0.0",
+ "frame-system 38.0.0",
+ "impl-trait-for-tuples",
+ "log",
+ "pallet-balances 39.0.0",
+ "pallet-revive-fixtures 0.2.0",
+ "pallet-revive-proc-macro 0.1.1",
+ "pallet-revive-uapi 0.1.1",
+ "parity-scale-codec",
+ "paste",
+ "polkavm 0.10.0",
+ "scale-info",
+ "serde",
+ "sp-api 34.0.0",
+ "sp-core 34.0.0",
+ "sp-io 38.0.0",
+ "sp-runtime 39.0.2",
+ "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "staging-xcm 14.2.0",
+ "staging-xcm-builder 17.0.1",
+]
+
+[[package]]
+name = "pallet-revive-eth-rpc"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "clap 4.5.13",
+ "env_logger 0.11.3",
+ "ethabi",
+ "futures",
+ "git2",
+ "hex",
+ "jsonrpsee",
+ "log",
+ "pallet-revive 0.1.0",
+ "pallet-revive-fixtures 0.1.0",
+ "parity-scale-codec",
+ "pretty_assertions",
+ "rlp 0.6.1",
+ "sc-cli",
+ "sc-rpc",
+ "sc-rpc-api",
+ "sc-service",
+ "sp-arithmetic 23.0.0",
+ "sp-core 28.0.0",
+ "sp-crypto-hashing 0.1.0",
+ "sp-runtime 31.0.1",
+ "sp-weights 27.0.0",
+ "sqlx",
+ "static_init",
+ "substrate-cli-test-utils",
+ "substrate-prometheus-endpoint",
+ "subxt",
+ "subxt-signer",
+ "thiserror 1.0.65",
+ "tokio",
+]
+
+[[package]]
+name = "pallet-revive-fixtures"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "polkavm-linker 0.21.0",
+ "sp-core 28.0.0",
+ "sp-io 30.0.0",
+ "toml 0.8.19",
+]
+
+[[package]]
+name = "pallet-revive-fixtures"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a38c27f1531f36e5327f3084eb24cf1c9dd46b372e030c0169e843ce363105e"
+dependencies = [
+ "anyhow",
+ "frame-system 38.0.0",
+ "parity-wasm",
+ "polkavm-linker 0.10.0",
+ "sp-runtime 39.0.2",
+ "tempfile",
+ "toml 0.8.19",
+]
+
+[[package]]
+name = "pallet-revive-mock-network"
+version = "0.1.0"
+dependencies = [
+ "assert_matches",
+ "frame-support 28.0.0",
+ "frame-system 28.0.0",
+ "pallet-assets 29.1.0",
+ "pallet-balances 28.0.0",
+ "pallet-message-queue 31.0.0",
+ "pallet-revive 0.1.0",
+ "pallet-revive-fixtures 0.1.0",
+ "pallet-revive-uapi 0.1.0",
+ "pallet-timestamp 27.0.0",
+ "pallet-xcm 7.0.0",
+ "parity-scale-codec",
+ "polkadot-parachain-primitives 6.0.0",
+ "polkadot-primitives 7.0.0",
+ "polkadot-runtime-parachains 7.0.0",
+ "pretty_assertions",
+ "scale-info",
+ "sp-core 28.0.0",
+ "sp-io 30.0.0",
+ "sp-runtime 31.0.1",
+ "sp-tracing 16.0.0",
+ "staging-xcm 7.0.0",
+ "staging-xcm-builder 7.0.0",
+ "staging-xcm-executor 7.0.0",
+ "xcm-simulator 7.0.0",
+]
+
+[[package]]
+name = "pallet-revive-mock-network"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60e74591d44dbd78db02c8593f5caa75bd61bcc4d63999302150223fb969ae37"
+dependencies = [
+ "frame-support 38.0.0",
+ "frame-system 38.0.0",
+ "pallet-assets 40.0.0",
+ "pallet-balances 39.0.0",
+ "pallet-message-queue 41.0.1",
+ "pallet-proxy 38.0.0",
+ "pallet-revive 0.2.0",
+ "pallet-revive-proc-macro 0.1.1",
+ "pallet-revive-uapi 0.1.1",
+ "pallet-timestamp 37.0.0",
+ "pallet-utility 38.0.0",
+ "pallet-xcm 17.0.0",
+ "parity-scale-codec",
+ "polkadot-parachain-primitives 14.0.0",
+ "polkadot-primitives 16.0.0",
+ "polkadot-runtime-parachains 17.0.1",
+ "scale-info",
+ "sp-api 34.0.0",
+ "sp-core 34.0.0",
+ "sp-io 38.0.0",
+ "sp-keystore 0.40.0",
+ "sp-runtime 39.0.2",
+ "sp-tracing 17.0.1",
+ "staging-xcm 14.2.0",
+ "staging-xcm-builder 17.0.1",
+ "staging-xcm-executor 17.0.0",
+ "xcm-simulator 17.0.0",
+]
+
+[[package]]
+name = "pallet-revive-proc-macro"
+version = "0.1.0"
+dependencies = [
+ "proc-macro2 1.0.93",
+ "quote 1.0.38",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "pallet-revive-proc-macro"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cc16d1f7cee6a1ee6e8cd710e16230d59fb4935316c1704cf770e4d2335f8d4"
+dependencies = [
+ "proc-macro2 1.0.93",
+ "quote 1.0.38",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "pallet-revive-uapi"
+version = "0.1.0"
+dependencies = [
+ "bitflags 1.3.2",
+ "pallet-revive-proc-macro 0.1.0",
+ "parity-scale-codec",
+ "paste",
+ "polkavm-derive 0.21.0",
+ "scale-info",
+]
+
+[[package]]
+name = "pallet-revive-uapi"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecb4686c8415619cc13e43fadef146ffff46424d9b4d037fe4c069de52708aac"
+dependencies = [
+ "bitflags 1.3.2",
+ "parity-scale-codec",
+ "paste",
+ "polkavm-derive 0.10.0",
+ "scale-info",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -11356,12 +12697,36 @@ dependencies = [
"pallet-staking-reward-curve",
"pallet-timestamp",
"parity-scale-codec",
- "rand",
+ "rand 0.8.5",
"scale-info",
+<<<<<<< HEAD
"sp-core",
"sp-io",
"sp-runtime",
"sp-session",
+=======
+ "sp-core 28.0.0",
+ "sp-io 30.0.0",
+ "sp-runtime 31.0.1",
+ "sp-session 27.0.0",
+]
+
+[[package]]
+name = "pallet-session-benchmarking"
+version = "38.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8aadce7df0fee981721983795919642648b846dab5ab9096f82c2cea781007d0"
+dependencies = [
+ "frame-benchmarking 38.0.0",
+ "frame-support 38.0.0",
+ "frame-system 38.0.0",
+ "pallet-session 38.0.0",
+ "pallet-staking 38.0.0",
+ "parity-scale-codec",
+ "rand 0.8.5",
+ "sp-runtime 39.0.2",
+ "sp-session 36.0.0",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -11386,13 +12751,39 @@ dependencies = [
"log",
"pallet-balances",
"parity-scale-codec",
- "rand_chacha",
+ "rand_chacha 0.3.1",
"scale-info",
+<<<<<<< HEAD
"sp-arithmetic",
"sp-core",
"sp-crypto-hashing",
"sp-io",
"sp-runtime",
+=======
+ "sp-arithmetic 23.0.0",
+ "sp-core 28.0.0",
+ "sp-crypto-hashing 0.1.0",
+ "sp-io 30.0.0",
+ "sp-runtime 31.0.1",
+]
+
+[[package]]
+name = "pallet-society"
+version = "38.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1dc69fea8a8de343e71691f009d5fece6ae302ed82b7bb357882b2ea6454143"
+dependencies = [
+ "frame-benchmarking 38.0.0",
+ "frame-support 38.0.0",
+ "frame-system 38.0.0",
+ "log",
+ "parity-scale-codec",
+ "rand_chacha 0.3.1",
+ "scale-info",
+ "sp-arithmetic 26.0.0",
+ "sp-io 38.0.0",
+ "sp-runtime 39.0.2",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -11411,7 +12802,12 @@ dependencies = [
"pallet-staking-reward-curve",
"pallet-timestamp",
"parity-scale-codec",
+<<<<<<< HEAD
"rand_chacha",
+=======
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"scale-info",
"serde",
"sp-application-crypto",
@@ -12022,8 +13418,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4e69bf016dc406eff7d53a7d3f7cf1c2e72c82b9088aac1118591e36dd2cd3e9"
dependencies = [
"bitcoin_hashes 0.13.0",
+<<<<<<< HEAD
"rand",
"rand_core",
+=======
+ "rand 0.8.5",
+ "rand_core 0.6.4",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"serde",
"unicode-normalization",
]
@@ -12049,8 +13450,13 @@ dependencies = [
"lz4",
"memmap2 0.5.10",
"parking_lot 0.12.3",
+<<<<<<< HEAD
"rand",
"siphasher",
+=======
+ "rand 0.8.5",
+ "siphasher 0.3.11",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"snap",
]
@@ -12502,7 +13908,7 @@ version = "2.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1acb4a4365a13f749a93f1a094a7805e5cfa0955373a9de860d962eaa3a5fe5a"
dependencies = [
- "thiserror",
+ "thiserror 1.0.65",
"ucd-trie",
]
@@ -12547,7 +13953,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
dependencies = [
"fixedbitset",
+<<<<<<< HEAD
"indexmap 2.2.3",
+=======
+ "indexmap 2.7.1",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -12673,9 +14083,16 @@ dependencies = [
"polkadot-node-subsystem-util",
"polkadot-primitives",
"polkadot-primitives-test-helpers",
+<<<<<<< HEAD
"rand",
"rand_chacha",
"rand_core",
+=======
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
+ "sc-keystore",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"schnorrkel 0.11.4",
"sp-authority-discovery",
"sp-core",
@@ -12698,6 +14115,7 @@ dependencies = [
"polkadot-node-subsystem",
"polkadot-node-subsystem-test-helpers",
"polkadot-node-subsystem-util",
+<<<<<<< HEAD
"polkadot-primitives",
"rand",
"rand_chacha",
@@ -12706,6 +14124,17 @@ dependencies = [
"sp-core",
"sp-keyring",
"sp-keystore",
+=======
+ "polkadot-primitives 7.0.0",
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
+ "sp-application-crypto 30.0.0",
+ "sp-authority-discovery 26.0.0",
+ "sp-core 28.0.0",
+ "sp-keyring 31.0.0",
+ "sp-keystore 0.34.0",
+ "sp-tracing 16.0.0",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"tracing-gum",
]
@@ -12728,15 +14157,23 @@ dependencies = [
"polkadot-primitives",
"polkadot-primitives-test-helpers",
"polkadot-subsystem-bench",
- "rand",
+ "rand 0.8.5",
"rstest",
"sc-network",
"schnellru",
+<<<<<<< HEAD
"sp-core",
"sp-keyring",
"sp-keystore",
"sp-tracing",
"thiserror",
+=======
+ "sp-core 28.0.0",
+ "sp-keyring 31.0.0",
+ "sp-keystore 0.34.0",
+ "sp-tracing 16.0.0",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"tracing-gum",
]
@@ -12760,15 +14197,23 @@ dependencies = [
"polkadot-primitives",
"polkadot-primitives-test-helpers",
"polkadot-subsystem-bench",
- "rand",
+ "rand 0.8.5",
"rstest",
"sc-network",
"schnellru",
+<<<<<<< HEAD
"sp-application-crypto",
"sp-core",
"sp-keyring",
"sp-tracing",
"thiserror",
+=======
+ "sp-application-crypto 30.0.0",
+ "sp-core 28.0.0",
+ "sp-keyring 31.0.0",
+ "sp-tracing 16.0.0",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"tokio",
"tracing-gum",
]
@@ -12809,7 +14254,7 @@ dependencies = [
"sp-maybe-compressed-blob",
"sp-runtime",
"substrate-build-script-utils",
- "thiserror",
+ "thiserror 1.0.65",
]
[[package]]
@@ -12834,11 +14279,21 @@ dependencies = [
"rstest",
"sc-keystore",
"sc-network",
+<<<<<<< HEAD
"sp-core",
"sp-keyring",
"sp-keystore",
"sp-runtime",
"thiserror",
+=======
+ "schnellru",
+ "sp-core 28.0.0",
+ "sp-keyring 31.0.0",
+ "sp-keystore 0.34.0",
+ "sp-runtime 31.0.1",
+ "sp-tracing 16.0.0",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"tokio-util",
"tracing-gum",
]
@@ -12864,8 +14319,12 @@ dependencies = [
"fatality",
"futures",
"futures-timer",
+<<<<<<< HEAD
"indexmap 2.2.3",
"lazy_static",
+=======
+ "indexmap 2.7.1",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"parity-scale-codec",
"polkadot-erasure-coding",
"polkadot-node-network-protocol",
@@ -12878,11 +14337,19 @@ dependencies = [
"sc-keystore",
"sc-network",
"schnellru",
+<<<<<<< HEAD
"sp-application-crypto",
"sp-keyring",
"sp-keystore",
"sp-tracing",
"thiserror",
+=======
+ "sp-application-crypto 30.0.0",
+ "sp-keyring 31.0.0",
+ "sp-keystore 0.34.0",
+ "sp-tracing 16.0.0",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"tracing-gum",
]
@@ -12896,9 +14363,15 @@ dependencies = [
"polkadot-primitives",
"quickcheck",
"reed-solomon-novelpoly",
+<<<<<<< HEAD
"sp-core",
"sp-trie",
"thiserror",
+=======
+ "sp-core 28.0.0",
+ "sp-trie 29.0.0",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -12917,8 +14390,8 @@ dependencies = [
"polkadot-node-subsystem-util",
"polkadot-primitives",
"quickcheck",
- "rand",
- "rand_chacha",
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
"sc-network",
"sc-network-common",
"sp-application-crypto",
@@ -12955,9 +14428,15 @@ dependencies = [
"polkadot-primitives-test-helpers",
"sc-network",
"sp-consensus",
+<<<<<<< HEAD
"sp-core",
"sp-keyring",
"thiserror",
+=======
+ "sp-core 28.0.0",
+ "sp-keyring 31.0.0",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"tracing-gum",
]
@@ -12976,10 +14455,18 @@ dependencies = [
"polkadot-primitives",
"polkadot-primitives-test-helpers",
"rstest",
+<<<<<<< HEAD
"sp-core",
"sp-keyring",
"sp-maybe-compressed-blob",
"thiserror",
+=======
+ "schnellru",
+ "sp-core 28.0.0",
+ "sp-keyring 31.0.0",
+ "sp-maybe-compressed-blob 11.0.0",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"tracing-gum",
]
@@ -13010,14 +14497,21 @@ dependencies = [
"polkadot-primitives",
"polkadot-primitives-test-helpers",
"polkadot-subsystem-bench",
+<<<<<<< HEAD
"rand",
"rand_chacha",
"rand_core",
+=======
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"sc-keystore",
"schnellru",
"schnorrkel 0.11.4",
"sp-application-crypto",
"sp-consensus",
+<<<<<<< HEAD
"sp-consensus-babe",
"sp-consensus-slots",
"sp-core",
@@ -13025,6 +14519,58 @@ dependencies = [
"sp-keystore",
"sp-runtime",
"thiserror",
+=======
+ "sp-consensus-babe 0.32.0",
+ "sp-consensus-slots 0.32.0",
+ "sp-core 28.0.0",
+ "sp-keyring 31.0.0",
+ "sp-keystore 0.34.0",
+ "sp-runtime 31.0.1",
+ "sp-tracing 16.0.0",
+ "thiserror 1.0.65",
+ "tracing-gum",
+]
+
+[[package]]
+name = "polkadot-node-core-approval-voting-parallel"
+version = "7.0.0"
+dependencies = [
+ "assert_matches",
+ "async-trait",
+ "futures",
+ "futures-timer",
+ "itertools 0.11.0",
+ "kvdb-memorydb",
+ "log",
+ "parking_lot 0.12.3",
+ "polkadot-approval-distribution",
+ "polkadot-node-core-approval-voting",
+ "polkadot-node-metrics",
+ "polkadot-node-network-protocol",
+ "polkadot-node-primitives",
+ "polkadot-node-subsystem",
+ "polkadot-node-subsystem-test-helpers",
+ "polkadot-node-subsystem-util",
+ "polkadot-overseer",
+ "polkadot-primitives 7.0.0",
+ "polkadot-primitives-test-helpers",
+ "polkadot-subsystem-bench",
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
+ "sc-keystore",
+ "schnorrkel 0.11.4",
+ "sp-application-crypto 30.0.0",
+ "sp-consensus",
+ "sp-consensus-babe 0.32.0",
+ "sp-consensus-slots 0.32.0",
+ "sp-core 28.0.0",
+ "sp-keyring 31.0.0",
+ "sp-keystore 0.34.0",
+ "sp-runtime 31.0.1",
+ "sp-tracing 16.0.0",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"tracing-gum",
]
@@ -13052,9 +14598,16 @@ dependencies = [
"polkadot-primitives",
"polkadot-primitives-test-helpers",
"sp-consensus",
+<<<<<<< HEAD
"sp-core",
"sp-keyring",
"thiserror",
+=======
+ "sp-core 28.0.0",
+ "sp-keyring 31.0.0",
+ "sp-tracing 16.0.0",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"tracing-gum",
]
@@ -13077,12 +14630,21 @@ dependencies = [
"rstest",
"sc-keystore",
"schnellru",
+<<<<<<< HEAD
"sp-application-crypto",
"sp-core",
"sp-keyring",
"sp-keystore",
"sp-tracing",
"thiserror",
+=======
+ "sp-application-crypto 30.0.0",
+ "sp-core 28.0.0",
+ "sp-keyring 31.0.0",
+ "sp-keystore 0.34.0",
+ "sp-tracing 16.0.0",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"tracing-gum",
]
@@ -13096,8 +14658,13 @@ dependencies = [
"polkadot-node-subsystem-util",
"polkadot-primitives",
"polkadot-primitives-test-helpers",
+<<<<<<< HEAD
"sp-keystore",
"thiserror",
+=======
+ "sp-keystore 0.34.0",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"tracing-gum",
"wasm-timer",
]
@@ -13164,9 +14731,15 @@ dependencies = [
"polkadot-node-subsystem",
"polkadot-node-subsystem-test-helpers",
"polkadot-node-subsystem-util",
+<<<<<<< HEAD
"polkadot-primitives",
"sp-core",
"thiserror",
+=======
+ "polkadot-primitives 7.0.0",
+ "sp-core 28.0.0",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"tracing-gum",
]
@@ -13189,12 +14762,21 @@ dependencies = [
"polkadot-primitives-test-helpers",
"sc-keystore",
"schnellru",
+<<<<<<< HEAD
"sp-application-crypto",
"sp-core",
"sp-keyring",
"sp-keystore",
"sp-tracing",
"thiserror",
+=======
+ "sp-application-crypto 30.0.0",
+ "sp-core 28.0.0",
+ "sp-keyring 31.0.0",
+ "sp-keystore 0.34.0",
+ "sp-tracing 16.0.0",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"tracing-gum",
]
@@ -13209,8 +14791,13 @@ dependencies = [
"polkadot-overseer",
"polkadot-primitives",
"sp-blockchain",
+<<<<<<< HEAD
"sp-inherents",
"thiserror",
+=======
+ "sp-inherents 26.0.0",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"tracing-gum",
]
@@ -13226,11 +14813,17 @@ dependencies = [
"polkadot-node-subsystem-util",
"polkadot-primitives",
"polkadot-primitives-test-helpers",
- "rand",
+ "rand 0.8.5",
"rstest",
+<<<<<<< HEAD
"sp-core",
"sp-tracing",
"thiserror",
+=======
+ "sp-core 28.0.0",
+ "sp-tracing 16.0.0",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"tracing-gum",
]
@@ -13250,9 +14843,15 @@ dependencies = [
"polkadot-primitives-test-helpers",
"rstest",
"schnellru",
+<<<<<<< HEAD
"sp-application-crypto",
"sp-keystore",
"thiserror",
+=======
+ "sp-application-crypto 30.0.0",
+ "sp-keystore 0.34.0",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"tracing-gum",
]
@@ -13284,7 +14883,7 @@ dependencies = [
"polkadot-parachain-primitives",
"polkadot-primitives",
"procfs",
- "rand",
+ "rand 0.8.5",
"rococo-runtime",
"rusty-fork",
"sc-sysinfo",
@@ -13294,7 +14893,7 @@ dependencies = [
"tempfile",
"test-parachain-adder",
"test-parachain-halt",
- "thiserror",
+ "thiserror 1.0.65",
"tokio",
"tracing-gum",
]
@@ -13313,12 +14912,21 @@ dependencies = [
"polkadot-primitives",
"polkadot-primitives-test-helpers",
"sc-keystore",
+<<<<<<< HEAD
"sp-application-crypto",
"sp-core",
"sp-keyring",
"sp-keystore",
"sp-runtime",
"thiserror",
+=======
+ "sp-application-crypto 30.0.0",
+ "sp-core 28.0.0",
+ "sp-keyring 31.0.0",
+ "sp-keystore 0.34.0",
+ "sp-runtime 31.0.1",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"tracing-gum",
]
@@ -13345,7 +14953,7 @@ dependencies = [
"sp-io",
"sp-tracing",
"tempfile",
- "thiserror",
+ "thiserror 1.0.65",
"tracing-gum",
]
@@ -13468,6 +15076,7 @@ dependencies = [
"parity-scale-codec",
"polkadot-node-jaeger",
"polkadot-node-primitives",
+<<<<<<< HEAD
"polkadot-primitives",
"rand",
"rand_chacha",
@@ -13477,6 +15086,17 @@ dependencies = [
"sp-runtime",
"strum 0.26.2",
"thiserror",
+=======
+ "polkadot-primitives 7.0.0",
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
+ "sc-authority-discovery",
+ "sc-network",
+ "sc-network-types",
+ "sp-runtime 31.0.1",
+ "strum 0.26.3",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"tracing-gum",
]
@@ -13493,6 +15113,7 @@ dependencies = [
"polkadot-primitives",
"schnorrkel 0.11.4",
"serde",
+<<<<<<< HEAD
"sp-application-crypto",
"sp-consensus-babe",
"sp-core",
@@ -13500,6 +15121,16 @@ dependencies = [
"sp-maybe-compressed-blob",
"sp-runtime",
"thiserror",
+=======
+ "sp-application-crypto 30.0.0",
+ "sp-consensus-babe 0.32.0",
+ "sp-consensus-slots 0.32.0",
+ "sp-core 28.0.0",
+ "sp-keystore 0.34.0",
+ "sp-maybe-compressed-blob 11.0.0",
+ "sp-runtime 31.0.1",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"zstd 0.12.4",
]
@@ -13559,7 +15190,7 @@ dependencies = [
"sp-consensus-babe",
"sp-runtime",
"substrate-prometheus-endpoint",
- "thiserror",
+ "thiserror 1.0.65",
]
[[package]]
@@ -13595,14 +15226,14 @@ dependencies = [
"polkadot-primitives",
"polkadot-primitives-test-helpers",
"prioritized-metered-channel",
- "rand",
+ "rand 0.8.5",
"sc-client-api",
"schnellru",
"sp-application-crypto",
"sp-core",
"sp-keystore",
"tempfile",
- "thiserror",
+ "thiserror 1.0.65",
"tracing-gum",
]
@@ -13740,9 +15371,43 @@ dependencies = [
"polkadot-core-primitives",
"scale-info",
"serde",
+<<<<<<< HEAD
"sp-core",
"sp-runtime",
"sp-weights",
+=======
+ "sp-core 34.0.0",
+ "sp-runtime 39.0.2",
+ "sp-weights 31.0.0",
+]
+
+[[package]]
+name = "polkadot-primitives"
+version = "7.0.0"
+dependencies = [
+ "bitvec",
+ "hex-literal",
+ "log",
+ "parity-scale-codec",
+ "polkadot-core-primitives 7.0.0",
+ "polkadot-parachain-primitives 6.0.0",
+ "polkadot-primitives-test-helpers",
+ "scale-info",
+ "serde",
+ "sp-api 26.0.0",
+ "sp-application-crypto 30.0.0",
+ "sp-arithmetic 23.0.0",
+ "sp-authority-discovery 26.0.0",
+ "sp-consensus-slots 0.32.0",
+ "sp-core 28.0.0",
+ "sp-inherents 26.0.0",
+ "sp-io 30.0.0",
+ "sp-keystore 0.34.0",
+ "sp-runtime 31.0.1",
+ "sp-staking 26.0.0",
+ "sp-std 14.0.0",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -13774,12 +15439,21 @@ dependencies = [
name = "polkadot-primitives-test-helpers"
version = "0.1.0"
dependencies = [
+<<<<<<< HEAD
"polkadot-primitives",
"rand",
"sp-application-crypto",
"sp-core",
"sp-keyring",
"sp-runtime",
+=======
+ "polkadot-primitives 7.0.0",
+ "rand 0.8.5",
+ "sp-application-crypto 30.0.0",
+ "sp-core 28.0.0",
+ "sp-keyring 31.0.0",
+ "sp-runtime 31.0.1",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -13913,9 +15587,15 @@ dependencies = [
"polkadot-parachain-primitives",
"polkadot-primitives",
"polkadot-primitives-test-helpers",
+<<<<<<< HEAD
"polkadot-runtime-metrics",
"rand",
"rand_chacha",
+=======
+ "polkadot-runtime-metrics 7.0.0",
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"rstest",
"sc-keystore",
"scale-info",
@@ -13941,6 +15621,58 @@ dependencies = [
]
[[package]]
+<<<<<<< HEAD
+=======
+name = "polkadot-runtime-parachains"
+version = "17.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd58e3a17e5df678f5737b018cbfec603af2c93bec56bbb9f8fb8b2b017b54b1"
+dependencies = [
+ "bitflags 1.3.2",
+ "bitvec",
+ "derive_more 0.99.17",
+ "frame-benchmarking 38.0.0",
+ "frame-support 38.0.0",
+ "frame-system 38.0.0",
+ "impl-trait-for-tuples",
+ "log",
+ "pallet-authority-discovery 38.0.0",
+ "pallet-authorship 38.0.0",
+ "pallet-babe 38.0.0",
+ "pallet-balances 39.0.0",
+ "pallet-broker 0.17.0",
+ "pallet-message-queue 41.0.1",
+ "pallet-mmr 38.0.0",
+ "pallet-session 38.0.0",
+ "pallet-staking 38.0.0",
+ "pallet-timestamp 37.0.0",
+ "pallet-vesting 38.0.0",
+ "parity-scale-codec",
+ "polkadot-core-primitives 15.0.0",
+ "polkadot-parachain-primitives 14.0.0",
+ "polkadot-primitives 16.0.0",
+ "polkadot-runtime-metrics 17.0.0",
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
+ "scale-info",
+ "serde",
+ "sp-api 34.0.0",
+ "sp-application-crypto 38.0.0",
+ "sp-arithmetic 26.0.0",
+ "sp-core 34.0.0",
+ "sp-inherents 34.0.0",
+ "sp-io 38.0.0",
+ "sp-keystore 0.40.0",
+ "sp-runtime 39.0.2",
+ "sp-session 36.0.0",
+ "sp-staking 36.0.0",
+ "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "staging-xcm 14.2.0",
+ "staging-xcm-executor 17.0.0",
+]
+
+[[package]]
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
name = "polkadot-sdk"
version = "0.6.0"
dependencies = [
@@ -14371,8 +16103,17 @@ dependencies = [
"pallet-utility",
"parachain-template-runtime",
"parity-scale-codec",
+<<<<<<< HEAD
"polkadot-sdk",
"polkadot-sdk-frame",
+=======
+ "polkadot-omni-node-lib",
+ "polkadot-sdk 0.1.0",
+ "polkadot-sdk-docs-first-pallet",
+ "polkadot-sdk-docs-first-runtime",
+ "polkadot-sdk-frame 0.1.0",
+ "rand 0.8.5",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"sc-chain-spec",
"sc-cli",
"sc-client-db",
@@ -14564,7 +16305,7 @@ dependencies = [
"staging-xcm",
"substrate-prometheus-endpoint",
"tempfile",
- "thiserror",
+ "thiserror 1.0.65",
"tracing-gum",
"westend-runtime",
"westend-runtime-constants",
@@ -14582,7 +16323,11 @@ dependencies = [
"fatality",
"futures",
"futures-timer",
+<<<<<<< HEAD
"indexmap 2.2.3",
+=======
+ "indexmap 2.7.1",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"parity-scale-codec",
"polkadot-node-network-protocol",
"polkadot-node-primitives",
@@ -14592,6 +16337,7 @@ dependencies = [
"polkadot-primitives",
"polkadot-primitives-test-helpers",
"polkadot-subsystem-bench",
+<<<<<<< HEAD
"rand_chacha",
"sc-keystore",
"sc-network",
@@ -14603,6 +16349,20 @@ dependencies = [
"sp-staking",
"sp-tracing",
"thiserror",
+=======
+ "rand_chacha 0.3.1",
+ "rstest",
+ "sc-keystore",
+ "sc-network",
+ "sp-application-crypto 30.0.0",
+ "sp-authority-discovery 26.0.0",
+ "sp-core 28.0.0",
+ "sp-keyring 31.0.0",
+ "sp-keystore 0.34.0",
+ "sp-staking 26.0.0",
+ "sp-tracing 16.0.0",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"tracing-gum",
]
@@ -14660,9 +16420,15 @@ dependencies = [
"prometheus",
"pyroscope",
"pyroscope_pprofrs",
+<<<<<<< HEAD
"rand",
"rand_chacha",
"rand_core",
+=======
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"rand_distr",
"sc-keystore",
"sc-network",
@@ -14740,10 +16506,17 @@ dependencies = [
"polkadot-node-subsystem-test-helpers",
"polkadot-node-subsystem-types",
"polkadot-node-subsystem-util",
+<<<<<<< HEAD
"polkadot-primitives",
"rand",
"sp-core",
"sp-keystore",
+=======
+ "polkadot-primitives 7.0.0",
+ "rand 0.8.5",
+ "sp-core 28.0.0",
+ "sp-keystore 0.34.0",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"substrate-build-script-utils",
"tracing-gum",
]
@@ -14828,7 +16601,7 @@ dependencies = [
"polkadot-runtime-parachains",
"polkadot-service",
"polkadot-test-runtime",
- "rand",
+ "rand 0.8.5",
"sc-authority-discovery",
"sc-chain-spec",
"sc-cli",
@@ -15018,7 +16791,7 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be97d76faf1bfab666e1375477b23fde79eccf0276e9b63b92a39d676a889ba9"
dependencies = [
- "rand",
+ "rand 0.8.5",
]
[[package]]
@@ -15044,7 +16817,7 @@ dependencies = [
"smallvec",
"symbolic-demangle",
"tempfile",
- "thiserror",
+ "thiserror 1.0.65",
]
[[package]]
@@ -15152,7 +16925,7 @@ dependencies = [
"futures",
"futures-timer",
"nanorand",
- "thiserror",
+ "thiserror 1.0.65",
"tracing",
]
@@ -15282,7 +17055,7 @@ dependencies = [
"lazy_static",
"memchr",
"parking_lot 0.12.3",
- "thiserror",
+ "thiserror 1.0.65",
]
[[package]]
@@ -15331,8 +17104,8 @@ dependencies = [
"bitflags 2.6.0",
"lazy_static",
"num-traits",
- "rand",
- "rand_chacha",
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
"rand_xorshift",
"regex-syntax 0.8.2",
"rusty-fork",
@@ -15468,8 +17241,13 @@ dependencies = [
"log",
"names",
"prost 0.11.9",
+<<<<<<< HEAD
"reqwest",
"thiserror",
+=======
+ "reqwest 0.11.27",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"url",
"winapi",
]
@@ -15483,7 +17261,7 @@ dependencies = [
"log",
"pprof",
"pyroscope",
- "thiserror",
+ "thiserror 1.0.65",
]
[[package]]
@@ -15497,7 +17275,7 @@ dependencies = [
"mach2",
"once_cell",
"raw-cpuid",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
"web-sys",
"winapi",
]
@@ -15525,9 +17303,15 @@ checksum = "f8ededb1cd78531627244d51dd0c7139fbe736c7d57af0092a76f0ffb2f56e98"
dependencies = [
"asynchronous-codec",
"bytes",
+<<<<<<< HEAD
"quick-protobuf",
"thiserror",
"unsigned-varint 0.7.2",
+=======
+ "quick-protobuf 0.8.1",
+ "thiserror 1.0.65",
+ "unsigned-varint 0.8.0",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -15549,7 +17333,7 @@ checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6"
dependencies = [
"env_logger 0.8.4",
"log",
- "rand",
+ "rand 0.8.5",
]
[[package]]
@@ -15579,11 +17363,20 @@ dependencies = [
"bytes",
"futures-io",
"pin-project-lite",
+<<<<<<< HEAD
"quinn-proto 0.10.6",
"quinn-udp 0.4.1",
"rustc-hash",
"rustls 0.21.7",
"thiserror",
+=======
+ "quinn-proto",
+ "quinn-udp",
+ "rustc-hash 2.0.0",
+ "rustls 0.23.18",
+ "socket2 0.5.8",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"tokio",
"tracing",
]
@@ -15595,6 +17388,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94b0b33c13a79f669c85defaf4c275dc86a0c0372807d0ca3d78e0bb87274863"
dependencies = [
"bytes",
+<<<<<<< HEAD
"rand",
"ring 0.16.20",
"rustc-hash",
@@ -15617,8 +17411,14 @@ dependencies = [
"ring 0.16.20",
"rustc-hash",
"rustls 0.21.7",
+=======
+ "rand 0.8.5",
+ "ring 0.17.8",
+ "rustc-hash 2.0.0",
+ "rustls 0.23.18",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"slab",
- "thiserror",
+ "thiserror 1.0.65",
"tinyvec",
"tracing",
]
@@ -15630,6 +17430,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "641538578b21f5e5c8ea733b736895576d0fe329bb883b937db6f4d163dbaaf4"
dependencies = [
"libc",
+<<<<<<< HEAD
"quinn-proto 0.9.6",
"socket2 0.4.9",
"tracing",
@@ -15645,6 +17446,10 @@ dependencies = [
"bytes",
"libc",
"socket2 0.5.7",
+=======
+ "once_cell",
+ "socket2 0.5.8",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"tracing",
"windows-sys 0.48.0",
]
@@ -15680,8 +17485,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
dependencies = [
"libc",
+<<<<<<< HEAD
"rand_chacha",
"rand_core",
+=======
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
+ "serde",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
+]
+
+[[package]]
+name = "rand"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94"
+dependencies = [
+ "rand_chacha 0.9.0",
+ "rand_core 0.9.1",
+ "zerocopy 0.8.20",
]
[[package]]
@@ -15694,13 +17516,33 @@ dependencies = [
"rand_core",
]
+[[package]]
+name = "rand_chacha"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.9.1",
+]
+
[[package]]
name = "rand_core"
version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
dependencies = [
- "getrandom",
+ "getrandom 0.2.10",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a88e0da7a2c97baa202165137c158d0a2e824ac465d13d81046727b34cb247d3"
+dependencies = [
+ "getrandom 0.3.1",
+ "zerocopy 0.8.20",
]
[[package]]
@@ -15710,7 +17552,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31"
dependencies = [
"num-traits",
- "rand",
+ "rand 0.8.5",
]
[[package]]
@@ -15831,9 +17673,9 @@ version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
dependencies = [
- "getrandom",
+ "getrandom 0.2.10",
"redox_syscall 0.2.16",
- "thiserror",
+ "thiserror 1.0.65",
]
[[package]]
@@ -15845,7 +17687,7 @@ dependencies = [
"derive_more",
"fs-err",
"static_init",
- "thiserror",
+ "thiserror 1.0.65",
]
[[package]]
@@ -15970,7 +17812,7 @@ dependencies = [
"pallet-utility",
"parity-scale-codec",
"quick_cache",
- "rand",
+ "rand 0.8.5",
"relay-utils",
"sc-chain-spec",
"sc-rpc-api",
@@ -15980,12 +17822,21 @@ dependencies = [
"sp-consensus-grandpa",
"sp-core",
"sp-rpc",
+<<<<<<< HEAD
"sp-runtime",
"sp-std",
"sp-trie",
"sp-version",
"staging-xcm",
"thiserror",
+=======
+ "sp-runtime 31.0.1",
+ "sp-std 14.0.0",
+ "sp-trie 29.0.0",
+ "sp-version 29.0.0",
+ "staging-xcm 7.0.0",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"tokio",
]
@@ -16010,7 +17861,7 @@ dependencies = [
"sp-runtime",
"substrate-prometheus-endpoint",
"sysinfo",
- "thiserror",
+ "thiserror 1.0.65",
"time",
"tokio",
]
@@ -16111,7 +17962,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74"
dependencies = [
"cc",
+<<<<<<< HEAD
"getrandom",
+=======
+ "cfg-if",
+ "getrandom 0.2.10",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"libc",
"spin 0.9.8",
"untrusted 0.9.0",
@@ -16415,7 +18271,7 @@ dependencies = [
"netlink-packet-route",
"netlink-proto",
"nix 0.24.3",
- "thiserror",
+ "thiserror 1.0.65",
"tokio",
]
@@ -16445,8 +18301,13 @@ dependencies = [
"parity-scale-codec",
"primitive-types",
"proptest",
+<<<<<<< HEAD
"rand",
"rlp",
+=======
+ "rand 0.8.5",
+ "rlp 0.5.2",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"ruint-macro",
"serde",
"valuable",
@@ -16765,12 +18626,43 @@ dependencies = [
[[package]]
name = "sc-allocator"
+<<<<<<< HEAD
+=======
+version = "23.0.0"
+dependencies = [
+ "log",
+ "sp-core 28.0.0",
+ "sp-wasm-interface 20.0.0",
+ "thiserror 1.0.65",
+]
+
+[[package]]
+name = "sc-allocator"
+version = "28.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3f01218e73ea57916be5f08987995ac802d6f4ede4ea5ce0242e468c590e4e2"
+dependencies = [
+ "log",
+ "sp-core 33.0.1",
+ "sp-wasm-interface 21.0.1",
+ "thiserror 1.0.65",
+]
+
+[[package]]
+name = "sc-allocator"
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
version = "29.0.0"
dependencies = [
"log",
+<<<<<<< HEAD
"sp-core",
"sp-wasm-interface",
"thiserror",
+=======
+ "sp-core 34.0.0",
+ "sp-wasm-interface 21.0.1",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -16789,7 +18681,7 @@ dependencies = [
"prost 0.12.6",
"prost-build 0.12.4",
"quickcheck",
- "rand",
+ "rand 0.8.5",
"sc-client-api",
"sc-network",
"sc-network-types",
@@ -16802,7 +18694,7 @@ dependencies = [
"sp-tracing",
"substrate-prometheus-endpoint",
"substrate-test-runtime-client",
- "thiserror",
+ "thiserror 1.0.65",
]
[[package]]
@@ -16904,7 +18796,7 @@ dependencies = [
"names",
"parity-bip39",
"parity-scale-codec",
- "rand",
+ "rand 0.8.5",
"regex",
"rpassword",
"sc-client-api",
@@ -16927,7 +18819,7 @@ dependencies = [
"sp-tracing",
"sp-version",
"tempfile",
- "thiserror",
+ "thiserror 1.0.65",
"tokio",
]
@@ -16957,7 +18849,7 @@ dependencies = [
"sp-trie",
"substrate-prometheus-endpoint",
"substrate-test-runtime",
- "thiserror",
+ "thiserror 1.0.65",
]
[[package]]
@@ -16976,8 +18868,12 @@ dependencies = [
"parity-db",
"parity-scale-codec",
"parking_lot 0.12.3",
+<<<<<<< HEAD
"quickcheck",
"rand",
+=======
+ "rand 0.8.5",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"sc-client-api",
"sc-state-db",
"schnellru",
@@ -17014,7 +18910,7 @@ dependencies = [
"sp-state-machine",
"sp-test-primitives",
"substrate-prometheus-endpoint",
- "thiserror",
+ "thiserror 1.0.65",
]
[[package]]
@@ -17051,7 +18947,7 @@ dependencies = [
"substrate-prometheus-endpoint",
"substrate-test-runtime-client",
"tempfile",
- "thiserror",
+ "thiserror 1.0.65",
"tokio",
]
@@ -17093,7 +18989,7 @@ dependencies = [
"sp-tracing",
"substrate-prometheus-endpoint",
"substrate-test-runtime-client",
- "thiserror",
+ "thiserror 1.0.65",
"tokio",
]
@@ -17121,7 +19017,7 @@ dependencies = [
"sp-keystore",
"sp-runtime",
"substrate-test-runtime-client",
- "thiserror",
+ "thiserror 1.0.65",
"tokio",
]
@@ -17164,7 +19060,7 @@ dependencies = [
"substrate-prometheus-endpoint",
"substrate-test-runtime-client",
"tempfile",
- "thiserror",
+ "thiserror 1.0.65",
"tokio",
"wasm-timer",
]
@@ -17187,7 +19083,7 @@ dependencies = [
"sp-core",
"sp-runtime",
"substrate-test-runtime-client",
- "thiserror",
+ "thiserror 1.0.65",
"tokio",
]
@@ -17219,7 +19115,7 @@ dependencies = [
"log",
"parity-scale-codec",
"parking_lot 0.12.3",
- "rand",
+ "rand 0.8.5",
"sc-block-builder",
"sc-chain-spec",
"sc-client-api",
@@ -17249,7 +19145,7 @@ dependencies = [
"sp-tracing",
"substrate-prometheus-endpoint",
"substrate-test-runtime-client",
- "thiserror",
+ "thiserror 1.0.65",
"tokio",
]
@@ -17273,7 +19169,7 @@ dependencies = [
"sp-keyring",
"sp-runtime",
"substrate-test-runtime-client",
- "thiserror",
+ "thiserror 1.0.65",
"tokio",
]
@@ -17311,7 +19207,7 @@ dependencies = [
"substrate-prometheus-endpoint",
"substrate-test-runtime-client",
"substrate-test-runtime-transaction-pool",
- "thiserror",
+ "thiserror 1.0.65",
"tokio",
]
@@ -17336,7 +19232,7 @@ dependencies = [
"sp-inherents",
"sp-runtime",
"substrate-prometheus-endpoint",
- "thiserror",
+ "thiserror 1.0.65",
]
[[package]]
@@ -17403,14 +19299,99 @@ dependencies = [
]
[[package]]
+<<<<<<< HEAD
+=======
+name = "sc-executor"
+version = "0.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "321e9431a3d5c95514b1ba775dd425efd4b18bd79dfdb6d8e397f0c96d6831e9"
+dependencies = [
+ "parity-scale-codec",
+ "parking_lot 0.12.3",
+ "sc-executor-common 0.34.0",
+ "sc-executor-polkavm 0.31.0",
+ "sc-executor-wasmtime 0.34.0",
+ "schnellru",
+ "sp-api 32.0.0",
+ "sp-core 33.0.1",
+ "sp-externalities 0.28.0",
+ "sp-io 36.0.0",
+ "sp-panic-handler 13.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sp-runtime-interface 27.0.0",
+ "sp-trie 35.0.0",
+ "sp-version 35.0.0",
+ "sp-wasm-interface 21.0.1",
+ "tracing",
+]
+
+[[package]]
+name = "sc-executor"
+version = "0.40.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f0cc0a3728fd033589183460c5a49b2e7545d09dc89a098216ef9e9aadcd9dc"
+dependencies = [
+ "parity-scale-codec",
+ "parking_lot 0.12.3",
+ "sc-executor-common 0.35.0",
+ "sc-executor-polkavm 0.32.0",
+ "sc-executor-wasmtime 0.35.0",
+ "schnellru",
+ "sp-api 34.0.0",
+ "sp-core 34.0.0",
+ "sp-externalities 0.29.0",
+ "sp-io 38.0.0",
+ "sp-panic-handler 13.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sp-runtime-interface 28.0.0",
+ "sp-trie 37.0.0",
+ "sp-version 37.0.0",
+ "sp-wasm-interface 21.0.1",
+ "tracing",
+]
+
+[[package]]
+name = "sc-executor-common"
+version = "0.29.0"
+dependencies = [
+ "polkavm 0.18.0",
+ "sc-allocator 23.0.0",
+ "sp-maybe-compressed-blob 11.0.0",
+ "sp-wasm-interface 20.0.0",
+ "thiserror 1.0.65",
+ "wasm-instrument",
+]
+
+[[package]]
+name = "sc-executor-common"
+version = "0.34.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aad16187c613f81feab35f0d6c12c15c1d88eea0794c886b5dca3495d26746de"
+dependencies = [
+ "polkavm 0.9.3",
+ "sc-allocator 28.0.0",
+ "sp-maybe-compressed-blob 11.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sp-wasm-interface 21.0.1",
+ "thiserror 1.0.65",
+ "wasm-instrument",
+]
+
+[[package]]
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
name = "sc-executor-common"
version = "0.35.0"
dependencies = [
+<<<<<<< HEAD
"polkavm",
"sc-allocator",
"sp-maybe-compressed-blob",
"sp-wasm-interface",
"thiserror",
+=======
+ "polkavm 0.9.3",
+ "sc-allocator 29.0.0",
+ "sp-maybe-compressed-blob 11.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sp-wasm-interface 21.0.1",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"wasm-instrument",
]
@@ -17475,7 +19456,7 @@ dependencies = [
"sp-core",
"sp-keystore",
"tempfile",
- "thiserror",
+ "thiserror 1.0.65",
]
[[package]]
@@ -17499,11 +19480,19 @@ dependencies = [
"sc-transaction-pool-api",
"sp-api",
"sp-consensus",
+<<<<<<< HEAD
"sp-core",
"sp-keystore",
"sp-mixnet",
"sp-runtime",
"thiserror",
+=======
+ "sp-core 28.0.0",
+ "sp-keystore 0.34.0",
+ "sp-mixnet 0.4.0",
+ "sp-runtime 31.0.1",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -17534,8 +19523,13 @@ dependencies = [
"partial_sort",
"pin-project",
"prost 0.12.6",
+<<<<<<< HEAD
"prost-build 0.12.4",
"rand",
+=======
+ "prost-build",
+ "rand 0.8.5",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"sc-block-builder",
"sc-client-api",
"sc-network-common",
@@ -17559,7 +19553,7 @@ dependencies = [
"substrate-test-runtime",
"substrate-test-runtime-client",
"tempfile",
- "thiserror",
+ "thiserror 1.0.65",
"tokio",
"tokio-stream",
"tokio-test",
@@ -17626,9 +19620,15 @@ dependencies = [
"sc-network",
"sc-network-types",
"sp-blockchain",
+<<<<<<< HEAD
"sp-core",
"sp-runtime",
"thiserror",
+=======
+ "sp-core 28.0.0",
+ "sp-runtime 31.0.1",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -17686,7 +19686,7 @@ dependencies = [
"sp-tracing",
"substrate-prometheus-endpoint",
"substrate-test-runtime-client",
- "thiserror",
+ "thiserror 1.0.65",
"tokio",
"tokio-stream",
]
@@ -17701,7 +19701,7 @@ dependencies = [
"libp2p",
"log",
"parking_lot 0.12.3",
- "rand",
+ "rand 0.8.5",
"sc-block-builder",
"sc-client-api",
"sc-consensus",
@@ -17752,8 +19752,8 @@ dependencies = [
"multiaddr 0.18.1",
"multihash 0.19.1",
"quickcheck",
- "rand",
- "thiserror",
+ "rand 0.8.5",
+ "thiserror 1.0.65",
"zeroize",
]
@@ -17775,7 +19775,12 @@ dependencies = [
"once_cell",
"parity-scale-codec",
"parking_lot 0.12.3",
+<<<<<<< HEAD
"rand",
+=======
+ "rand 0.8.5",
+ "rustls 0.23.18",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"sc-block-builder",
"sc-client-api",
"sc-client-db",
@@ -17863,9 +19868,15 @@ dependencies = [
"serde_json",
"sp-core",
"sp-rpc",
+<<<<<<< HEAD
"sp-runtime",
"sp-version",
"thiserror",
+=======
+ "sp-runtime 31.0.1",
+ "sp-version 29.0.0",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -17903,7 +19914,7 @@ dependencies = [
"parity-scale-codec",
"parking_lot 0.12.3",
"pretty_assertions",
- "rand",
+ "rand 0.8.5",
"sc-block-builder",
"sc-chain-spec",
"sc-client-api",
@@ -17927,7 +19938,7 @@ dependencies = [
"substrate-test-runtime",
"substrate-test-runtime-client",
"substrate-test-runtime-transaction-pool",
- "thiserror",
+ "thiserror 1.0.65",
"tokio",
"tokio-stream",
]
@@ -17936,11 +19947,38 @@ dependencies = [
name = "sc-runtime-test"
version = "2.0.0"
dependencies = [
+<<<<<<< HEAD
"sp-core",
"sp-io",
"sp-runtime",
"sp-runtime-interface",
"substrate-wasm-builder",
+=======
+ "sp-core 28.0.0",
+ "sp-io 30.0.0",
+ "sp-runtime 31.0.1",
+ "sp-runtime-interface 24.0.0",
+ "substrate-wasm-builder 17.0.0",
+]
+
+[[package]]
+name = "sc-runtime-utilities"
+version = "0.1.0"
+dependencies = [
+ "cumulus-primitives-proof-size-hostfunction 0.2.0",
+ "cumulus-test-runtime",
+ "parity-scale-codec",
+ "sc-executor 0.32.0",
+ "sc-executor-common 0.29.0",
+ "sp-core 28.0.0",
+ "sp-crypto-hashing 0.1.0",
+ "sp-io 30.0.0",
+ "sp-state-machine 0.35.0",
+ "sp-version 29.0.0",
+ "sp-wasm-interface 20.0.0",
+ "subxt",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -17957,7 +19995,7 @@ dependencies = [
"parity-scale-codec",
"parking_lot 0.12.3",
"pin-project",
- "rand",
+ "rand 0.8.5",
"sc-chain-spec",
"sc-client-api",
"sc-client-db",
@@ -18002,7 +20040,7 @@ dependencies = [
"substrate-test-runtime",
"substrate-test-runtime-client",
"tempfile",
- "thiserror",
+ "thiserror 1.0.65",
"tokio",
"tracing",
"tracing-futures",
@@ -18081,8 +20119,13 @@ dependencies = [
"clap 4.5.3",
"fs4",
"log",
+<<<<<<< HEAD
"sp-core",
"thiserror",
+=======
+ "sp-core 28.0.0",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"tokio",
]
@@ -18100,8 +20143,13 @@ dependencies = [
"serde",
"serde_json",
"sp-blockchain",
+<<<<<<< HEAD
"sp-runtime",
"thiserror",
+=======
+ "sp-runtime 31.0.1",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -18112,7 +20160,7 @@ dependencies = [
"futures",
"libc",
"log",
- "rand",
+ "rand 0.8.5",
"rand_pcg",
"regex",
"sc-telemetry",
@@ -18135,12 +20183,16 @@ dependencies = [
"log",
"parking_lot 0.12.3",
"pin-project",
+<<<<<<< HEAD
"rand",
"sc-network",
+=======
+ "rand 0.8.5",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"sc-utils",
"serde",
"serde_json",
- "thiserror",
+ "thiserror 1.0.65",
"wasm-timer",
]
@@ -18166,9 +20218,15 @@ dependencies = [
"sp-blockchain",
"sp-core",
"sp-rpc",
+<<<<<<< HEAD
"sp-runtime",
"sp-tracing",
"thiserror",
+=======
+ "sp-runtime 31.0.1",
+ "sp-tracing 16.0.0",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"tracing",
"tracing-log",
"tracing-subscriber",
@@ -18194,6 +20252,11 @@ dependencies = [
"criterion",
"futures",
"futures-timer",
+<<<<<<< HEAD
+=======
+ "indexmap 2.7.1",
+ "itertools 0.11.0",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"linked-hash-map",
"log",
"parity-scale-codec",
@@ -18215,7 +20278,14 @@ dependencies = [
"substrate-test-runtime",
"substrate-test-runtime-client",
"substrate-test-runtime-transaction-pool",
+<<<<<<< HEAD
"thiserror",
+=======
+ "thiserror 1.0.65",
+ "tokio",
+ "tokio-stream",
+ "tracing",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -18224,14 +20294,24 @@ version = "37.0.0"
dependencies = [
"async-trait",
"futures",
+<<<<<<< HEAD
+=======
+ "indexmap 2.7.1",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"log",
"parity-scale-codec",
"serde",
"serde_json",
"sp-blockchain",
+<<<<<<< HEAD
"sp-core",
"sp-runtime",
"thiserror",
+=======
+ "sp-core 28.0.0",
+ "sp-runtime 31.0.1",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -18303,6 +20383,46 @@ name = "scale-type-resolver"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f0cded6518aa0bd6c1be2b88ac81bf7044992f0f154bfbabd5ad34f43512abcb"
+<<<<<<< HEAD
+=======
+dependencies = [
+ "scale-info",
+ "smallvec",
+]
+
+[[package]]
+name = "scale-typegen"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dc4c70c7fea2eef1740f0081d3fe385d8bee1eef11e9272d3bec7dc8e5438e0"
+dependencies = [
+ "proc-macro2 1.0.93",
+ "quote 1.0.38",
+ "scale-info",
+ "syn 2.0.98",
+ "thiserror 1.0.65",
+]
+
+[[package]]
+name = "scale-value"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5e0ef2a0ee1e02a69ada37feb87ea1616ce9808aca072befe2d3131bf28576e"
+dependencies = [
+ "base58",
+ "blake2 0.10.6",
+ "derive_more 1.0.0",
+ "either",
+ "parity-scale-codec",
+ "scale-bits",
+ "scale-decode 0.14.0",
+ "scale-encode",
+ "scale-info",
+ "scale-type-resolver",
+ "serde",
+ "yap",
+]
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
[[package]]
name = "schannel"
@@ -18456,7 +20576,22 @@ version = "0.28.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d24b59d129cdadea20aea4fb2352fa053712e5d713eee47d700cd4b2bc002f10"
dependencies = [
+<<<<<<< HEAD
"secp256k1-sys",
+=======
+ "secp256k1-sys 0.9.2",
+]
+
+[[package]]
+name = "secp256k1"
+version = "0.30.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b50c5943d326858130af85e049f2661ba3c78b26589b8ab98e65e80ae44a1252"
+dependencies = [
+ "bitcoin_hashes 0.14.0",
+ "rand 0.8.5",
+ "secp256k1-sys 0.10.1",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -18662,7 +20797,11 @@ version = "1.0.121"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ab380d7d9f22ef3f21ad3e6c1ebe8e4fc7a2000ccba2e4d71fc96f15b2cb609"
dependencies = [
+<<<<<<< HEAD
"indexmap 2.2.3",
+=======
+ "indexmap 2.7.1",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"itoa",
"memchr",
"ryu",
@@ -18696,7 +20835,11 @@ version = "0.9.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a0623d197252096520c6f2a5e1171ee436e5af99a5d7caa2891e55e61950e6d9"
dependencies = [
+<<<<<<< HEAD
"indexmap 2.2.3",
+=======
+ "indexmap 2.7.1",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"itoa",
"ryu",
"serde",
@@ -18912,9 +21055,15 @@ dependencies = [
[[package]]
name = "simple-dns"
+<<<<<<< HEAD
version = "0.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cae9a3fcdadafb6d97f4c0e007e4247b114ee0f119f650c3cbf3a8b3a1479694"
+=======
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dee851d0e5e7af3721faea1843e8015e820a234f81fda3dea9247e15bac9a86a"
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
dependencies = [
"bitflags 2.6.0",
]
@@ -19049,9 +21198,15 @@ dependencies = [
"pbkdf2",
"pin-project",
"poly1305",
+<<<<<<< HEAD
"rand",
"rand_chacha",
"ruzstd",
+=======
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
+ "ruzstd 0.4.0",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"schnorrkel 0.10.2",
"serde",
"serde_json",
@@ -19068,6 +21223,63 @@ dependencies = [
]
[[package]]
+<<<<<<< HEAD
+=======
+name = "smoldot"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "966e72d77a3b2171bb7461d0cb91f43670c63558c62d7cf42809cae6c8b6b818"
+dependencies = [
+ "arrayvec 0.7.4",
+ "async-lock 3.4.0",
+ "atomic-take",
+ "base64 0.22.1",
+ "bip39",
+ "blake2-rfc",
+ "bs58",
+ "chacha20",
+ "crossbeam-queue",
+ "derive_more 0.99.17",
+ "ed25519-zebra 4.0.3",
+ "either",
+ "event-listener 5.3.1",
+ "fnv",
+ "futures-lite 2.3.0",
+ "futures-util",
+ "hashbrown 0.14.5",
+ "hex",
+ "hmac 0.12.1",
+ "itertools 0.13.0",
+ "libm",
+ "libsecp256k1",
+ "merlin",
+ "nom",
+ "num-bigint",
+ "num-rational",
+ "num-traits",
+ "pbkdf2",
+ "pin-project",
+ "poly1305",
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
+ "ruzstd 0.6.0",
+ "schnorrkel 0.11.4",
+ "serde",
+ "serde_json",
+ "sha2 0.10.8",
+ "sha3 0.10.8",
+ "siphasher 1.0.1",
+ "slab",
+ "smallvec",
+ "soketto 0.8.0",
+ "twox-hash",
+ "wasmi 0.32.3",
+ "x25519-dalek",
+ "zeroize",
+]
+
+[[package]]
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
name = "smoldot-light"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -19092,26 +21304,67 @@ dependencies = [
"no-std-net",
"parking_lot 0.12.3",
"pin-project",
- "rand",
- "rand_chacha",
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
"serde",
"serde_json",
"siphasher",
"slab",
+<<<<<<< HEAD
"smol",
"smoldot",
+=======
+ "smol 1.3.0",
+ "smoldot 0.11.0",
"zeroize",
]
[[package]]
-name = "snap"
-version = "1.1.0"
+name = "smoldot-light"
+version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831"
-
-[[package]]
-name = "snow"
-version = "0.9.6"
+checksum = "2a33b06891f687909632ce6a4e3fd7677b24df930365af3d0bcb078310129f3f"
+dependencies = [
+ "async-channel 2.3.0",
+ "async-lock 3.4.0",
+ "base64 0.22.1",
+ "blake2-rfc",
+ "bs58",
+ "derive_more 0.99.17",
+ "either",
+ "event-listener 5.3.1",
+ "fnv",
+ "futures-channel",
+ "futures-lite 2.3.0",
+ "futures-util",
+ "hashbrown 0.14.5",
+ "hex",
+ "itertools 0.13.0",
+ "log",
+ "lru 0.12.3",
+ "parking_lot 0.12.3",
+ "pin-project",
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
+ "serde",
+ "serde_json",
+ "siphasher 1.0.1",
+ "slab",
+ "smol 2.0.2",
+ "smoldot 0.18.0",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
+ "zeroize",
+]
+
+[[package]]
+name = "snap"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831"
+
+[[package]]
+name = "snow"
+version = "0.9.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "850948bee068e713b8ab860fe1adc4d109676ab4c3b621fd8147f06b261f2f85"
dependencies = [
@@ -19171,6 +21424,7 @@ dependencies = [
"polkadot-parachain-primitives",
"scale-info",
"serde",
+<<<<<<< HEAD
"snowbridge-beacon-primitives",
"sp-arithmetic",
"sp-core",
@@ -19179,6 +21433,62 @@ dependencies = [
"sp-std",
"staging-xcm",
"staging-xcm-builder",
+=======
+ "snowbridge-beacon-primitives 0.2.0",
+ "sp-arithmetic 23.0.0",
+ "sp-core 28.0.0",
+ "sp-io 30.0.0",
+ "sp-runtime 31.0.1",
+ "sp-std 14.0.0",
+ "staging-xcm 7.0.0",
+ "staging-xcm-builder 7.0.0",
+ "staging-xcm-executor 7.0.0",
+]
+
+[[package]]
+name = "snowbridge-core"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6be61e4db95d1e253a1d5e722953b2d2f6605e5f9761f0a919e5d3fbdbff9da9"
+dependencies = [
+ "ethabi-decode 1.0.0",
+ "frame-support 38.0.0",
+ "frame-system 38.0.0",
+ "hex-literal",
+ "parity-scale-codec",
+ "polkadot-parachain-primitives 14.0.0",
+ "scale-info",
+ "serde",
+ "snowbridge-beacon-primitives 0.10.0",
+ "sp-arithmetic 26.0.0",
+ "sp-core 34.0.0",
+ "sp-io 38.0.0",
+ "sp-runtime 39.0.2",
+ "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "staging-xcm 14.2.0",
+ "staging-xcm-builder 17.0.1",
+]
+
+[[package]]
+name = "snowbridge-ethereum"
+version = "0.3.0"
+dependencies = [
+ "ethabi-decode 2.0.0",
+ "ethbloom 0.14.1",
+ "ethereum-types 0.15.1",
+ "hex-literal",
+ "parity-bytes",
+ "parity-scale-codec",
+ "rand 0.8.5",
+ "rlp 0.6.1",
+ "scale-info",
+ "serde",
+ "serde-big-array",
+ "serde_json",
+ "sp-io 30.0.0",
+ "sp-runtime 31.0.1",
+ "sp-std 14.0.0",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -19212,7 +21522,7 @@ dependencies = [
"hex",
"lazy_static",
"parity-scale-codec",
- "rand",
+ "rand 0.8.5",
"scale-info",
"snowbridge-amcl",
"zeroize",
@@ -19256,7 +21566,7 @@ dependencies = [
"log",
"pallet-timestamp",
"parity-scale-codec",
- "rand",
+ "rand 0.8.5",
"scale-info",
"serde",
"serde_json",
@@ -19458,9 +21768,9 @@ dependencies = [
[[package]]
name = "socket2"
-version = "0.5.7"
+version = "0.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
dependencies = [
"libc",
"windows-sys 0.52.0",
@@ -19477,8 +21787,13 @@ dependencies = [
"futures",
"httparse",
"log",
+<<<<<<< HEAD
"rand",
"sha-1 0.9.8",
+=======
+ "rand 0.8.5",
+ "sha-1",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -19493,7 +21808,7 @@ dependencies = [
"http 1.1.0",
"httparse",
"log",
- "rand",
+ "rand 0.8.5",
"sha1",
]
@@ -19560,6 +21875,7 @@ dependencies = [
"pallet-transaction-payment-rpc-runtime-api",
"parity-scale-codec",
"scale-info",
+<<<<<<< HEAD
"sp-api",
"sp-block-builder",
"sp-consensus-aura",
@@ -19574,6 +21890,69 @@ dependencies = [
"sp-transaction-pool",
"sp-version",
"substrate-wasm-builder",
+=======
+ "serde_json",
+ "sp-api 26.0.0",
+ "sp-block-builder 26.0.0",
+ "sp-consensus-aura 0.32.0",
+ "sp-consensus-grandpa 13.0.0",
+ "sp-core 28.0.0",
+ "sp-genesis-builder 0.8.0",
+ "sp-inherents 26.0.0",
+ "sp-keyring 31.0.0",
+ "sp-offchain 26.0.0",
+ "sp-runtime 31.0.1",
+ "sp-session 27.0.0",
+ "sp-storage 19.0.0",
+ "sp-transaction-pool 26.0.0",
+ "sp-version 29.0.0",
+ "substrate-wasm-builder 17.0.0",
+]
+
+[[package]]
+name = "sp-api"
+version = "26.0.0"
+dependencies = [
+ "docify",
+ "hash-db",
+ "log",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-api-proc-macro 15.0.0",
+ "sp-core 28.0.0",
+ "sp-externalities 0.25.0",
+ "sp-metadata-ir 0.6.0",
+ "sp-runtime 31.0.1",
+ "sp-runtime-interface 24.0.0",
+ "sp-state-machine 0.35.0",
+ "sp-test-primitives",
+ "sp-trie 29.0.0",
+ "sp-version 29.0.0",
+ "thiserror 1.0.65",
+]
+
+[[package]]
+name = "sp-api"
+version = "32.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f84f09c4b928e814e07dede0ece91f1f6eae1bff946a0e5e4a76bed19a095f1"
+dependencies = [
+ "hash-db",
+ "log",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-api-proc-macro 19.0.0",
+ "sp-core 33.0.1",
+ "sp-externalities 0.28.0",
+ "sp-metadata-ir 0.7.0",
+ "sp-runtime 37.0.0",
+ "sp-runtime-interface 27.0.0",
+ "sp-state-machine 0.41.0",
+ "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sp-trie 35.0.0",
+ "sp-version 35.0.0",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -19585,6 +21964,7 @@ dependencies = [
"log",
"parity-scale-codec",
"scale-info",
+<<<<<<< HEAD
"sp-api-proc-macro",
"sp-core",
"sp-externalities",
@@ -19596,6 +21976,18 @@ dependencies = [
"sp-trie",
"sp-version",
"thiserror",
+=======
+ "sp-api-proc-macro 20.0.0",
+ "sp-core 34.0.0",
+ "sp-externalities 0.29.0",
+ "sp-metadata-ir 0.7.0",
+ "sp-runtime 39.0.2",
+ "sp-runtime-interface 28.0.0",
+ "sp-state-machine 0.43.0",
+ "sp-trie 37.0.0",
+ "sp-version 37.0.0",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -19666,8 +22058,13 @@ dependencies = [
"integer-sqrt",
"num-traits",
"parity-scale-codec",
+<<<<<<< HEAD
"primitive-types",
"rand",
+=======
+ "primitive-types 0.13.1",
+ "rand 0.8.5",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"scale-info",
"serde",
"sp-crypto-hashing",
@@ -19717,9 +22114,15 @@ dependencies = [
"sp-consensus",
"sp-core",
"sp-database",
+<<<<<<< HEAD
"sp-runtime",
"sp-state-machine",
"thiserror",
+=======
+ "sp-runtime 31.0.1",
+ "sp-state-machine 0.35.0",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"tracing",
]
@@ -19735,7 +22138,7 @@ dependencies = [
"sp-runtime",
"sp-state-machine",
"sp-test-primitives",
- "thiserror",
+ "thiserror 1.0.65",
]
[[package]]
@@ -19824,7 +22227,166 @@ dependencies = [
"parity-scale-codec",
"scale-info",
"serde",
+<<<<<<< HEAD
"sp-timestamp",
+=======
+ "sp-timestamp 26.0.0",
+]
+
+[[package]]
+name = "sp-consensus-slots"
+version = "0.40.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbafb7ed44f51c22fa277fb39b33dc601fa426133a8e2b53f3f46b10f07fba43"
+dependencies = [
+ "parity-scale-codec",
+ "scale-info",
+ "serde",
+ "sp-timestamp 34.0.0",
+]
+
+[[package]]
+name = "sp-core"
+version = "28.0.0"
+dependencies = [
+ "array-bytes",
+ "bandersnatch_vrfs",
+ "bitflags 1.3.2",
+ "blake2 0.10.6",
+ "bounded-collections",
+ "bs58",
+ "criterion",
+ "dyn-clonable",
+ "ed25519-zebra 4.0.3",
+ "futures",
+ "hash-db",
+ "hash256-std-hasher",
+ "impl-serde 0.5.0",
+ "itertools 0.11.0",
+ "k256",
+ "libsecp256k1",
+ "log",
+ "merlin",
+ "parity-bip39",
+ "parity-scale-codec",
+ "parking_lot 0.12.3",
+ "paste",
+ "primitive-types 0.13.1",
+ "rand 0.8.5",
+ "regex",
+ "scale-info",
+ "schnorrkel 0.11.4",
+ "secp256k1 0.28.2",
+ "secrecy 0.8.0",
+ "serde",
+ "serde_json",
+ "sp-crypto-hashing 0.1.0",
+ "sp-debug-derive 14.0.0",
+ "sp-externalities 0.25.0",
+ "sp-runtime-interface 24.0.0",
+ "sp-std 14.0.0",
+ "sp-storage 19.0.0",
+ "ss58-registry",
+ "substrate-bip39 0.4.7",
+ "thiserror 1.0.65",
+ "tracing",
+ "w3f-bls",
+ "zeroize",
+]
+
+[[package]]
+name = "sp-core"
+version = "32.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb2dac7e47c7ddbb61efe196d5cce99f6ea88926c961fa39909bfeae46fc5a7b"
+dependencies = [
+ "array-bytes",
+ "bitflags 1.3.2",
+ "blake2 0.10.6",
+ "bounded-collections",
+ "bs58",
+ "dyn-clonable",
+ "ed25519-zebra 3.1.0",
+ "futures",
+ "hash-db",
+ "hash256-std-hasher",
+ "impl-serde 0.4.0",
+ "itertools 0.10.5",
+ "k256",
+ "libsecp256k1",
+ "log",
+ "merlin",
+ "parity-bip39",
+ "parity-scale-codec",
+ "parking_lot 0.12.3",
+ "paste",
+ "primitive-types 0.12.2",
+ "rand 0.8.5",
+ "scale-info",
+ "schnorrkel 0.11.4",
+ "secp256k1 0.28.2",
+ "secrecy 0.8.0",
+ "serde",
+ "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sp-debug-derive 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sp-externalities 0.28.0",
+ "sp-runtime-interface 27.0.0",
+ "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sp-storage 21.0.0",
+ "ss58-registry",
+ "substrate-bip39 0.6.0",
+ "thiserror 1.0.65",
+ "tracing",
+ "w3f-bls",
+ "zeroize",
+]
+
+[[package]]
+name = "sp-core"
+version = "33.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3368e32f6fda6e20b8af51f94308d033ab70a021e87f6abbd3fed5aca942b745"
+dependencies = [
+ "array-bytes",
+ "bitflags 1.3.2",
+ "blake2 0.10.6",
+ "bounded-collections",
+ "bs58",
+ "dyn-clonable",
+ "ed25519-zebra 4.0.3",
+ "futures",
+ "hash-db",
+ "hash256-std-hasher",
+ "impl-serde 0.4.0",
+ "itertools 0.11.0",
+ "k256",
+ "libsecp256k1",
+ "log",
+ "merlin",
+ "parity-bip39",
+ "parity-scale-codec",
+ "parking_lot 0.12.3",
+ "paste",
+ "primitive-types 0.12.2",
+ "rand 0.8.5",
+ "scale-info",
+ "schnorrkel 0.11.4",
+ "secp256k1 0.28.2",
+ "secrecy 0.8.0",
+ "serde",
+ "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sp-debug-derive 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sp-externalities 0.28.0",
+ "sp-runtime-interface 27.0.0",
+ "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sp-storage 21.0.0",
+ "ss58-registry",
+ "substrate-bip39 0.6.0",
+ "thiserror 1.0.65",
+ "tracing",
+ "w3f-bls",
+ "zeroize",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -19853,9 +22415,14 @@ dependencies = [
"parity-scale-codec",
"parking_lot 0.12.3",
"paste",
+<<<<<<< HEAD
"primitive-types",
"rand",
"regex",
+=======
+ "primitive-types 0.12.2",
+ "rand 0.8.5",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"scale-info",
"schnorrkel 0.11.4",
"secp256k1",
@@ -19869,8 +22436,60 @@ dependencies = [
"sp-std",
"sp-storage",
"ss58-registry",
+<<<<<<< HEAD
"substrate-bip39",
"thiserror",
+=======
+ "substrate-bip39 0.6.0",
+ "thiserror 1.0.65",
+ "tracing",
+ "w3f-bls",
+ "zeroize",
+]
+
+[[package]]
+name = "sp-core"
+version = "35.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4532774405a712a366a98080cbb4daa28c38ddff0ec595902ad6ee6a78a809f8"
+dependencies = [
+ "array-bytes",
+ "bitflags 1.3.2",
+ "blake2 0.10.6",
+ "bounded-collections",
+ "bs58",
+ "dyn-clonable",
+ "ed25519-zebra 4.0.3",
+ "futures",
+ "hash-db",
+ "hash256-std-hasher",
+ "impl-serde 0.5.0",
+ "itertools 0.11.0",
+ "k256",
+ "libsecp256k1",
+ "log",
+ "merlin",
+ "parity-bip39",
+ "parity-scale-codec",
+ "parking_lot 0.12.3",
+ "paste",
+ "primitive-types 0.13.1",
+ "rand 0.8.5",
+ "scale-info",
+ "schnorrkel 0.11.4",
+ "secp256k1 0.28.2",
+ "secrecy 0.8.0",
+ "serde",
+ "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sp-debug-derive 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sp-externalities 0.30.0",
+ "sp-runtime-interface 29.0.0",
+ "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sp-storage 22.0.0",
+ "ss58-registry",
+ "substrate-bip39 0.6.0",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"tracing",
"w3f-bls",
"zeroize",
@@ -19988,13 +22607,34 @@ dependencies = [
"impl-trait-for-tuples",
"parity-scale-codec",
"scale-info",
+<<<<<<< HEAD
"sp-runtime",
"thiserror",
]
+[[package]]
+=======
+ "sp-runtime 31.0.1",
+ "thiserror 1.0.65",
+]
+
+[[package]]
+name = "sp-inherents"
+version = "34.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afffbddc380d99a90c459ba1554bbbc01d62e892de9f1485af6940b89c4c0d57"
+dependencies = [
+ "async-trait",
+ "impl-trait-for-tuples",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-runtime 39.0.2",
+ "thiserror 1.0.65",
+]
+
[[package]]
name = "sp-io"
-version = "38.0.0"
+version = "30.0.0"
dependencies = [
"bytes",
"docify",
@@ -20002,33 +22642,155 @@ dependencies = [
"libsecp256k1",
"log",
"parity-scale-codec",
- "polkavm-derive",
+ "polkavm-derive 0.18.0",
"rustversion",
- "secp256k1",
- "sp-core",
- "sp-crypto-hashing",
- "sp-externalities",
- "sp-keystore",
- "sp-runtime-interface",
- "sp-state-machine",
- "sp-tracing",
- "sp-trie",
+ "secp256k1 0.28.2",
+ "sp-core 28.0.0",
+ "sp-crypto-hashing 0.1.0",
+ "sp-externalities 0.25.0",
+ "sp-keystore 0.34.0",
+ "sp-runtime-interface 24.0.0",
+ "sp-state-machine 0.35.0",
+ "sp-tracing 16.0.0",
+ "sp-trie 29.0.0",
"tracing",
"tracing-core",
]
[[package]]
-name = "sp-keyring"
-version = "39.0.0"
-dependencies = [
- "sp-core",
- "sp-runtime",
- "strum 0.26.2",
-]
-
-[[package]]
-name = "sp-keystore"
-version = "0.40.0"
+name = "sp-io"
+version = "35.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b64ab18a0e29def6511139a8c45a59c14a846105aab6f9cc653523bd3b81f55"
+dependencies = [
+ "bytes",
+ "ed25519-dalek",
+ "libsecp256k1",
+ "log",
+ "parity-scale-codec",
+ "polkavm-derive 0.9.1",
+ "rustversion",
+ "secp256k1 0.28.2",
+ "sp-core 32.0.0",
+ "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sp-externalities 0.28.0",
+ "sp-keystore 0.38.0",
+ "sp-runtime-interface 27.0.0",
+ "sp-state-machine 0.40.0",
+ "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sp-tracing 17.0.1",
+ "sp-trie 34.0.0",
+ "tracing",
+ "tracing-core",
+]
+
+[[package]]
+name = "sp-io"
+version = "36.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7a31ce27358b73656a09b4933f09a700019d63afa15ede966f7c9893c1d4db5"
+dependencies = [
+ "bytes",
+ "ed25519-dalek",
+ "libsecp256k1",
+ "log",
+ "parity-scale-codec",
+ "polkavm-derive 0.9.1",
+ "rustversion",
+ "secp256k1 0.28.2",
+ "sp-core 33.0.1",
+ "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sp-externalities 0.28.0",
+ "sp-keystore 0.39.0",
+ "sp-runtime-interface 27.0.0",
+ "sp-state-machine 0.41.0",
+ "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sp-tracing 17.0.1",
+ "sp-trie 35.0.0",
+ "tracing",
+ "tracing-core",
+]
+
+[[package]]
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
+name = "sp-io"
+version = "38.0.0"
+dependencies = [
+ "bytes",
+ "docify",
+ "ed25519-dalek",
+ "libsecp256k1",
+ "log",
+ "parity-scale-codec",
+ "polkavm-derive",
+ "rustversion",
+ "secp256k1",
+ "sp-core",
+ "sp-crypto-hashing",
+ "sp-externalities",
+ "sp-keystore",
+ "sp-runtime-interface",
+ "sp-state-machine",
+ "sp-tracing",
+ "sp-trie",
+ "tracing",
+ "tracing-core",
+]
+
+[[package]]
+name = "sp-keyring"
+version = "39.0.0"
+dependencies = [
+<<<<<<< HEAD
+ "sp-core",
+ "sp-runtime",
+ "strum 0.26.2",
+=======
+ "sp-core 34.0.0",
+ "sp-runtime 39.0.2",
+ "strum 0.26.3",
+]
+
+[[package]]
+name = "sp-keystore"
+version = "0.34.0"
+dependencies = [
+ "parity-scale-codec",
+ "parking_lot 0.12.3",
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
+ "sp-core 28.0.0",
+ "sp-externalities 0.25.0",
+]
+
+[[package]]
+name = "sp-keystore"
+version = "0.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e6c7a7abd860a5211a356cf9d5fcabf0eb37d997985e5d722b6b33dcc815528"
+dependencies = [
+ "parity-scale-codec",
+ "parking_lot 0.12.3",
+ "sp-core 32.0.0",
+ "sp-externalities 0.28.0",
+]
+
+[[package]]
+name = "sp-keystore"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92a909528663a80829b95d582a20dd4c9acd6e575650dee2bcaf56f4740b305e"
+dependencies = [
+ "parity-scale-codec",
+ "parking_lot 0.12.3",
+ "sp-core 33.0.1",
+ "sp-externalities 0.28.0",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
+]
+
+[[package]]
+name = "sp-keystore"
+version = "0.40.0"
dependencies = [
"parity-scale-codec",
"parking_lot 0.12.3",
@@ -20042,12 +22804,34 @@ dependencies = [
name = "sp-maybe-compressed-blob"
version = "11.0.0"
dependencies = [
- "thiserror",
+ "thiserror 1.0.65",
+ "zstd 0.12.4",
+]
+
+[[package]]
+<<<<<<< HEAD
+=======
+name = "sp-maybe-compressed-blob"
+version = "11.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0c768c11afbe698a090386876911da4236af199cd38a5866748df4d8628aeff"
+dependencies = [
+ "thiserror 1.0.65",
"zstd 0.12.4",
]
[[package]]
name = "sp-metadata-ir"
+version = "0.6.0"
+dependencies = [
+ "frame-metadata 19.0.0",
+ "parity-scale-codec",
+ "scale-info",
+]
+
+[[package]]
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
+name = "sp-metadata-ir"
version = "0.7.0"
dependencies = [
"frame-metadata",
@@ -20075,11 +22859,37 @@ dependencies = [
"polkadot-ckb-merkle-mountain-range",
"scale-info",
"serde",
+<<<<<<< HEAD
"sp-api",
"sp-core",
"sp-debug-derive",
"sp-runtime",
"thiserror",
+=======
+ "sp-api 26.0.0",
+ "sp-core 28.0.0",
+ "sp-debug-derive 14.0.0",
+ "sp-runtime 31.0.1",
+ "thiserror 1.0.65",
+]
+
+[[package]]
+name = "sp-mmr-primitives"
+version = "34.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a12dd76e368f1e48144a84b4735218b712f84b3f976970e2f25a29b30440e10"
+dependencies = [
+ "log",
+ "parity-scale-codec",
+ "polkadot-ckb-merkle-mountain-range 0.7.0",
+ "scale-info",
+ "serde",
+ "sp-api 34.0.0",
+ "sp-core 34.0.0",
+ "sp-debug-derive 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sp-runtime 39.0.2",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -20087,7 +22897,7 @@ name = "sp-npos-elections"
version = "34.0.0"
dependencies = [
"parity-scale-codec",
- "rand",
+ "rand 0.8.5",
"scale-info",
"serde",
"sp-arithmetic",
@@ -20102,9 +22912,24 @@ version = "2.0.0"
dependencies = [
"clap 4.5.3",
"honggfuzz",
+<<<<<<< HEAD
"rand",
"sp-npos-elections",
"sp-runtime",
+=======
+ "rand 0.8.5",
+ "sp-npos-elections 26.0.0",
+ "sp-runtime 31.0.1",
+]
+
+[[package]]
+name = "sp-offchain"
+version = "26.0.0"
+dependencies = [
+ "sp-api 26.0.0",
+ "sp-core 28.0.0",
+ "sp-runtime 31.0.1",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -20147,7 +22972,7 @@ dependencies = [
"num-traits",
"parity-scale-codec",
"paste",
- "rand",
+ "rand 0.8.5",
"scale-info",
"serde",
"serde_json",
@@ -20166,8 +22991,151 @@ dependencies = [
"zstd 0.12.4",
]
+[[package]]
+<<<<<<< HEAD
+=======
+name = "sp-runtime"
+version = "36.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6b85cb874b78ebb17307a910fc27edf259a0455ac5155d87eaed8754c037e07"
+dependencies = [
+ "docify",
+ "either",
+ "hash256-std-hasher",
+ "impl-trait-for-tuples",
+ "log",
+ "parity-scale-codec",
+ "paste",
+ "rand 0.8.5",
+ "scale-info",
+ "serde",
+ "simple-mermaid 0.1.1",
+ "sp-application-crypto 35.0.0",
+ "sp-arithmetic 26.0.0",
+ "sp-core 32.0.0",
+ "sp-io 35.0.0",
+ "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sp-weights 31.0.0",
+]
+
+[[package]]
+name = "sp-runtime"
+version = "37.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c2a6148bf0ba74999ecfea9b4c1ade544f0663e0baba19630bb7761b2142b19"
+dependencies = [
+ "docify",
+ "either",
+ "hash256-std-hasher",
+ "impl-trait-for-tuples",
+ "log",
+ "num-traits",
+ "parity-scale-codec",
+ "paste",
+ "rand 0.8.5",
+ "scale-info",
+ "serde",
+ "simple-mermaid 0.1.1",
+ "sp-application-crypto 36.0.0",
+ "sp-arithmetic 26.0.0",
+ "sp-core 33.0.1",
+ "sp-io 36.0.0",
+ "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sp-weights 31.0.0",
+]
+
+[[package]]
+name = "sp-runtime"
+version = "39.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "658f23be7c79a85581029676a73265c107c5469157e3444c8c640fdbaa8bfed0"
+dependencies = [
+ "docify",
+ "either",
+ "hash256-std-hasher",
+ "impl-trait-for-tuples",
+ "log",
+ "num-traits",
+ "parity-scale-codec",
+ "paste",
+ "rand 0.8.5",
+ "scale-info",
+ "serde",
+ "simple-mermaid 0.1.1",
+ "sp-application-crypto 38.0.0",
+ "sp-arithmetic 26.0.0",
+ "sp-core 34.0.0",
+ "sp-io 38.0.0",
+ "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sp-weights 31.0.0",
+ "tracing",
+]
+
+[[package]]
+name = "sp-runtime-interface"
+version = "17.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f"
+dependencies = [
+ "bytes",
+ "impl-trait-for-tuples",
+ "parity-scale-codec",
+ "primitive-types 0.12.2",
+ "sp-externalities 0.19.0",
+ "sp-runtime-interface-proc-macro 11.0.0",
+ "sp-std 8.0.0",
+ "sp-storage 13.0.0",
+ "sp-tracing 10.0.0",
+ "sp-wasm-interface 14.0.0",
+ "static_assertions",
+]
+
[[package]]
name = "sp-runtime-interface"
+version = "24.0.0"
+dependencies = [
+ "bytes",
+ "impl-trait-for-tuples",
+ "parity-scale-codec",
+ "polkavm-derive 0.18.0",
+ "primitive-types 0.13.1",
+ "rustversion",
+ "sp-core 28.0.0",
+ "sp-externalities 0.25.0",
+ "sp-io 30.0.0",
+ "sp-runtime-interface-proc-macro 17.0.0",
+ "sp-runtime-interface-test-wasm",
+ "sp-state-machine 0.35.0",
+ "sp-std 14.0.0",
+ "sp-storage 19.0.0",
+ "sp-tracing 16.0.0",
+ "sp-wasm-interface 20.0.0",
+ "static_assertions",
+ "trybuild",
+]
+
+[[package]]
+name = "sp-runtime-interface"
+version = "27.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "647db5e1dc481686628b41554e832df6ab400c4b43a6a54e54d3b0a71ca404aa"
+dependencies = [
+ "bytes",
+ "impl-trait-for-tuples",
+ "parity-scale-codec",
+ "polkavm-derive 0.9.1",
+ "primitive-types 0.12.2",
+ "sp-externalities 0.28.0",
+ "sp-runtime-interface-proc-macro 18.0.0",
+ "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sp-storage 21.0.0",
+ "sp-tracing 17.0.1",
+ "sp-wasm-interface 21.0.1",
+ "static_assertions",
+]
+
+[[package]]
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
+name = "sp-runtime-interface"
version = "28.0.0"
dependencies = [
"bytes",
@@ -20276,19 +23244,117 @@ dependencies = [
"parity-scale-codec",
"parking_lot 0.12.3",
"pretty_assertions",
- "rand",
+ "rand 0.8.5",
"smallvec",
+<<<<<<< HEAD
"sp-core",
"sp-externalities",
"sp-panic-handler",
"sp-runtime",
"sp-trie",
"thiserror",
+=======
+ "sp-core 28.0.0",
+ "sp-externalities 0.25.0",
+ "sp-panic-handler 13.0.0",
+ "sp-runtime 31.0.1",
+ "sp-trie 29.0.0",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"tracing",
"trie-db",
]
[[package]]
+<<<<<<< HEAD
+=======
+name = "sp-state-machine"
+version = "0.40.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18084cb996c27d5d99a88750e0a8eb4af6870a40df97872a5923e6d293d95fb9"
+dependencies = [
+ "hash-db",
+ "log",
+ "parity-scale-codec",
+ "parking_lot 0.12.3",
+ "rand 0.8.5",
+ "smallvec",
+ "sp-core 32.0.0",
+ "sp-externalities 0.28.0",
+ "sp-panic-handler 13.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sp-trie 34.0.0",
+ "thiserror 1.0.65",
+ "tracing",
+ "trie-db",
+]
+
+[[package]]
+name = "sp-state-machine"
+version = "0.41.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f6ac196ea92c4d0613c071e1a050765dbfa30107a990224a4aba02c7dbcd063"
+dependencies = [
+ "hash-db",
+ "log",
+ "parity-scale-codec",
+ "parking_lot 0.12.3",
+ "rand 0.8.5",
+ "smallvec",
+ "sp-core 33.0.1",
+ "sp-externalities 0.28.0",
+ "sp-panic-handler 13.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sp-trie 35.0.0",
+ "thiserror 1.0.65",
+ "tracing",
+ "trie-db",
+]
+
+[[package]]
+name = "sp-state-machine"
+version = "0.43.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "930104d6ae882626e8880d9b1578da9300655d337a3ffb45e130c608b6c89660"
+dependencies = [
+ "hash-db",
+ "log",
+ "parity-scale-codec",
+ "parking_lot 0.12.3",
+ "rand 0.8.5",
+ "smallvec",
+ "sp-core 34.0.0",
+ "sp-externalities 0.29.0",
+ "sp-panic-handler 13.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sp-trie 37.0.0",
+ "thiserror 1.0.65",
+ "tracing",
+ "trie-db",
+]
+
+[[package]]
+name = "sp-statement-store"
+version = "10.0.0"
+dependencies = [
+ "aes-gcm",
+ "curve25519-dalek 4.1.3",
+ "ed25519-dalek",
+ "hkdf",
+ "parity-scale-codec",
+ "rand 0.8.5",
+ "scale-info",
+ "sha2 0.10.8",
+ "sp-api 26.0.0",
+ "sp-application-crypto 30.0.0",
+ "sp-core 28.0.0",
+ "sp-crypto-hashing 0.1.0",
+ "sp-externalities 0.25.0",
+ "sp-runtime 31.0.1",
+ "sp-runtime-interface 24.0.0",
+ "thiserror 1.0.65",
+ "x25519-dalek",
+]
+
+[[package]]
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
name = "sp-statement-store"
version = "18.0.0"
dependencies = [
@@ -20297,9 +23363,10 @@ dependencies = [
"ed25519-dalek",
"hkdf",
"parity-scale-codec",
- "rand",
+ "rand 0.8.5",
"scale-info",
"sha2 0.10.8",
+<<<<<<< HEAD
"sp-api",
"sp-application-crypto",
"sp-core",
@@ -20308,6 +23375,16 @@ dependencies = [
"sp-runtime",
"sp-runtime-interface",
"thiserror",
+=======
+ "sp-api 34.0.0",
+ "sp-application-crypto 38.0.0",
+ "sp-core 34.0.0",
+ "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sp-externalities 0.29.0",
+ "sp-runtime 39.0.2",
+ "sp-runtime-interface 28.0.0",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"x25519-dalek",
]
@@ -20333,9 +23410,26 @@ dependencies = [
"parity-scale-codec",
"scale-info",
"serde",
+<<<<<<< HEAD
"sp-application-crypto",
"sp-core",
"sp-runtime",
+=======
+ "sp-application-crypto 30.0.0",
+ "sp-core 28.0.0",
+ "sp-runtime 31.0.1",
+]
+
+[[package]]
+name = "sp-timestamp"
+version = "26.0.0"
+dependencies = [
+ "async-trait",
+ "parity-scale-codec",
+ "sp-inherents 26.0.0",
+ "sp-runtime 31.0.1",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -20344,9 +23438,15 @@ version = "34.0.0"
dependencies = [
"async-trait",
"parity-scale-codec",
+<<<<<<< HEAD
"sp-inherents",
"sp-runtime",
"thiserror",
+=======
+ "sp-inherents 34.0.0",
+ "sp-runtime 39.0.2",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -20393,13 +23493,20 @@ dependencies = [
"nohash-hasher",
"parity-scale-codec",
"parking_lot 0.12.3",
- "rand",
+ "rand 0.8.5",
"scale-info",
"schnellru",
+<<<<<<< HEAD
"sp-core",
"sp-externalities",
"sp-runtime",
"thiserror",
+=======
+ "sp-core 28.0.0",
+ "sp-externalities 0.25.0",
+ "sp-runtime 31.0.1",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"tracing",
"trie-bench",
"trie-db",
@@ -20407,8 +23514,117 @@ dependencies = [
"trie-standardmap",
]
+[[package]]
+<<<<<<< HEAD
+=======
+name = "sp-trie"
+version = "34.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87727eced997f14d0f79e3a5186a80e38a9de87f6e9dc0baea5ebf8b7f9d8b66"
+dependencies = [
+ "ahash 0.8.11",
+ "hash-db",
+ "lazy_static",
+ "memory-db",
+ "nohash-hasher",
+ "parity-scale-codec",
+ "parking_lot 0.12.3",
+ "rand 0.8.5",
+ "scale-info",
+ "schnellru",
+ "sp-core 32.0.0",
+ "sp-externalities 0.28.0",
+ "thiserror 1.0.65",
+ "tracing",
+ "trie-db",
+ "trie-root",
+]
+
+[[package]]
+name = "sp-trie"
+version = "35.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a61ab0c3e003f457203702e4753aa5fe9e762380543fada44650b1217e4aa5a5"
+dependencies = [
+ "ahash 0.8.11",
+ "hash-db",
+ "lazy_static",
+ "memory-db",
+ "nohash-hasher",
+ "parity-scale-codec",
+ "parking_lot 0.12.3",
+ "rand 0.8.5",
+ "scale-info",
+ "schnellru",
+ "sp-core 33.0.1",
+ "sp-externalities 0.28.0",
+ "thiserror 1.0.65",
+ "tracing",
+ "trie-db",
+ "trie-root",
+]
+
+[[package]]
+name = "sp-trie"
+version = "37.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6282aef9f4b6ecd95a67a45bcdb67a71f4a4155c09a53c10add4ffe823db18cd"
+dependencies = [
+ "ahash 0.8.11",
+ "hash-db",
+ "lazy_static",
+ "memory-db",
+ "nohash-hasher",
+ "parity-scale-codec",
+ "parking_lot 0.12.3",
+ "rand 0.8.5",
+ "scale-info",
+ "schnellru",
+ "sp-core 34.0.0",
+ "sp-externalities 0.29.0",
+ "thiserror 1.0.65",
+ "tracing",
+ "trie-db",
+ "trie-root",
+]
+
[[package]]
name = "sp-version"
+version = "29.0.0"
+dependencies = [
+ "impl-serde 0.5.0",
+ "parity-scale-codec",
+ "parity-wasm",
+ "scale-info",
+ "serde",
+ "sp-crypto-hashing-proc-macro 0.1.0",
+ "sp-runtime 31.0.1",
+ "sp-std 14.0.0",
+ "sp-version-proc-macro 13.0.0",
+ "thiserror 1.0.65",
+]
+
+[[package]]
+name = "sp-version"
+version = "35.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ff74bf12b4f7d29387eb1caeec5553209a505f90a2511d2831143b970f89659"
+dependencies = [
+ "impl-serde 0.4.0",
+ "parity-scale-codec",
+ "parity-wasm",
+ "scale-info",
+ "serde",
+ "sp-crypto-hashing-proc-macro 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sp-runtime 37.0.0",
+ "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sp-version-proc-macro 14.0.0",
+ "thiserror 1.0.65",
+]
+
+[[package]]
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
+name = "sp-version"
version = "37.0.0"
dependencies = [
"impl-serde",
@@ -20416,11 +23632,19 @@ dependencies = [
"parity-wasm",
"scale-info",
"serde",
+<<<<<<< HEAD
"sp-crypto-hashing-proc-macro",
"sp-runtime",
"sp-std",
"sp-version-proc-macro",
"thiserror",
+=======
+ "sp-crypto-hashing-proc-macro 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sp-runtime 39.0.2",
+ "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sp-version-proc-macro 14.0.0",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -20466,33 +23690,240 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
[[package]]
-name = "spin"
-version = "0.9.8"
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+
+[[package]]
+name = "spinners"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08615eea740067d9899969bc2891c68a19c315cb1f66640af9a9ecb91b13bcab"
+dependencies = [
+ "lazy_static",
+ "maplit",
+ "strum 0.24.1",
+]
+
+[[package]]
+name = "spki"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a"
+dependencies = [
+ "base64ct",
+ "der",
+]
+
+[[package]]
+<<<<<<< HEAD
+=======
+name = "sqlformat"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7bba3a93db0cc4f7bdece8bb09e77e2e785c20bfebf79eb8340ed80708048790"
+dependencies = [
+ "nom",
+ "unicode_categories",
+]
+
+[[package]]
+name = "sqlx"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93334716a037193fac19df402f8571269c84a00852f6a7066b5d2616dcd64d3e"
+dependencies = [
+ "sqlx-core",
+ "sqlx-macros",
+ "sqlx-mysql",
+ "sqlx-postgres",
+ "sqlx-sqlite",
+]
+
+[[package]]
+name = "sqlx-core"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4d8060b456358185f7d50c55d9b5066ad956956fddec42ee2e8567134a8936e"
+dependencies = [
+ "atoi",
+ "byteorder",
+ "bytes",
+ "crc",
+ "crossbeam-queue",
+ "either",
+ "event-listener 5.3.1",
+ "futures-channel",
+ "futures-core",
+ "futures-intrusive",
+ "futures-io",
+ "futures-util",
+ "hashbrown 0.14.5",
+ "hashlink 0.9.1",
+ "hex",
+ "indexmap 2.7.1",
+ "log",
+ "memchr",
+ "once_cell",
+ "paste",
+ "percent-encoding",
+ "serde",
+ "serde_json",
+ "sha2 0.10.8",
+ "smallvec",
+ "sqlformat",
+ "thiserror 1.0.65",
+ "tokio",
+ "tokio-stream",
+ "tracing",
+ "url",
+]
+
+[[package]]
+name = "sqlx-macros"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cac0692bcc9de3b073e8d747391827297e075c7710ff6276d9f7a1f3d58c6657"
+dependencies = [
+ "proc-macro2 1.0.93",
+ "quote 1.0.38",
+ "sqlx-core",
+ "sqlx-macros-core",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "sqlx-macros-core"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1804e8a7c7865599c9c79be146dc8a9fd8cc86935fa641d3ea58e5f0688abaa5"
+dependencies = [
+ "dotenvy",
+ "either",
+ "heck 0.5.0",
+ "hex",
+ "once_cell",
+ "proc-macro2 1.0.93",
+ "quote 1.0.38",
+ "serde",
+ "serde_json",
+ "sha2 0.10.8",
+ "sqlx-core",
+ "sqlx-mysql",
+ "sqlx-postgres",
+ "sqlx-sqlite",
+ "syn 2.0.98",
+ "tempfile",
+ "tokio",
+ "url",
+]
+
+[[package]]
+name = "sqlx-mysql"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+checksum = "64bb4714269afa44aef2755150a0fc19d756fb580a67db8885608cf02f47d06a"
+dependencies = [
+ "atoi",
+ "base64 0.22.1",
+ "bitflags 2.6.0",
+ "byteorder",
+ "bytes",
+ "crc",
+ "digest 0.10.7",
+ "dotenvy",
+ "either",
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-util",
+ "generic-array 0.14.7",
+ "hex",
+ "hkdf",
+ "hmac 0.12.1",
+ "itoa",
+ "log",
+ "md-5",
+ "memchr",
+ "once_cell",
+ "percent-encoding",
+ "rand 0.8.5",
+ "rsa",
+ "serde",
+ "sha1",
+ "sha2 0.10.8",
+ "smallvec",
+ "sqlx-core",
+ "stringprep",
+ "thiserror 1.0.65",
+ "tracing",
+ "whoami",
+]
[[package]]
-name = "spinners"
-version = "4.1.0"
+name = "sqlx-postgres"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08615eea740067d9899969bc2891c68a19c315cb1f66640af9a9ecb91b13bcab"
+checksum = "6fa91a732d854c5d7726349bb4bb879bb9478993ceb764247660aee25f67c2f8"
dependencies = [
- "lazy_static",
- "maplit",
- "strum 0.24.1",
+ "atoi",
+ "base64 0.22.1",
+ "bitflags 2.6.0",
+ "byteorder",
+ "crc",
+ "dotenvy",
+ "etcetera",
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-util",
+ "hex",
+ "hkdf",
+ "hmac 0.12.1",
+ "home",
+ "itoa",
+ "log",
+ "md-5",
+ "memchr",
+ "once_cell",
+ "rand 0.8.5",
+ "serde",
+ "serde_json",
+ "sha2 0.10.8",
+ "smallvec",
+ "sqlx-core",
+ "stringprep",
+ "thiserror 1.0.65",
+ "tracing",
+ "whoami",
]
[[package]]
-name = "spki"
-version = "0.7.2"
+name = "sqlx-sqlite"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a"
+checksum = "d5b2cf34a45953bfd3daaf3db0f7a7878ab9b7a6b91b422d24a7a9e4c857b680"
dependencies = [
- "base64ct",
- "der",
+ "atoi",
+ "flume",
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-intrusive",
+ "futures-util",
+ "libsqlite3-sys",
+ "log",
+ "percent-encoding",
+ "serde",
+ "serde_urlencoded",
+ "sqlx-core",
+ "tracing",
+ "url",
]
[[package]]
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
name = "ss58-registry"
version = "1.43.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -20565,9 +23996,15 @@ dependencies = [
"node-rpc",
"node-testing",
"parity-scale-codec",
+<<<<<<< HEAD
"platforms",
"polkadot-sdk",
"rand",
+=======
+ "polkadot-sdk 0.1.0",
+ "pretty_assertions",
+ "rand 0.8.5",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"regex",
"sc-service-test",
"scale-info",
@@ -20593,11 +24030,19 @@ dependencies = [
"sc-client-api",
"sc-service",
"sp-blockchain",
+<<<<<<< HEAD
"sp-core",
"sp-io",
"sp-runtime",
"sp-statement-store",
"thiserror",
+=======
+ "sp-core 28.0.0",
+ "sp-io 30.0.0",
+ "sp-runtime 31.0.1",
+ "sp-statement-store 10.0.0",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -20898,6 +24343,26 @@ dependencies = [
]
[[package]]
+<<<<<<< HEAD
+=======
+name = "substrate-differ"
+version = "0.21.3"
+source = "git+https://github.com/chevdor/subwasm?rev=v0.21.3#aa8acb6fdfb34144ac51ab95618a9b37fa251295"
+dependencies = [
+ "comparable",
+ "document-features",
+ "frame-metadata 16.0.0",
+ "log",
+ "num-format",
+ "scale-info",
+ "serde",
+ "serde_json",
+ "thiserror 1.0.65",
+ "wasm-testbed",
+]
+
+[[package]]
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
name = "substrate-frame-rpc-support"
version = "39.0.0"
dependencies = [
@@ -20947,7 +24412,7 @@ dependencies = [
"hyper-util",
"log",
"prometheus",
- "thiserror",
+ "thiserror 1.0.65",
"tokio",
]
@@ -20990,8 +24455,13 @@ dependencies = [
"sp-runtime",
"sp-trie",
"structopt",
+<<<<<<< HEAD
"strum 0.26.2",
"thiserror",
+=======
+ "strum 0.26.3",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
]
[[package]]
@@ -21009,6 +24479,25 @@ dependencies = [
]
[[package]]
+<<<<<<< HEAD
+=======
+name = "substrate-runtime-proposal-hash"
+version = "0.21.3"
+source = "git+https://github.com/chevdor/subwasm?rev=v0.21.3#aa8acb6fdfb34144ac51ab95618a9b37fa251295"
+dependencies = [
+ "blake2 0.10.6",
+ "frame-metadata 16.0.0",
+ "hex",
+ "parity-scale-codec",
+ "sp-core 32.0.0",
+ "sp-io 35.0.0",
+ "sp-runtime 36.0.0",
+ "sp-wasm-interface 21.0.1",
+ "thiserror 1.0.65",
+]
+
+[[package]]
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
name = "substrate-state-trie-migration-rpc"
version = "37.0.0"
dependencies = [
@@ -21132,7 +24621,7 @@ dependencies = [
"sp-blockchain",
"sp-runtime",
"substrate-test-runtime-client",
- "thiserror",
+ "thiserror 1.0.65",
]
[[package]]
@@ -21191,6 +24680,206 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142"
[[package]]
+<<<<<<< HEAD
+=======
+name = "subwasmlib"
+version = "0.21.3"
+source = "git+https://github.com/chevdor/subwasm?rev=v0.21.3#aa8acb6fdfb34144ac51ab95618a9b37fa251295"
+dependencies = [
+ "calm_io",
+ "frame-metadata 16.0.0",
+ "hex",
+ "ipfs-hasher",
+ "log",
+ "num-format",
+ "rand 0.8.5",
+ "reqwest 0.12.9",
+ "scale-info",
+ "semver 1.0.18",
+ "serde",
+ "serde_json",
+ "sp-version 35.0.0",
+ "substrate-differ",
+ "thiserror 1.0.65",
+ "url",
+ "uuid",
+ "wasm-loader",
+ "wasm-testbed",
+]
+
+[[package]]
+name = "subxt"
+version = "0.38.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c17d7ec2359d33133b63c97e28c8b7cd3f0a5bc6ce567ae3aef9d9e85be3433"
+dependencies = [
+ "async-trait",
+ "derive-where",
+ "either",
+ "finito",
+ "frame-metadata 17.0.0",
+ "futures",
+ "hex",
+ "impl-serde 0.5.0",
+ "jsonrpsee",
+ "parity-scale-codec",
+ "polkadot-sdk 0.7.0",
+ "primitive-types 0.13.1",
+ "scale-bits",
+ "scale-decode 0.14.0",
+ "scale-encode",
+ "scale-info",
+ "scale-value",
+ "serde",
+ "serde_json",
+ "subxt-core",
+ "subxt-lightclient",
+ "subxt-macro",
+ "subxt-metadata",
+ "thiserror 1.0.65",
+ "tokio",
+ "tokio-util",
+ "tracing",
+ "url",
+ "wasm-bindgen-futures",
+ "web-time",
+]
+
+[[package]]
+name = "subxt-codegen"
+version = "0.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3cfcfb7d9589f3df0ac87c4988661cf3fb370761fcb19f2fd33104cc59daf22a"
+dependencies = [
+ "heck 0.5.0",
+ "parity-scale-codec",
+ "proc-macro2 1.0.93",
+ "quote 1.0.38",
+ "scale-info",
+ "scale-typegen",
+ "subxt-metadata",
+ "syn 2.0.98",
+ "thiserror 1.0.65",
+]
+
+[[package]]
+name = "subxt-core"
+version = "0.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ea28114366780d23684bd55ab879cd04c9d4cbba3b727a3854a3eca6bf29a1a"
+dependencies = [
+ "base58",
+ "blake2 0.10.6",
+ "derive-where",
+ "frame-decode",
+ "frame-metadata 17.0.0",
+ "hashbrown 0.14.5",
+ "hex",
+ "impl-serde 0.5.0",
+ "keccak-hash",
+ "parity-scale-codec",
+ "polkadot-sdk 0.7.0",
+ "primitive-types 0.13.1",
+ "scale-bits",
+ "scale-decode 0.14.0",
+ "scale-encode",
+ "scale-info",
+ "scale-value",
+ "serde",
+ "serde_json",
+ "subxt-metadata",
+ "tracing",
+]
+
+[[package]]
+name = "subxt-lightclient"
+version = "0.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "534d4b725183a9fa09ce0e0f135674473297fdd97dee4d683f41117f365ae997"
+dependencies = [
+ "futures",
+ "futures-util",
+ "serde",
+ "serde_json",
+ "smoldot-light 0.16.2",
+ "thiserror 1.0.65",
+ "tokio",
+ "tokio-stream",
+ "tracing",
+]
+
+[[package]]
+name = "subxt-macro"
+version = "0.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "228db9a5c95a6d8dc6152b4d6cdcbabc4f60821dd3f482a4f8791e022b7caadb"
+dependencies = [
+ "darling",
+ "parity-scale-codec",
+ "proc-macro-error2",
+ "quote 1.0.38",
+ "scale-typegen",
+ "subxt-codegen",
+ "subxt-utils-fetchmetadata",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "subxt-metadata"
+version = "0.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee13e6862eda035557d9a2871955306aff540d2b89c06e0a62a1136a700aed28"
+dependencies = [
+ "frame-decode",
+ "frame-metadata 17.0.0",
+ "hashbrown 0.14.5",
+ "parity-scale-codec",
+ "polkadot-sdk 0.7.0",
+ "scale-info",
+]
+
+[[package]]
+name = "subxt-signer"
+version = "0.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e7a336d6a1f86f126100a4a717be58352de4c8214300c4f7807f974494efdb9"
+dependencies = [
+ "base64 0.22.1",
+ "bip32",
+ "bip39",
+ "cfg-if",
+ "crypto_secretbox",
+ "hex",
+ "hmac 0.12.1",
+ "keccak-hash",
+ "parity-scale-codec",
+ "pbkdf2",
+ "polkadot-sdk 0.7.0",
+ "regex",
+ "schnorrkel 0.11.4",
+ "scrypt",
+ "secp256k1 0.30.0",
+ "secrecy 0.10.3",
+ "serde",
+ "serde_json",
+ "sha2 0.10.8",
+ "subxt-core",
+ "zeroize",
+]
+
+[[package]]
+name = "subxt-utils-fetchmetadata"
+version = "0.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3082b17a86e3c3fe45d858d94d68f6b5247caace193dad6201688f24db8ba9bb"
+dependencies = [
+ "hex",
+ "parity-scale-codec",
+ "thiserror 1.0.65",
+]
+
+[[package]]
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
name = "sval"
version = "2.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -21609,7 +25298,16 @@ version = "1.0.61"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
dependencies = [
- "thiserror-impl",
+ "thiserror-impl 1.0.65",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc"
+dependencies = [
+ "thiserror-impl 2.0.11",
]
[[package]]
@@ -21643,6 +25341,17 @@ dependencies = [
"syn 2.0.61",
]
+[[package]]
+name = "thiserror-impl"
+version = "2.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2"
+dependencies = [
+ "proc-macro2 1.0.93",
+ "quote 1.0.38",
+ "syn 2.0.98",
+]
+
[[package]]
name = "thousands"
version = "0.2.0"
@@ -21754,6 +25463,16 @@ dependencies = [
"crunchy",
]
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
[[package]]
name = "tinytemplate"
version = "1.2.1"
@@ -21793,7 +25512,7 @@ dependencies = [
"parking_lot 0.12.3",
"pin-project-lite",
"signal-hook-registry",
- "socket2 0.5.7",
+ "socket2 0.5.8",
"tokio-macros",
"windows-sys 0.48.0",
]
@@ -21816,7 +25535,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f"
dependencies = [
"pin-project",
- "rand",
+ "rand 0.8.5",
"tokio",
]
@@ -21874,11 +25593,29 @@ checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c"
dependencies = [
"futures-util",
"log",
- "rustls 0.21.7",
- "rustls-native-certs 0.6.3",
"tokio",
+<<<<<<< HEAD
"tokio-rustls 0.24.1",
"tungstenite",
+=======
+ "tungstenite 0.20.1",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
+]
+
+[[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 0.23.18",
+ "rustls-native-certs 0.8.0",
+ "rustls-pki-types",
+ "tokio",
+ "tokio-rustls 0.26.0",
+ "tungstenite 0.26.2",
]
[[package]]
@@ -21931,7 +25668,11 @@ version = "0.19.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
dependencies = [
+<<<<<<< HEAD
"indexmap 2.2.3",
+=======
+ "indexmap 2.7.1",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"toml_datetime",
"winnow",
]
@@ -21942,7 +25683,22 @@ version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03"
dependencies = [
+<<<<<<< HEAD
"indexmap 2.2.3",
+=======
+ "indexmap 2.7.1",
+ "toml_datetime",
+ "winnow 0.5.15",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
+dependencies = [
+ "indexmap 2.7.1",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"serde",
"serde_spanned",
"toml_datetime",
@@ -22231,32 +25987,76 @@ dependencies = [
]
[[package]]
-name = "tt-call"
-version = "1.0.9"
+name = "tt-call"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4f195fd851901624eee5a58c4bb2b4f06399148fcd0ed336e6f1cb60a9881df"
+
+[[package]]
+name = "tungstenite"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9"
+dependencies = [
+ "byteorder",
+ "bytes",
+ "data-encoding",
+ "http 0.2.9",
+ "httparse",
+ "log",
+ "rand 0.8.5",
+ "sha1",
+ "thiserror 1.0.65",
+ "url",
+ "utf-8",
+]
+
+[[package]]
+<<<<<<< HEAD
+=======
+name = "tungstenite"
+version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f195fd851901624eee5a58c4bb2b4f06399148fcd0ed336e6f1cb60a9881df"
+checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1"
+dependencies = [
+ "byteorder",
+ "bytes",
+ "data-encoding",
+ "http 1.1.0",
+ "httparse",
+ "log",
+ "rand 0.8.5",
+ "rustls 0.22.4",
+ "rustls-native-certs 0.7.0",
+ "rustls-pki-types",
+ "sha1",
+ "thiserror 1.0.65",
+ "url",
+ "utf-8",
+]
[[package]]
name = "tungstenite"
-version = "0.20.1"
+version = "0.26.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9"
+checksum = "4793cb5e56680ecbb1d843515b23b6de9a75eb04b66643e256a396d43be33c13"
dependencies = [
- "byteorder",
"bytes",
"data-encoding",
- "http 0.2.9",
+ "http 1.1.0",
"httparse",
"log",
- "rand",
- "rustls 0.21.7",
+ "rand 0.9.0",
+ "rustls 0.23.18",
+ "rustls-pki-types",
"sha1",
- "thiserror",
+ "thiserror 2.0.11",
"url",
"utf-8",
]
[[package]]
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
name = "tuplex"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -22270,7 +26070,7 @@ checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
dependencies = [
"cfg-if",
"digest 0.10.7",
- "rand",
+ "rand 0.8.5",
"static_assertions",
]
@@ -22401,12 +26201,12 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
[[package]]
name = "url"
-version = "2.5.2"
+version = "2.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
dependencies = [
"form_urlencoded",
- "idna 0.5.0",
+ "idna 1.0.3",
"percent-encoding",
]
@@ -22416,6 +26216,18 @@ version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
[[package]]
name = "utf8parse"
version = "0.2.1"
@@ -22427,6 +26239,12 @@ name = "uuid"
version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
+<<<<<<< HEAD
+=======
+dependencies = [
+ "getrandom 0.2.10",
+]
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
[[package]]
name = "valuable"
@@ -22509,12 +26327,21 @@ dependencies = [
"arrayref",
"constcat",
"digest 0.10.7",
+<<<<<<< HEAD
"rand",
"rand_chacha",
"rand_core",
"sha2 0.10.8",
"sha3",
"thiserror",
+=======
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
+ "sha2 0.10.8",
+ "sha3 0.10.8",
+ "thiserror 1.0.65",
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
"zeroize",
]
@@ -22559,6 +26386,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
+<<<<<<< HEAD
+=======
+name = "wasi"
+version = "0.13.3+wasi-0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
+dependencies = [
+ "wit-bindgen-rt",
+]
+
+[[package]]
+name = "wasite"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
+
+[[package]]
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
name = "wasm-bindgen"
version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -22669,6 +26514,28 @@ dependencies = [
]
[[package]]
+<<<<<<< HEAD
+=======
+name = "wasm-loader"
+version = "0.21.3"
+source = "git+https://github.com/chevdor/subwasm?rev=v0.21.3#aa8acb6fdfb34144ac51ab95618a9b37fa251295"
+dependencies = [
+ "array-bytes",
+ "log",
+ "multibase 0.9.1",
+ "multihash 0.19.1",
+ "serde",
+ "serde_json",
+ "sp-maybe-compressed-blob 11.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "subrpcer",
+ "thiserror 1.0.65",
+ "tungstenite 0.21.0",
+ "ureq",
+ "url",
+]
+
+[[package]]
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
name = "wasm-opt"
version = "0.116.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -22679,7 +26546,7 @@ dependencies = [
"strum 0.24.1",
"strum_macros 0.24.3",
"tempfile",
- "thiserror",
+ "thiserror 1.0.65",
"wasm-opt-cxx-sys",
"wasm-opt-sys",
]
@@ -22709,6 +26576,32 @@ dependencies = [
]
[[package]]
+<<<<<<< HEAD
+=======
+name = "wasm-testbed"
+version = "0.21.3"
+source = "git+https://github.com/chevdor/subwasm?rev=v0.21.3#aa8acb6fdfb34144ac51ab95618a9b37fa251295"
+dependencies = [
+ "frame-metadata 16.0.0",
+ "hex",
+ "log",
+ "parity-scale-codec",
+ "sc-executor 0.38.0",
+ "sc-executor-common 0.34.0",
+ "scale-info",
+ "sp-core 33.0.1",
+ "sp-io 36.0.0",
+ "sp-runtime 37.0.0",
+ "sp-state-machine 0.41.0",
+ "sp-version 35.0.0",
+ "sp-wasm-interface 21.0.1",
+ "substrate-runtime-proposal-hash",
+ "thiserror 1.0.65",
+ "wasm-loader",
+]
+
+[[package]]
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
name = "wasm-timer"
version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -22886,7 +26779,7 @@ dependencies = [
"log",
"object 0.30.4",
"target-lexicon",
- "thiserror",
+ "thiserror 1.0.65",
"wasmparser",
"wasmtime-cranelift-shared",
"wasmtime-environ",
@@ -22921,7 +26814,7 @@ dependencies = [
"object 0.30.4",
"serde",
"target-lexicon",
- "thiserror",
+ "thiserror 1.0.65",
"wasmparser",
"wasmtime-types",
]
@@ -22988,7 +26881,7 @@ dependencies = [
"memfd",
"memoffset 0.8.0",
"paste",
- "rand",
+ "rand 0.8.5",
"rustix 0.36.15",
"wasmtime-asm-macros",
"wasmtime-environ",
@@ -23004,7 +26897,7 @@ checksum = "a4f6fffd2a1011887d57f07654dd112791e872e3ff4a2e626aee8059ee17f06f"
dependencies = [
"cranelift-entity",
"serde",
- "thiserror",
+ "thiserror 1.0.65",
"wasmparser",
]
@@ -23560,6 +27453,27 @@ dependencies = [
"windows-sys 0.48.0",
]
+[[package]]
+name = "wit-bindgen-rt"
+version = "0.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
+dependencies = [
+ "bitflags 2.6.0",
+]
+
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
[[package]]
name = "wyz"
version = "0.5.1"
@@ -23571,9 +27485,9 @@ dependencies = [
[[package]]
name = "x25519-dalek"
-version = "2.0.0"
+version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96"
+checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277"
dependencies = [
"curve25519-dalek",
"rand_core",
@@ -23611,7 +27525,24 @@ dependencies = [
"nom",
"oid-registry 0.7.0",
"rusticata-macros",
- "thiserror",
+ "thiserror 1.0.65",
+ "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.0",
+ "data-encoding",
+ "der-parser 10.0.0",
+ "lazy_static",
+ "nom",
+ "oid-registry 0.8.1",
+ "rusticata-macros",
+ "thiserror 2.0.11",
"time",
]
@@ -23843,11 +27774,30 @@ dependencies = [
"nohash-hasher",
"parking_lot 0.12.3",
"pin-project",
- "rand",
+ "rand 0.8.5",
+ "static_assertions",
+]
+
+[[package]]
+<<<<<<< HEAD
+=======
+name = "yamux"
+version = "0.13.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17610762a1207ee816c6fadc29220904753648aba0a9ed61c7b8336e80a559c4"
+dependencies = [
+ "futures",
+ "log",
+ "nohash-hasher",
+ "parking_lot 0.12.3",
+ "pin-project",
+ "rand 0.8.5",
"static_assertions",
+ "web-time",
]
[[package]]
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
name = "yansi"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -23862,13 +27812,46 @@ dependencies = [
"time",
]
+[[package]]
+name = "yoke"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+dependencies = [
+ "proc-macro2 1.0.93",
+ "quote 1.0.38",
+ "syn 2.0.98",
+ "synstructure 0.13.1",
+]
+
[[package]]
name = "zerocopy"
version = "0.7.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
dependencies = [
- "zerocopy-derive",
+ "zerocopy-derive 0.7.32",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.8.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dde3bb8c68a8f3f1ed4ac9221aad6b10cece3e60a8e2ea54a6a2dec806d0084c"
+dependencies = [
+ "zerocopy-derive 0.8.20",
]
[[package]]
@@ -23882,6 +27865,38 @@ dependencies = [
"syn 2.0.61",
]
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eea57037071898bf96a6da35fd626f4f27e9cee3ead2a6c703cf09d472b2e700"
+dependencies = [
+ "proc-macro2 1.0.93",
+ "quote 1.0.38",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
+dependencies = [
+ "proc-macro2 1.0.93",
+ "quote 1.0.38",
+ "syn 2.0.98",
+ "synstructure 0.13.1",
+]
+
[[package]]
name = "zeroize"
version = "1.8.1"
@@ -23902,6 +27917,28 @@ dependencies = [
"syn 2.0.61",
]
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2 1.0.93",
+ "quote 1.0.38",
+ "syn 2.0.98",
+]
+
[[package]]
name = "zombienet-backchannel"
version = "1.0.0"
@@ -23912,14 +27949,150 @@ dependencies = [
"reqwest",
"serde",
"serde_json",
- "thiserror",
+ "thiserror 1.0.65",
"tokio",
- "tokio-tungstenite",
+ "tokio-tungstenite 0.20.1",
"tracing-gum",
"url",
]
[[package]]
+<<<<<<< HEAD
+=======
+name = "zombienet-configuration"
+version = "0.2.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03caa9f916aedb12e8443521c87604fe54fbde163a58018780108d86761310dc"
+dependencies = [
+ "anyhow",
+ "lazy_static",
+ "multiaddr 0.18.1",
+ "regex",
+ "reqwest 0.11.27",
+ "serde",
+ "serde_json",
+ "thiserror 1.0.65",
+ "tokio",
+ "toml 0.8.19",
+ "tracing",
+ "url",
+ "zombienet-support",
+]
+
+[[package]]
+name = "zombienet-orchestrator"
+version = "0.2.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8330f46e4584a306ed567702307a697b8a2771681233548263f5bc3f639fcdec"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "futures",
+ "glob-match",
+ "hex",
+ "libp2p",
+ "libsecp256k1",
+ "multiaddr 0.18.1",
+ "rand 0.8.5",
+ "regex",
+ "reqwest 0.11.27",
+ "serde",
+ "serde_json",
+ "sha2 0.10.8",
+ "sp-core 35.0.0",
+ "subxt",
+ "subxt-signer",
+ "thiserror 1.0.65",
+ "tokio",
+ "tracing",
+ "uuid",
+ "zombienet-configuration",
+ "zombienet-prom-metrics-parser",
+ "zombienet-provider",
+ "zombienet-support",
+]
+
+[[package]]
+name = "zombienet-prom-metrics-parser"
+version = "0.2.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a52a796a1521cf6420cc6384eac9ef25a146d453b568969774af643f3ecdc97"
+dependencies = [
+ "pest",
+ "pest_derive",
+ "thiserror 1.0.65",
+]
+
+[[package]]
+name = "zombienet-provider"
+version = "0.2.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7121ed12016baf318afdcaa96e59d134a3299f40ad5cb67fa6e8ae561db97d26"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "flate2",
+ "futures",
+ "hex",
+ "k8s-openapi",
+ "kube",
+ "nix 0.29.0",
+ "regex",
+ "reqwest 0.11.27",
+ "serde",
+ "serde_json",
+ "serde_yaml",
+ "sha2 0.10.8",
+ "tar",
+ "thiserror 1.0.65",
+ "tokio",
+ "tokio-util",
+ "tracing",
+ "url",
+ "uuid",
+ "zombienet-configuration",
+ "zombienet-support",
+]
+
+[[package]]
+name = "zombienet-sdk"
+version = "0.2.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "732a89935216d4cde1e538075af2f9e0e974e49895004694ab113c7040725ae5"
+dependencies = [
+ "async-trait",
+ "futures",
+ "lazy_static",
+ "subxt",
+ "subxt-signer",
+ "tokio",
+ "zombienet-configuration",
+ "zombienet-orchestrator",
+ "zombienet-provider",
+ "zombienet-support",
+]
+
+[[package]]
+name = "zombienet-support"
+version = "0.2.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f0c215aa994335125b75f9ad7c227a4ae6c281c074a6e6a42800f2fdfa59c8b"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "futures",
+ "nix 0.29.0",
+ "rand 0.8.5",
+ "regex",
+ "reqwest 0.11.27",
+ "thiserror 1.0.65",
+ "tokio",
+ "tracing",
+ "uuid",
+]
+
+[[package]]
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
name = "zstd"
version = "0.11.2+zstd.1.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/Cargo.toml b/Cargo.toml
index 6feb00f383fb0..d6d71ae68f0ce 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -787,7 +787,7 @@ hyper-util = { version = "0.1.5", default-features = false }
hyperv14 = { package = "hyper", version = "0.14.29", default-features = false }
impl-serde = { version = "0.4.0", default-features = false }
impl-trait-for-tuples = { version = "0.2.2" }
-indexmap = { version = "2.0.0" }
+indexmap = { version = "2.7.1" }
indicatif = { version = "0.17.7" }
integer-sqrt = { version = "0.1.2" }
ip_network = { version = "0.4.1" }
@@ -815,8 +815,13 @@ linked-hash-map = { version = "0.5.4" }
linked_hash_set = { version = "0.1.4" }
linregress = { version = "0.5.1" }
lite-json = { version = "0.2.0", default-features = false }
+<<<<<<< HEAD
litep2p = { version = "0.6.2" }
log = { version = "0.4.21", default-features = false }
+=======
+litep2p = { version = "0.9.1", features = ["websocket"] }
+log = { version = "0.4.22", default-features = false }
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
macro_magic = { version = "0.5.1" }
maplit = { version = "1.0.2" }
memmap2 = { version = "0.9.3" }
@@ -1317,7 +1322,7 @@ tt-call = { version = "1.0.8" }
tuplex = { version = "0.1", default-features = false }
twox-hash = { version = "1.6.3", default-features = false }
unsigned-varint = { version = "0.7.2" }
-url = { version = "2.4.0" }
+url = { version = "2.5.4" }
void = { version = "1.0.2" }
w3f-bls = { version = "0.1.3", default-features = false }
wait-timeout = { version = "0.2" }
diff --git a/prdoc/pr_7640.prdoc b/prdoc/pr_7640.prdoc
new file mode 100644
index 0000000000000..ede525d219996
--- /dev/null
+++ b/prdoc/pr_7640.prdoc
@@ -0,0 +1,25 @@
+title: Bring the latest compatibility fixes via litep2p v0.9.1
+
+doc:
+ - audience: [Node Dev, Node Operator]
+ description: |
+ This release enhances compatibility between litep2p and libp2p by using the latest Yamux upstream version.
+ Additionally, it includes various improvements and fixes to boost the stability and performance of the WebSocket stream and the multistream-select protocol.
+
+crates:
+ - name: sc-network
+ bump: minor
+ - name: cumulus-client-cli
+ bump: minor
+ - name: sc-network-types
+ bump: minor
+ - name: sc-transaction-pool-api
+ bump: minor
+ - name: sc-transaction-pool
+ bump: minor
+ - name: polkadot-statement-distribution
+ bump: minor
+ - name: polkadot-dispute-distribution
+ bump: minor
+ - name: cumulus-relay-chain-rpc-interface
+ bump: minor
diff --git a/substrate/client/network/src/litep2p/mod.rs b/substrate/client/network/src/litep2p/mod.rs
index 34ca5b716101f..c2f8ec1dd12c5 100644
--- a/substrate/client/network/src/litep2p/mod.rs
+++ b/substrate/client/network/src/litep2p/mod.rs
@@ -39,7 +39,6 @@ use crate::{
},
},
peer_store::PeerStoreProvider,
- protocol,
service::{
metrics::{register_without_sources, MetricSources, Metrics, NotificationMetrics},
out_events,
@@ -269,6 +268,7 @@ impl Litep2pNetworkBackend {
};
let config_builder = ConfigBuilder::new();
+<<<<<<< HEAD
// The yamux buffer size limit is configured to be equal to the maximum frame size
// of all protocols. 10 bytes are added to each limit for the length prefix that
// is not included in the upper layer protocols limit but is still present in the
@@ -320,6 +320,8 @@ impl Litep2pNetworkBackend {
yamux_config
};
+=======
+>>>>>>> 42e9de7 (net/litep2p: Bring the latest compatibility fixes via v0.9.1 (#7640))
let (tcp, websocket): (Vec