Skip to content
Snippets Groups Projects
Unverified Commit 21f6f070 authored by Davide Galassi's avatar Davide Galassi Committed by GitHub
Browse files

Bandersnatch hot fix (#7670) 


Essentially, this locks `bandersnatch_vrfs` to a specific branch of a
repository I control. This is a temporary workaround to avoid issues
like https://github.com/paritytech/polkadot-sdk/issues/7653 until
https://github.com/paritytech/polkadot-sdk/pull/7669 is ready.

Closes: https://github.com/paritytech/polkadot-sdk/issues/7653 

@drskalman

---------

Co-authored-by: default avatarOliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
parent f385a3ed
Branches gh-readonly-queue/master/pr-7670-f385a3ed8494e11323dd97a071aac602edaa536f
No related merge requests found
Pipeline #516488 waiting for manual action with stages
in 1 hour, 21 minutes, and 46 seconds
Hide whitespace changes
Inline Side-by-side
Cargo.lock
+ 94
− 153
View file @ 21f6f070
......@@ -698,20 +698,6 @@ dependencies = [
"hashbrown 0.13.2",
]
 
[[package]]
name = "ark-scale"
version = "0.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51bd73bb6ddb72630987d37fa963e99196896c0d0ea81b7c894567e74a2f83af"
dependencies = [
"ark-ec",
"ark-ff 0.4.2",
"ark-serialize 0.4.2",
"ark-std 0.4.0",
"parity-scale-codec",
"scale-info",
]
[[package]]
name = "ark-scale"
version = "0.0.12"
......@@ -729,13 +715,13 @@ dependencies = [
[[package]]
name = "ark-secret-scalar"
version = "0.0.2"
source = "git+https://github.com/w3f/ring-vrf?rev=0fef826#0fef8266d851932ad25d6b41bc4b34d834d1e11d"
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",
"ark-transcript 0.0.2 (git+https://github.com/davxy/ring-vrf?branch=locked)",
"digest 0.10.7",
"getrandom_or_panic",
"zeroize",
......@@ -798,7 +784,20 @@ dependencies = [
[[package]]
name = "ark-transcript"
version = "0.0.2"
source = "git+https://github.com/w3f/ring-vrf?rev=0fef826#0fef8266d851932ad25d6b41bc4b34d834d1e11d"
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",
......@@ -1715,7 +1714,7 @@ dependencies = [
[[package]]
name = "bandersnatch_vrfs"
version = "0.0.4"
source = "git+https://github.com/w3f/ring-vrf?rev=0fef826#0fef8266d851932ad25d6b41bc4b34d834d1e11d"
source = "git+https://github.com/davxy/ring-vrf?branch=locked#c64ae9b1aad7755ae1bf88016002365ffcc4912e"
dependencies = [
"ark-bls12-381",
"ark-ec",
......@@ -3828,7 +3827,7 @@ dependencies = [
[[package]]
name = "common"
version = "0.1.0"
source = "git+https://github.com/w3f/ring-proof?rev=665f5f5#665f5f51af5734c7b6d90b985dd6861d4c5b4752"
source = "git+https://github.com/davxy/ring-proof?branch=locked#a24b371b8d51725ac2ce195aa3369b31df6c9873"
dependencies = [
"ark-ec",
"ark-ff 0.4.2",
......@@ -3837,8 +3836,6 @@ dependencies = [
"ark-std 0.4.0",
"fflonk",
"getrandom_or_panic",
"merlin",
"rand_chacha 0.3.1",
]
 
[[package]]
......@@ -5289,7 +5286,7 @@ dependencies = [
"sp-io 30.0.0",
"sp-maybe-compressed-blob 11.0.0",
"tracing",
"tracing-subscriber 0.3.18",
"tracing-subscriber",
]
 
[[package]]
......@@ -6240,15 +6237,15 @@ checksum = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632"
[[package]]
name = "dleq_vrf"
version = "0.0.2"
source = "git+https://github.com/w3f/ring-vrf?rev=0fef826#0fef8266d851932ad25d6b41bc4b34d834d1e11d"
source = "git+https://github.com/davxy/ring-vrf?branch=locked#c64ae9b1aad7755ae1bf88016002365ffcc4912e"
dependencies = [
"ark-ec",
"ark-ff 0.4.2",
"ark-scale 0.0.12",
"ark-scale",
"ark-secret-scalar",
"ark-serialize 0.4.2",
"ark-std 0.4.0",
"ark-transcript",
"ark-transcript 0.0.2 (git+https://github.com/davxy/ring-vrf?branch=locked)",
"arrayvec 0.7.4",
"zeroize",
]
......@@ -6650,7 +6647,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
dependencies = [
"libc",
"windows-sys 0.59.0",
"windows-sys 0.52.0",
]
 
[[package]]
......@@ -6919,7 +6916,7 @@ dependencies = [
[[package]]
name = "fflonk"
version = "0.1.0"
source = "git+https://github.com/w3f/fflonk#1e854f35e9a65d08b11a86291405cdc95baa0a35"
source = "git+https://github.com/w3f/fflonk?rev=1e854f3#1e854f35e9a65d08b11a86291405cdc95baa0a35"
dependencies = [
"ark-ec",
"ark-ff 0.4.2",
......@@ -7511,7 +7508,7 @@ dependencies = [
"sp-statement-store 10.0.0",
"sp-tracing 16.0.0",
"tempfile",
"tracing-subscriber 0.3.18",
"tracing-subscriber",
]
 
[[package]]
......@@ -10864,15 +10861,6 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4"
 
[[package]]
name = "matchers"
version = "0.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1"
dependencies = [
"regex-automata 0.1.10",
]
[[package]]
name = "matchers"
version = "0.1.0"
......@@ -16711,7 +16699,7 @@ checksum = "4e69bf016dc406eff7d53a7d3f7cf1c2e72c82b9088aac1118591e36dd2cd3e9"
dependencies = [
"bitcoin_hashes 0.13.0",
"rand 0.8.5",
"rand_core 0.6.4",
"rand_core 0.5.1",
"serde",
"unicode-normalization",
]
......@@ -21743,18 +21731,18 @@ dependencies = [
[[package]]
name = "ring"
version = "0.1.0"
source = "git+https://github.com/w3f/ring-proof?rev=665f5f5#665f5f51af5734c7b6d90b985dd6861d4c5b4752"
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",
"merlin",
]
 
[[package]]
......@@ -22281,7 +22269,7 @@ dependencies = [
"errno",
"libc",
"linux-raw-sys 0.4.14",
"windows-sys 0.59.0",
"windows-sys 0.52.0",
]
 
[[package]]
......@@ -23195,7 +23183,7 @@ dependencies = [
"substrate-test-runtime",
"tempfile",
"tracing",
"tracing-subscriber 0.3.18",
"tracing-subscriber",
"wat",
]
 
......@@ -24123,8 +24111,8 @@ dependencies = [
"sp-tracing 16.0.0",
"thiserror 1.0.65",
"tracing",
"tracing-log 0.2.0",
"tracing-subscriber 0.3.18",
"tracing-log",
"tracing-subscriber",
]
 
[[package]]
......@@ -26232,19 +26220,19 @@ dependencies = [
[[package]]
name = "sp-ark-bls12-381"
version = "0.4.2"
source = "git+https://github.com/paritytech/arkworks-substrate#caa2eed74beb885dd07c7db5f916f2281dad818f"
source = "git+https://github.com/paritytech/arkworks-substrate?rev=caa2eed#caa2eed74beb885dd07c7db5f916f2281dad818f"
dependencies = [
"ark-bls12-381-ext",
"sp-crypto-ec-utils 0.4.1",
"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#caa2eed74beb885dd07c7db5f916f2281dad818f"
source = "git+https://github.com/paritytech/arkworks-substrate?rev=caa2eed#caa2eed74beb885dd07c7db5f916f2281dad818f"
dependencies = [
"ark-ed-on-bls12-381-bandersnatch-ext",
"sp-crypto-ec-utils 0.4.1",
"sp-crypto-ec-utils 0.10.0 (git+https://github.com/paritytech/polkadot-sdk)",
]
 
[[package]]
......@@ -26798,8 +26786,7 @@ dependencies = [
 
[[package]]
name = "sp-crypto-ec-utils"
version = "0.4.1"
source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f"
version = "0.10.0"
dependencies = [
"ark-bls12-377",
"ark-bls12-377-ext",
......@@ -26812,14 +26799,14 @@ dependencies = [
"ark-ed-on-bls12-377-ext",
"ark-ed-on-bls12-381-bandersnatch",
"ark-ed-on-bls12-381-bandersnatch-ext",
"ark-scale 0.0.11",
"sp-runtime-interface 17.0.0",
"sp-std 8.0.0",
"ark-scale",
"sp-runtime-interface 24.0.0",
]
 
[[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",
......@@ -26832,8 +26819,8 @@ dependencies = [
"ark-ed-on-bls12-377-ext",
"ark-ed-on-bls12-381-bandersnatch",
"ark-ed-on-bls12-381-bandersnatch-ext",
"ark-scale 0.0.12",
"sp-runtime-interface 24.0.0",
"ark-scale",
"sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk)",
]
 
[[package]]
......@@ -26853,7 +26840,7 @@ dependencies = [
"ark-ed-on-bls12-377-ext",
"ark-ed-on-bls12-381-bandersnatch",
"ark-ed-on-bls12-381-bandersnatch-ext",
"ark-scale 0.0.12",
"ark-scale",
"sp-runtime-interface 28.0.0",
]
 
......@@ -26915,8 +26902,7 @@ dependencies = [
 
[[package]]
name = "sp-debug-derive"
version = "8.0.0"
source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f"
version = "14.0.0"
dependencies = [
"proc-macro2 1.0.93",
"quote 1.0.38",
......@@ -26926,6 +26912,8 @@ dependencies = [
[[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",
......@@ -26935,8 +26923,7 @@ dependencies = [
[[package]]
name = "sp-debug-derive"
version = "14.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "48d09fa0a5f7299fb81ee25ae3853d26200f7a348148aed6de76be905c007dbe"
source = "git+https://github.com/paritytech/polkadot-sdk#934c091421af4be362839996bfaa441ba59bf12b"
dependencies = [
"proc-macro2 1.0.93",
"quote 1.0.38",
......@@ -26945,22 +26932,21 @@ dependencies = [
 
[[package]]
name = "sp-externalities"
version = "0.19.0"
source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f"
version = "0.25.0"
dependencies = [
"environmental",
"parity-scale-codec",
"sp-std 8.0.0",
"sp-storage 13.0.0",
"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",
"sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk)",
]
 
[[package]]
......@@ -27516,24 +27502,6 @@ dependencies = [
"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"
......@@ -27558,6 +27526,25 @@ dependencies = [
"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"
......@@ -27620,11 +27607,11 @@ dependencies = [
 
[[package]]
name = "sp-runtime-interface-proc-macro"
version = "11.0.0"
source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f"
version = "17.0.0"
dependencies = [
"Inflector",
"proc-macro-crate 1.3.1",
"expander",
"proc-macro-crate 3.1.0",
"proc-macro2 1.0.93",
"quote 1.0.38",
"syn 2.0.98",
......@@ -27633,6 +27620,7 @@ dependencies = [
[[package]]
name = "sp-runtime-interface-proc-macro"
version = "17.0.0"
source = "git+https://github.com/paritytech/polkadot-sdk#934c091421af4be362839996bfaa441ba59bf12b"
dependencies = [
"Inflector",
"expander",
......@@ -27898,41 +27886,40 @@ dependencies = [
 
[[package]]
name = "sp-std"
version = "8.0.0"
source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f"
version = "14.0.0"
 
[[package]]
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 = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12f8ee986414b0a9ad741776762f4083cd3a5128449b982a3919c4df36874834"
source = "git+https://github.com/paritytech/polkadot-sdk#934c091421af4be362839996bfaa441ba59bf12b"
 
[[package]]
name = "sp-storage"
version = "13.0.0"
source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f"
version = "19.0.0"
dependencies = [
"impl-serde 0.4.0",
"impl-serde 0.5.0",
"parity-scale-codec",
"ref-cast",
"serde",
"sp-debug-derive 8.0.0",
"sp-std 8.0.0",
"sp-debug-derive 14.0.0",
]
 
[[package]]
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",
"sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk)",
]
 
[[package]]
......@@ -27999,24 +27986,23 @@ dependencies = [
 
[[package]]
name = "sp-tracing"
version = "10.0.0"
source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f"
version = "16.0.0"
dependencies = [
"parity-scale-codec",
"sp-std 8.0.0",
"tracing",
"tracing-core",
"tracing-subscriber 0.2.25",
"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 0.3.18",
"tracing-subscriber",
]
 
[[package]]
......@@ -28028,7 +28014,7 @@ dependencies = [
"parity-scale-codec",
"tracing",
"tracing-core",
"tracing-subscriber 0.3.18",
"tracing-subscriber",
]
 
[[package]]
......@@ -28253,26 +28239,24 @@ dependencies = [
 
[[package]]
name = "sp-wasm-interface"
version = "14.0.0"
source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f"
version = "20.0.0"
dependencies = [
"anyhow",
"impl-trait-for-tuples",
"log",
"parity-scale-codec",
"sp-std 8.0.0",
"wasmtime",
]
 
[[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",
"wasmtime",
]
 
[[package]]
......@@ -29866,7 +29850,7 @@ dependencies = [
"fastrand 2.3.0",
"once_cell",
"rustix 0.38.42",
"windows-sys 0.59.0",
"windows-sys 0.52.0",
]
 
[[package]]
......@@ -29913,7 +29897,7 @@ checksum = "3dffced63c2b5c7be278154d76b479f9f9920ed34e7574201407f0b14e2bbb93"
dependencies = [
"env_logger 0.11.3",
"test-log-macros",
"tracing-subscriber 0.3.18",
"tracing-subscriber",
]
 
[[package]]
......@@ -30617,17 +30601,6 @@ dependencies = [
"syn 2.0.98",
]
 
[[package]]
name = "tracing-log"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
dependencies = [
"lazy_static",
"log",
"tracing-core",
]
[[package]]
name = "tracing-log"
version = "0.2.0"
......@@ -30639,38 +30612,6 @@ dependencies = [
"tracing-core",
]
 
[[package]]
name = "tracing-serde"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1"
dependencies = [
"serde",
"tracing-core",
]
[[package]]
name = "tracing-subscriber"
version = "0.2.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71"
dependencies = [
"ansi_term",
"chrono",
"lazy_static",
"matchers 0.0.1",
"regex",
"serde",
"serde_json",
"sharded-slab",
"smallvec",
"thread_local",
"tracing",
"tracing-core",
"tracing-log 0.1.3",
"tracing-serde",
]
[[package]]
name = "tracing-subscriber"
version = "0.3.18"
......@@ -30678,7 +30619,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
dependencies = [
"chrono",
"matchers 0.1.0",
"matchers",
"nu-ansi-term",
"once_cell",
"parking_lot 0.12.3",
......@@ -30689,7 +30630,7 @@ dependencies = [
"time",
"tracing",
"tracing-core",
"tracing-log 0.2.0",
"tracing-log",
]
 
[[package]]
......
substrate/frame/sassafras/src/data/25_tickets_100_auths.bin
+ 0
− 0
View file @ 21f6f070
No preview for this file type
substrate/primitives/core/Cargo.toml
+ 1
− 1
View file @ 21f6f070
......@@ -70,7 +70,7 @@ secp256k1 = { features = [
# bls crypto
w3f-bls = { optional = true, workspace = true }
# bandersnatch crypto
bandersnatch_vrfs = { git = "https://github.com/w3f/ring-vrf", rev = "0fef826", default-features = false, features = [
bandersnatch_vrfs = { git = "https://github.com/davxy/ring-vrf", branch = "locked", default-features = false, features = [
"substrate-curves",
], optional = true }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment