diff --git a/Cargo.lock b/Cargo.lock
index 4ba28488c4048..9e9790ef5f38d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -564,6 +564,24 @@ dependencies = [
 ]
 
 [[package]]
+<<<<<<< HEAD
+=======
+name = "ark-secret-scalar"
+version = "0.0.2"
+source = "git+https://github.com/davxy/ring-vrf?branch=locked#c64ae9b1aad7755ae1bf88016002365ffcc4912e"
+dependencies = [
+ "ark-ec",
+ "ark-ff 0.4.2",
+ "ark-serialize 0.4.2",
+ "ark-std 0.4.0",
+ "ark-transcript 0.0.2 (git+https://github.com/davxy/ring-vrf?branch=locked)",
+ "digest 0.10.7",
+ "getrandom_or_panic",
+ "zeroize",
+]
+
+[[package]]
+>>>>>>> 21f6f070 (Bandersnatch hot fix (#7670))
 name = "ark-serialize"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -618,6 +636,35 @@ dependencies = [
 ]
 
 [[package]]
+<<<<<<< HEAD
+=======
+name = "ark-transcript"
+version = "0.0.2"
+source = "git+https://github.com/davxy/ring-vrf?branch=locked#c64ae9b1aad7755ae1bf88016002365ffcc4912e"
+dependencies = [
+ "ark-ff 0.4.2",
+ "ark-serialize 0.4.2",
+ "ark-std 0.4.0",
+ "digest 0.10.7",
+ "rand_core 0.6.4",
+ "sha3 0.10.8",
+]
+
+[[package]]
+name = "ark-transcript"
+version = "0.0.2"
+source = "git+https://github.com/w3f/ark-transcript?rev=288e49d#288e49ddba6f8f8e67be6822715afe36b11c4e65"
+dependencies = [
+ "ark-ff 0.4.2",
+ "ark-serialize 0.4.2",
+ "ark-std 0.4.0",
+ "digest 0.10.7",
+ "rand_core 0.6.4",
+ "sha3 0.10.8",
+]
+
+[[package]]
+>>>>>>> 21f6f070 (Bandersnatch hot fix (#7670))
 name = "array-bytes"
 version = "6.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1367,6 +1414,30 @@ dependencies = [
 ]
 
 [[package]]
+<<<<<<< HEAD
+=======
+name = "bandersnatch_vrfs"
+version = "0.0.4"
+source = "git+https://github.com/davxy/ring-vrf?branch=locked#c64ae9b1aad7755ae1bf88016002365ffcc4912e"
+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]]
+>>>>>>> 21f6f070 (Bandersnatch hot fix (#7670))
 name = "base-x"
 version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3047,6 +3118,23 @@ dependencies = [
 ]
 
 [[package]]
+<<<<<<< HEAD
+=======
+name = "common"
+version = "0.1.0"
+source = "git+https://github.com/davxy/ring-proof?branch=locked#a24b371b8d51725ac2ce195aa3369b31df6c9873"
+dependencies = [
+ "ark-ec",
+ "ark-ff 0.4.2",
+ "ark-poly",
+ "ark-serialize 0.4.2",
+ "ark-std 0.4.0",
+ "fflonk",
+ "getrandom_or_panic",
+]
+
+[[package]]
+>>>>>>> 21f6f070 (Bandersnatch hot fix (#7670))
 name = "common-path"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -4215,6 +4303,17 @@ dependencies = [
  "sp-maybe-compressed-blob",
  "tracing",
  "tracing-subscriber",
+<<<<<<< HEAD
+=======
+]
+
+[[package]]
+name = "cumulus-primitives-aura"
+version = "0.7.0"
+dependencies = [
+ "sp-api 26.0.0",
+ "sp-consensus-aura 0.32.0",
+>>>>>>> 21f6f070 (Bandersnatch hot fix (#7670))
 ]
 
 [[package]]
@@ -4954,6 +5053,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632"
 
 [[package]]
+<<<<<<< HEAD
+=======
+name = "dleq_vrf"
+version = "0.0.2"
+source = "git+https://github.com/davxy/ring-vrf?branch=locked#c64ae9b1aad7755ae1bf88016002365ffcc4912e"
+dependencies = [
+ "ark-ec",
+ "ark-ff 0.4.2",
+ "ark-scale",
+ "ark-secret-scalar",
+ "ark-serialize 0.4.2",
+ "ark-std 0.4.0",
+ "ark-transcript 0.0.2 (git+https://github.com/davxy/ring-vrf?branch=locked)",
+ "arrayvec 0.7.4",
+ "zeroize",
+]
+
+[[package]]
+>>>>>>> 21f6f070 (Bandersnatch hot fix (#7670))
 name = "dlmalloc"
 version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -5328,7 +5446,11 @@ checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f"
 dependencies = [
  "errno-dragonfly",
  "libc",
+<<<<<<< HEAD
  "windows-sys 0.48.0",
+=======
+ "windows-sys 0.52.0",
+>>>>>>> 21f6f070 (Bandersnatch hot fix (#7670))
 ]
 
 [[package]]
@@ -5542,6 +5664,22 @@ dependencies = [
 ]
 
 [[package]]
+<<<<<<< HEAD
+=======
+name = "fflonk"
+version = "0.1.0"
+source = "git+https://github.com/w3f/fflonk?rev=1e854f3#1e854f35e9a65d08b11a86291405cdc95baa0a35"
+dependencies = [
+ "ark-ec",
+ "ark-ff 0.4.2",
+ "ark-poly",
+ "ark-serialize 0.4.2",
+ "ark-std 0.4.0",
+ "merlin",
+]
+
+[[package]]
+>>>>>>> 21f6f070 (Bandersnatch hot fix (#7670))
 name = "fiat-crypto"
 version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -5925,8 +6063,16 @@ dependencies = [
  "frame-benchmarking-cli",
  "log",
  "sc-cli",
+<<<<<<< HEAD
  "sp-runtime",
  "sp-statement-store",
+=======
+ "sp-genesis-builder 0.8.0",
+ "sp-runtime 31.0.1",
+ "sp-statement-store 10.0.0",
+ "sp-tracing 16.0.0",
+ "tempfile",
+>>>>>>> 21f6f070 (Bandersnatch hot fix (#7670))
  "tracing-subscriber",
 ]
 
@@ -12269,8 +12415,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.5.1",
+>>>>>>> 21f6f070 (Bandersnatch hot fix (#7670))
  "serde",
  "unicode-normalization",
 ]
@@ -16450,6 +16601,26 @@ dependencies = [
 
 [[package]]
 name = "ring"
+<<<<<<< HEAD
+=======
+version = "0.1.0"
+source = "git+https://github.com/davxy/ring-proof?branch=locked#a24b371b8d51725ac2ce195aa3369b31df6c9873"
+dependencies = [
+ "ark-ec",
+ "ark-ff 0.4.2",
+ "ark-poly",
+ "ark-serialize 0.4.2",
+ "ark-std 0.4.0",
+ "ark-transcript 0.0.2 (git+https://github.com/w3f/ark-transcript?rev=288e49d)",
+ "arrayvec 0.7.4",
+ "blake2 0.10.6",
+ "common",
+ "fflonk",
+]
+
+[[package]]
+name = "ring"
+>>>>>>> 21f6f070 (Bandersnatch hot fix (#7670))
 version = "0.16.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
@@ -16916,8 +17087,13 @@ dependencies = [
  "bitflags 2.6.0",
  "errno",
  "libc",
+<<<<<<< HEAD
  "linux-raw-sys 0.4.10",
  "windows-sys 0.48.0",
+=======
+ "linux-raw-sys 0.4.14",
+ "windows-sys 0.52.0",
+>>>>>>> 21f6f070 (Bandersnatch hot fix (#7670))
 ]
 
 [[package]]
@@ -20049,7 +20225,40 @@ dependencies = [
  "fraction",
  "honggfuzz",
  "num-bigint",
+<<<<<<< HEAD
  "sp-arithmetic",
+=======
+ "sp-arithmetic 23.0.0",
+]
+
+[[package]]
+name = "sp-ark-bls12-381"
+version = "0.4.2"
+source = "git+https://github.com/paritytech/arkworks-substrate?rev=caa2eed#caa2eed74beb885dd07c7db5f916f2281dad818f"
+dependencies = [
+ "ark-bls12-381-ext",
+ "sp-crypto-ec-utils 0.10.0 (git+https://github.com/paritytech/polkadot-sdk)",
+]
+
+[[package]]
+name = "sp-ark-ed-on-bls12-381-bandersnatch"
+version = "0.4.2"
+source = "git+https://github.com/paritytech/arkworks-substrate?rev=caa2eed#caa2eed74beb885dd07c7db5f916f2281dad818f"
+dependencies = [
+ "ark-ed-on-bls12-381-bandersnatch-ext",
+ "sp-crypto-ec-utils 0.10.0 (git+https://github.com/paritytech/polkadot-sdk)",
+]
+
+[[package]]
+name = "sp-authority-discovery"
+version = "26.0.0"
+dependencies = [
+ "parity-scale-codec",
+ "scale-info",
+ "sp-api 26.0.0",
+ "sp-application-crypto 30.0.0",
+ "sp-runtime 31.0.1",
+>>>>>>> 21f6f070 (Bandersnatch hot fix (#7670))
 ]
 
 [[package]]
@@ -20265,7 +20474,50 @@ dependencies = [
 name = "sp-core-hashing-proc-macro"
 version = "16.0.0"
 dependencies = [
+<<<<<<< HEAD
  "sp-crypto-hashing-proc-macro",
+=======
+ "sp-crypto-hashing-proc-macro 0.1.0",
+]
+
+[[package]]
+name = "sp-crypto-ec-utils"
+version = "0.10.0"
+dependencies = [
+ "ark-bls12-377",
+ "ark-bls12-377-ext",
+ "ark-bls12-381",
+ "ark-bls12-381-ext",
+ "ark-bw6-761",
+ "ark-bw6-761-ext",
+ "ark-ec",
+ "ark-ed-on-bls12-377",
+ "ark-ed-on-bls12-377-ext",
+ "ark-ed-on-bls12-381-bandersnatch",
+ "ark-ed-on-bls12-381-bandersnatch-ext",
+ "ark-scale",
+ "sp-runtime-interface 24.0.0",
+>>>>>>> 21f6f070 (Bandersnatch hot fix (#7670))
+]
+
+[[package]]
+name = "sp-crypto-ec-utils"
+version = "0.10.0"
+source = "git+https://github.com/paritytech/polkadot-sdk#934c091421af4be362839996bfaa441ba59bf12b"
+dependencies = [
+ "ark-bls12-377",
+ "ark-bls12-377-ext",
+ "ark-bls12-381",
+ "ark-bls12-381-ext",
+ "ark-bw6-761",
+ "ark-bw6-761-ext",
+ "ark-ec",
+ "ark-ed-on-bls12-377",
+ "ark-ed-on-bls12-377-ext",
+ "ark-ed-on-bls12-381-bandersnatch",
+ "ark-ed-on-bls12-381-bandersnatch-ext",
+ "ark-scale",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk)",
 ]
 
 [[package]]
@@ -20284,7 +20536,11 @@ dependencies = [
  "ark-ed-on-bls12-381-bandersnatch",
  "ark-ed-on-bls12-381-bandersnatch-ext",
  "ark-scale",
+<<<<<<< HEAD
  "sp-runtime-interface",
+=======
+ "sp-runtime-interface 28.0.0",
+>>>>>>> 21f6f070 (Bandersnatch hot fix (#7670))
 ]
 
 [[package]]
@@ -20322,9 +20578,66 @@ dependencies = [
 name = "sp-debug-derive"
 version = "14.0.0"
 dependencies = [
+<<<<<<< HEAD
  "proc-macro2 1.0.82",
  "quote 1.0.37",
  "syn 2.0.65",
+=======
+ "proc-macro2 1.0.93",
+ "quote 1.0.38",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "sp-debug-derive"
+version = "14.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48d09fa0a5f7299fb81ee25ae3853d26200f7a348148aed6de76be905c007dbe"
+dependencies = [
+ "proc-macro2 1.0.93",
+ "quote 1.0.38",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "sp-debug-derive"
+version = "14.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk#934c091421af4be362839996bfaa441ba59bf12b"
+dependencies = [
+ "proc-macro2 1.0.93",
+ "quote 1.0.38",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "sp-externalities"
+version = "0.25.0"
+dependencies = [
+ "environmental",
+ "parity-scale-codec",
+ "sp-storage 19.0.0",
+]
+
+[[package]]
+name = "sp-externalities"
+version = "0.25.0"
+source = "git+https://github.com/paritytech/polkadot-sdk#934c091421af4be362839996bfaa441ba59bf12b"
+dependencies = [
+ "environmental",
+ "parity-scale-codec",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk)",
+]
+
+[[package]]
+name = "sp-externalities"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33abaec4be69b1613796bbf430decbbcaaf978756379e2016e683a4d6379cd02"
+dependencies = [
+ "environmental",
+ "parity-scale-codec",
+ "sp-storage 21.0.0",
+>>>>>>> 21f6f070 (Bandersnatch hot fix (#7670))
 ]
 
 [[package]]
@@ -20534,8 +20847,152 @@ 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 = "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 = "24.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk#934c091421af4be362839996bfaa441ba59bf12b"
+dependencies = [
+ "bytes",
+ "impl-trait-for-tuples",
+ "parity-scale-codec",
+ "polkavm-derive 0.18.0",
+ "primitive-types 0.13.1",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk)",
+ "sp-runtime-interface-proc-macro 17.0.0 (git+https://github.com/paritytech/polkadot-sdk)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk)",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk)",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk)",
+ "static_assertions",
+]
+
+[[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]]
+>>>>>>> 21f6f070 (Bandersnatch hot fix (#7670))
+name = "sp-runtime-interface"
 version = "28.0.0"
 dependencies = [
  "bytes",
@@ -20555,7 +21012,55 @@ dependencies = [
  "sp-tracing",
  "sp-wasm-interface",
  "static_assertions",
+<<<<<<< HEAD
  "trybuild",
+=======
+]
+
+[[package]]
+name = "sp-runtime-interface"
+version = "29.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51e83d940449837a8b2a01b4d877dd22d896fd14d3d3ade875787982da994a33"
+dependencies = [
+ "bytes",
+ "impl-trait-for-tuples",
+ "parity-scale-codec",
+ "polkavm-derive 0.9.1",
+ "primitive-types 0.13.1",
+ "sp-externalities 0.30.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 22.0.0",
+ "sp-tracing 17.0.1",
+ "sp-wasm-interface 21.0.1",
+ "static_assertions",
+]
+
+[[package]]
+name = "sp-runtime-interface-proc-macro"
+version = "17.0.0"
+dependencies = [
+ "Inflector",
+ "expander",
+ "proc-macro-crate 3.1.0",
+ "proc-macro2 1.0.93",
+ "quote 1.0.38",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "sp-runtime-interface-proc-macro"
+version = "17.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk#934c091421af4be362839996bfaa441ba59bf12b"
+dependencies = [
+ "Inflector",
+ "expander",
+ "proc-macro-crate 3.1.0",
+ "proc-macro2 1.0.93",
+ "quote 1.0.38",
+ "syn 2.0.98",
+>>>>>>> 21f6f070 (Bandersnatch hot fix (#7670))
 ]
 
 [[package]]
@@ -20683,6 +21188,43 @@ dependencies = [
 name = "sp-std"
 version = "14.0.0"
 
+[[package]]
+<<<<<<< HEAD
+=======
+name = "sp-std"
+version = "14.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12f8ee986414b0a9ad741776762f4083cd3a5128449b982a3919c4df36874834"
+
+[[package]]
+name = "sp-std"
+version = "14.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk#934c091421af4be362839996bfaa441ba59bf12b"
+
+[[package]]
+name = "sp-storage"
+version = "19.0.0"
+dependencies = [
+ "impl-serde 0.5.0",
+ "parity-scale-codec",
+ "ref-cast",
+ "serde",
+ "sp-debug-derive 14.0.0",
+]
+
+[[package]]
+>>>>>>> 21f6f070 (Bandersnatch hot fix (#7670))
+name = "sp-storage"
+version = "19.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk#934c091421af4be362839996bfaa441ba59bf12b"
+dependencies = [
+ "impl-serde 0.5.0",
+ "parity-scale-codec",
+ "ref-cast",
+ "serde",
+ "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk)",
+]
+
 [[package]]
 name = "sp-storage"
 version = "21.0.0"
@@ -20712,9 +21254,36 @@ 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",
+]
+
+[[package]]
+name = "sp-tracing"
+version = "16.0.0"
+dependencies = [
+ "parity-scale-codec",
+ "tracing",
+ "tracing-core",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "sp-tracing"
+version = "16.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk#934c091421af4be362839996bfaa441ba59bf12b"
+dependencies = [
+ "parity-scale-codec",
+ "tracing",
+ "tracing-core",
+ "tracing-subscriber",
+>>>>>>> 21f6f070 (Bandersnatch hot fix (#7670))
 ]
 
 [[package]]
@@ -20725,6 +21294,17 @@ dependencies = [
  "tracing",
  "tracing-core",
  "tracing-subscriber",
+<<<<<<< HEAD
+=======
+]
+
+[[package]]
+name = "sp-transaction-pool"
+version = "26.0.0"
+dependencies = [
+ "sp-api 26.0.0",
+ "sp-runtime 31.0.1",
+>>>>>>> 21f6f070 (Bandersnatch hot fix (#7670))
 ]
 
 [[package]]
@@ -20796,10 +21376,38 @@ name = "sp-version-proc-macro"
 version = "14.0.0"
 dependencies = [
  "parity-scale-codec",
+<<<<<<< HEAD
  "proc-macro2 1.0.82",
  "quote 1.0.37",
  "sp-version",
  "syn 2.0.65",
+=======
+ "proc-macro2 1.0.93",
+ "quote 1.0.38",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "sp-wasm-interface"
+version = "20.0.0"
+dependencies = [
+ "anyhow",
+ "impl-trait-for-tuples",
+ "log",
+ "parity-scale-codec",
+ "wasmtime",
+>>>>>>> 21f6f070 (Bandersnatch hot fix (#7670))
+]
+
+[[package]]
+name = "sp-wasm-interface"
+version = "20.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk#934c091421af4be362839996bfaa441ba59bf12b"
+dependencies = [
+ "anyhow",
+ "impl-trait-for-tuples",
+ "log",
+ "parity-scale-codec",
 ]
 
 [[package]]
@@ -21789,10 +22397,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5"
 dependencies = [
  "cfg-if",
+<<<<<<< HEAD
  "fastrand 2.1.0",
  "redox_syscall 0.4.1",
  "rustix 0.38.21",
  "windows-sys 0.48.0",
+=======
+ "fastrand 2.3.0",
+ "once_cell",
+ "rustix 0.38.42",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "template-zombienet-tests"
+version = "0.0.0"
+dependencies = [
+ "anyhow",
+ "env_logger 0.11.3",
+ "log",
+ "tokio",
+ "zombienet-sdk",
+>>>>>>> 21f6f070 (Bandersnatch hot fix (#7670))
 ]
 
 [[package]]
@@ -22438,9 +23064,15 @@ dependencies = [
  "assert_matches",
  "expander",
  "proc-macro-crate 3.1.0",
+<<<<<<< HEAD
  "proc-macro2 1.0.82",
  "quote 1.0.37",
  "syn 2.0.65",
+=======
+ "proc-macro2 1.0.93",
+ "quote 1.0.38",
+ "syn 2.0.98",
+>>>>>>> 21f6f070 (Bandersnatch hot fix (#7670))
 ]
 
 [[package]]
diff --git a/substrate/frame/sassafras/src/data/25_tickets_100_auths.bin b/substrate/frame/sassafras/src/data/25_tickets_100_auths.bin
index 6e81f216455ae..4c50b06ad9f9c 100644
Binary files a/substrate/frame/sassafras/src/data/25_tickets_100_auths.bin and b/substrate/frame/sassafras/src/data/25_tickets_100_auths.bin differ
diff --git a/substrate/primitives/core/Cargo.toml b/substrate/primitives/core/Cargo.toml
index d76079aba5fdc..1bd44355915c7 100644
--- a/substrate/primitives/core/Cargo.toml
+++ b/substrate/primitives/core/Cargo.toml
@@ -62,6 +62,13 @@ secp256k1 = { features = ["alloc", "recovery"], optional = true, workspace = tru
 
 # bls crypto
 w3f-bls = { optional = true, workspace = true }
+<<<<<<< HEAD
+=======
+# bandersnatch crypto
+bandersnatch_vrfs = { git = "https://github.com/davxy/ring-vrf", branch = "locked", default-features = false, features = [
+	"substrate-curves",
+], optional = true }
+>>>>>>> 21f6f070 (Bandersnatch hot fix (#7670))
 
 [dev-dependencies]
 criterion = { workspace = true, default-features = true }