From 1a08f16c1c53777889a2fde2a3613b96dd38f1fb Mon Sep 17 00:00:00 2001
From: Michal Swietek <michal.swietek@cardinals.cc>
Date: Tue, 20 Dec 2022 12:47:35 +0100
Subject: [PATCH 1/7] bump versions

---
 Cargo.lock                | 379 +++++++++++++++++++++-----------------
 aggregator/Cargo.toml     |   6 +-
 finality-aleph/Cargo.toml |  12 +-
 3 files changed, 220 insertions(+), 177 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ec085b1b6c..9ca70677ca 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -18,7 +18,16 @@ version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b"
 dependencies = [
- "gimli",
+ "gimli 0.26.2",
+]
+
+[[package]]
+name = "addr2line"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
+dependencies = [
+ "gimli 0.27.0",
 ]
 
 [[package]]
@@ -64,10 +73,10 @@ dependencies = [
 
 [[package]]
 name = "aggregator"
-version = "0.1.0"
-source = "git+https://github.com/Cardinal-Cryptography/aleph-node.git?tag=aggregator-v0.1.0#5e7e4300e92b2b4c6fd18acd2f430b83e6e28903"
+version = "0.2.0"
+source = "git+https://github.com/Cardinal-Cryptography/aleph-node.git?tag=aggregator-v0.2.0#95c40fb64bfb741266cf2a424554cc454658befa"
 dependencies = [
- "aleph-bft-rmc 0.4.0",
+ "aleph-bft-rmc 0.5.2",
  "aleph-bft-types 0.6.0",
  "async-trait",
  "futures",
@@ -78,10 +87,10 @@ dependencies = [
 
 [[package]]
 name = "aggregator"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
- "aleph-bft-rmc 0.5.1",
- "aleph-bft-types 0.6.0",
+ "aleph-bft-rmc 0.6.0",
+ "aleph-bft-types 0.7.2",
  "async-trait",
  "futures",
  "log",
@@ -111,12 +120,12 @@ dependencies = [
 
 [[package]]
 name = "aleph-bft"
-version = "0.18.2"
+version = "0.19.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d802f8bc4d40b1acf5c895a27463866eae7537fc30a5f5884cfde7a01464630c"
+checksum = "9cc671f15e05082b6ae350d40d83964fa92e26ead5d1b739f83ce130bd733e2d"
 dependencies = [
- "aleph-bft-rmc 0.4.0",
- "aleph-bft-types 0.6.0",
+ "aleph-bft-rmc 0.5.2",
+ "aleph-bft-types 0.7.2",
  "async-trait",
  "derivative",
  "futures",
@@ -130,11 +139,11 @@ dependencies = [
 
 [[package]]
 name = "aleph-bft"
-version = "0.19.3"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cc671f15e05082b6ae350d40d83964fa92e26ead5d1b739f83ce130bd733e2d"
+checksum = "afe6617ee3f8a1ae3a3829a669a1c1bf104804feb16241cf8ede472b9fb46066"
 dependencies = [
- "aleph-bft-rmc 0.5.1",
+ "aleph-bft-rmc 0.6.0",
  "aleph-bft-types 0.7.2",
  "async-trait",
  "derivative",
@@ -175,11 +184,11 @@ dependencies = [
 
 [[package]]
 name = "aleph-bft-rmc"
-version = "0.4.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14bb3b9c3729667084ae9c1257e785219e23e1d1ee246f73b18a9457aead6214"
+checksum = "38c317cd1a7c5b9208fd02c8f33ea7a89b55be1181ccc42da45e12dbefb66209"
 dependencies = [
- "aleph-bft-crypto 0.4.0",
+ "aleph-bft-crypto 0.5.2",
  "async-trait",
  "futures",
  "futures-timer",
@@ -189,9 +198,9 @@ dependencies = [
 
 [[package]]
 name = "aleph-bft-rmc"
-version = "0.5.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1190a7b2af2c25bd0f318a9a45c05603e5f93cd170be7da15a10c33f2c8153bc"
+checksum = "2943e65245f82497df76b452b0cb7358687ecfb7cef2d8c0730bfd80ee2e8f42"
 dependencies = [
  "aleph-bft-crypto 0.5.2",
  "async-trait",
@@ -350,9 +359,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.66"
+version = "1.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6"
+checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61"
 
 [[package]]
 name = "approx"
@@ -540,9 +549,9 @@ checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524"
 
 [[package]]
 name = "async-trait"
-version = "0.1.59"
+version = "0.1.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e6e93155431f3931513b243d371981bb2770112b370c82745a1d19d2f99364"
+checksum = "677d1d8ab452a3936018a687b20e6f7cf5363d713b732b8884001317b0e48aa3"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -587,16 +596,16 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "backtrace"
-version = "0.3.66"
+version = "0.3.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7"
+checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca"
 dependencies = [
- "addr2line",
+ "addr2line 0.19.0",
  "cc",
  "cfg-if",
  "libc",
- "miniz_oxide 0.5.4",
- "object",
+ "miniz_oxide",
+ "object 0.30.0",
  "rustc-demangle",
 ]
 
@@ -720,9 +729,9 @@ dependencies = [
 
 [[package]]
 name = "blake2"
-version = "0.10.5"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b12e5fd123190ce1c2e559308a94c9bacad77907d4c6005d9e58fe1a0689e55e"
+checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe"
 dependencies = [
  "digest 0.10.6",
 ]
@@ -916,16 +925,16 @@ checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa"
 dependencies = [
  "camino",
  "cargo-platform",
- "semver 1.0.14",
+ "semver 1.0.16",
  "serde",
  "serde_json",
 ]
 
 [[package]]
 name = "cc"
-version = "1.0.77"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4"
+checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d"
 dependencies = [
  "jobserver",
 ]
@@ -1178,7 +1187,7 @@ dependencies = [
  "cranelift-codegen-shared",
  "cranelift-entity",
  "cranelift-isle",
- "gimli",
+ "gimli 0.26.2",
  "log",
  "regalloc2",
  "smallvec",
@@ -1401,22 +1410,23 @@ dependencies = [
 
 [[package]]
 name = "curve25519-dalek"
-version = "4.0.0-pre.1"
+version = "4.0.0-pre.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4033478fbf70d6acf2655ac70da91ee65852d69daf7a67bf7a2f518fb47aafcf"
+checksum = "67bc65846be335cb20f4e52d49a437b773a2c1fdb42b19fc84e79e6f6771536f"
 dependencies = [
- "byteorder",
- "digest 0.9.0",
- "rand_core 0.6.4",
+ "cfg-if",
+ "fiat-crypto",
+ "packed_simd_2",
+ "platforms 3.0.2",
  "subtle",
  "zeroize",
 ]
 
 [[package]]
 name = "cxx"
-version = "1.0.82"
+version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4a41a86530d0fe7f5d9ea779916b7cadd2d4f9add748b99c2c029cbbdfaf453"
+checksum = "5add3fc1717409d029b20c5b6903fc0c0b02fa6741d820054f4a2efa5e5816fd"
 dependencies = [
  "cc",
  "cxxbridge-flags",
@@ -1426,9 +1436,9 @@ dependencies = [
 
 [[package]]
 name = "cxx-build"
-version = "1.0.82"
+version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06416d667ff3e3ad2df1cd8cd8afae5da26cf9cec4d0825040f88b5ca659a2f0"
+checksum = "b4c87959ba14bc6fbc61df77c3fcfe180fc32b93538c4f1031dd802ccb5f2ff0"
 dependencies = [
  "cc",
  "codespan-reporting",
@@ -1441,15 +1451,15 @@ dependencies = [
 
 [[package]]
 name = "cxxbridge-flags"
-version = "1.0.82"
+version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "820a9a2af1669deeef27cb271f476ffd196a2c4b6731336011e0ba63e2c7cf71"
+checksum = "69a3e162fde4e594ed2b07d0f83c6c67b745e7f28ce58c6df5e6b6bef99dfb59"
 
 [[package]]
 name = "cxxbridge-macro"
-version = "1.0.82"
+version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a08a6e2fcc370a089ad3b4aaf54db3b1b4cee38ddabce5896b33eb693275f470"
+checksum = "3e7e2adeb6a0d4a282e581096b06e1791532b7d576dcde5ccd9382acf55db8e6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1458,9 +1468,9 @@ dependencies = [
 
 [[package]]
 name = "data-encoding"
-version = "2.3.2"
+version = "2.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57"
+checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb"
 
 [[package]]
 name = "data-encoding-macro"
@@ -1615,9 +1625,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
 
 [[package]]
 name = "dtoa"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8a6eee2d5d0d113f015688310da018bd1d864d86bd567c8fca9c266889e1bfa"
+checksum = "c00704156a7de8df8da0911424e30c2049957b0a714542a44e05fe693dd85313"
 
 [[package]]
 name = "dyn-clonable"
@@ -1642,9 +1652,9 @@ dependencies = [
 
 [[package]]
 name = "dyn-clone"
-version = "1.0.9"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f94fa09c2aeea5b8839e414b7b841bf429fd25b9c522116ac97ee87856d88b2"
+checksum = "c9b0705efd4599c15a38151f4721f7bc388306f61084d3bfd50bd07fbca5cb60"
 
 [[package]]
 name = "ecdsa"
@@ -1846,6 +1856,12 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "fiat-crypto"
+version = "0.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a214f5bb88731d436478f3ae1f8a277b62124089ba9fb67f4f93fb100ef73c90"
+
 [[package]]
 name = "file-per-thread-logger"
 version = "0.1.5"
@@ -1858,9 +1874,9 @@ dependencies = [
 
 [[package]]
 name = "filetime"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b9663d381d07ae25dc88dbdf27df458faa83a9b25336bcac83d5e452b5fc9d3"
+checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9"
 dependencies = [
  "cfg-if",
  "libc",
@@ -1872,13 +1888,13 @@ dependencies = [
 name = "finality-aleph"
 version = "0.5.4"
 dependencies = [
- "aggregator 0.1.0",
  "aggregator 0.2.0",
- "aleph-bft 0.18.2",
+ "aggregator 0.3.0",
  "aleph-bft 0.19.3",
+ "aleph-bft 0.20.2",
  "aleph-bft-crypto 0.4.0",
- "aleph-bft-rmc 0.4.0",
- "aleph-bft-rmc 0.5.1",
+ "aleph-bft-rmc 0.5.2",
+ "aleph-bft-rmc 0.6.0",
  "async-trait",
  "bytes",
  "derive_more",
@@ -1961,7 +1977,7 @@ checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
 dependencies = [
  "crc32fast",
  "libz-sys",
- "miniz_oxide 0.6.2",
+ "miniz_oxide",
 ]
 
 [[package]]
@@ -2405,6 +2421,12 @@ dependencies = [
  "stable_deref_trait",
 ]
 
+[[package]]
+name = "gimli"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dec7af912d60cdbd3677c1af9352ebae6fb8394d165568a2234df0fa00f87793"
+
 [[package]]
 name = "glob"
 version = "0.3.0"
@@ -2643,9 +2665,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.23.1"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59df7c4e19c950e6e0e868dcc0a300b09a9b88e9ec55bd879ca819087a77355d"
+checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c"
 dependencies = [
  "http",
  "hyper",
@@ -2823,9 +2845,9 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.5.1"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745"
+checksum = "11b0d96e660696543b251e58030cf9787df56da39dab19ad60eae7353040917e"
 
 [[package]]
 name = "is-terminal"
@@ -2835,7 +2857,7 @@ checksum = "927609f78c2913a6f6ac3c27a4fe87f43e2a35367c0c4b0f8265e8f49a104330"
 dependencies = [
  "hermit-abi 0.2.6",
  "io-lifetimes 1.0.3",
- "rustix 0.36.4",
+ "rustix 0.36.5",
  "windows-sys 0.42.0",
 ]
 
@@ -2850,9 +2872,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"
+checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
 
 [[package]]
 name = "jobserver"
@@ -3097,9 +3119,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.137"
+version = "0.2.138"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
+checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8"
 
 [[package]]
 name = "libloading"
@@ -3111,6 +3133,12 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "libm"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
+
 [[package]]
 name = "libm"
 version = "0.2.6"
@@ -3526,9 +3554,9 @@ dependencies = [
 
 [[package]]
 name = "link-cplusplus"
-version = "1.0.7"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369"
+checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
 dependencies = [
  "cc",
 ]
@@ -3566,9 +3594,9 @@ checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f"
+checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
 
 [[package]]
 name = "lock_api"
@@ -3688,7 +3716,7 @@ version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b20a59d985586e4a5aef64564ac77299f8586d8be6cf9106a5a40207e8908efb"
 dependencies = [
- "rustix 0.36.4",
+ "rustix 0.36.5",
 ]
 
 [[package]]
@@ -3753,15 +3781,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
-[[package]]
-name = "miniz_oxide"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34"
-dependencies = [
- "adler",
-]
-
 [[package]]
 name = "miniz_oxide"
 version = "0.6.2"
@@ -3996,9 +4015,9 @@ dependencies = [
 
 [[package]]
 name = "nix"
-version = "0.24.2"
+version = "0.24.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc"
+checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
 dependencies = [
  "bitflags",
  "cfg-if",
@@ -4055,9 +4074,9 @@ dependencies = [
 
 [[package]]
 name = "num-format"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54b862ff8df690cf089058c98b183676a7ed0f974cc08b426800093227cbff3b"
+checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3"
 dependencies = [
  "arrayvec 0.7.2",
  "itoa",
@@ -4092,7 +4111,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
 dependencies = [
  "autocfg",
- "libm",
+ "libm 0.2.6",
 ]
 
 [[package]]
@@ -4117,6 +4136,15 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "object"
+version = "0.30.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "239da7f290cfa979f43f85a8efeee9a8a76d0827c356d37f9d3d7254d6b537fb"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "once_cell"
 version = "1.16.0"
@@ -4147,6 +4175,16 @@ version = "6.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
 
+[[package]]
+name = "packed_simd_2"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282"
+dependencies = [
+ "cfg-if",
+ "libm 0.1.4",
+]
+
 [[package]]
 name = "pallet-aleph"
 version = "0.5.4"
@@ -4680,7 +4718,7 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
 dependencies = [
  "instant",
  "lock_api",
- "parking_lot_core 0.8.5",
+ "parking_lot_core 0.8.6",
 ]
 
 [[package]]
@@ -4695,9 +4733,9 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
 dependencies = [
  "cfg-if",
  "instant",
@@ -4722,9 +4760,9 @@ dependencies = [
 
 [[package]]
 name = "paste"
-version = "1.0.9"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1"
+checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba"
 
 [[package]]
 name = "pbkdf2"
@@ -4836,11 +4874,17 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94"
 
+[[package]]
+name = "platforms"
+version = "3.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630"
+
 [[package]]
 name = "polling"
-version = "2.5.1"
+version = "2.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "166ca89eb77fd403230b9c156612965a81e094ec6ec3aa13663d4c8b113fa748"
+checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6"
 dependencies = [
  "autocfg",
  "cfg-if",
@@ -4911,9 +4955,9 @@ dependencies = [
 
 [[package]]
 name = "prettyplease"
-version = "0.1.21"
+version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c142c0e46b57171fe0c528bee8c5b7569e80f0c17e377cd0e30ea57dbc11bb51"
+checksum = "2c8992a85d8e93a28bdf76137db888d3874e3b230dee5ed8bebac4c9f7617773"
 dependencies = [
  "proc-macro2",
  "syn",
@@ -4984,9 +5028,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.47"
+version = "1.0.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
+checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5"
 dependencies = [
  "unicode-ident",
 ]
@@ -5040,9 +5084,9 @@ dependencies = [
 
 [[package]]
 name = "prost-build"
-version = "0.11.3"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e330bf1316db56b12c2bcfa399e8edddd4821965ea25ddb2c134b610b1c1c604"
+checksum = "276470f7f281b0ed53d2ae42dd52b4a8d08853a3c70e7fe95882acbb98a6ae94"
 dependencies = [
  "bytes",
  "heck",
@@ -5124,9 +5168,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.21"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
+checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
 dependencies = [
  "proc-macro2",
 ]
@@ -5236,11 +5280,10 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
 
 [[package]]
 name = "rayon"
-version = "1.6.0"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e060280438193c554f654141c9ea9417886713b7acd75974c85b18a69a88e0b"
+checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7"
 dependencies = [
- "crossbeam-deque",
  "either",
  "rayon-core",
 ]
@@ -5279,18 +5322,18 @@ dependencies = [
 
 [[package]]
 name = "ref-cast"
-version = "1.0.13"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53b15debb4f9d60d767cd8ca9ef7abb2452922f3214671ff052defc7f3502c44"
+checksum = "8c78fb8c9293bcd48ef6fce7b4ca950ceaf21210de6e105a883ee280c0f7b9ed"
 dependencies = [
  "ref-cast-impl",
 ]
 
 [[package]]
 name = "ref-cast-impl"
-version = "1.0.13"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abfa8511e9e94fd3de6585a3d3cd00e01ed556dc9814829280af0e8dc72a8f36"
+checksum = "9f9c0c92af03644e4806106281fe2e068ac5bc0ae74a707266d06ea27bccee5f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5476,7 +5519,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
 dependencies = [
- "semver 1.0.14",
+ "semver 1.0.16",
 ]
 
 [[package]]
@@ -5495,15 +5538,15 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.36.4"
+version = "0.36.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb93e85278e08bb5788653183213d3a60fc242b10cb9be96586f5a73dcb67c23"
+checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588"
 dependencies = [
  "bitflags",
  "errno",
  "io-lifetimes 1.0.3",
  "libc",
- "linux-raw-sys 0.1.3",
+ "linux-raw-sys 0.1.4",
  "windows-sys 0.42.0",
 ]
 
@@ -5542,9 +5585,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.9"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8"
+checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70"
 
 [[package]]
 name = "rw-stream-sink"
@@ -5559,9 +5602,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.11"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
+checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
 
 [[package]]
 name = "safe-mix"
@@ -6459,9 +6502,9 @@ dependencies = [
 
 [[package]]
 name = "scale-info"
-version = "2.3.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d8a765117b237ef233705cc2cc4c6a27fccd46eea6ef0c8c6dae5f3ef407f8"
+checksum = "001cf62ece89779fd16105b5f515ad0e5cedcd5440d3dd806bb067978e7c3608"
 dependencies = [
  "bitvec",
  "cfg-if",
@@ -6473,9 +6516,9 @@ dependencies = [
 
 [[package]]
 name = "scale-info-derive"
-version = "2.3.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdcd47b380d8c4541044e341dcd9475f55ba37ddc50c908d945fc036a8642496"
+checksum = "303959cf613a6f6efd19ed4b4ad5bf79966a13352716299ad532cfb115f4205c"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -6519,9 +6562,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
 name = "scratch"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898"
+checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2"
 
 [[package]]
 name = "sct"
@@ -6548,9 +6591,9 @@ dependencies = [
 
 [[package]]
 name = "secp256k1"
-version = "0.24.1"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff55dc09d460954e9ef2fa8a7ced735a964be9981fd50e870b2b3b0705e14964"
+checksum = "d9512ffd81e3a3503ed401f79c33168b9148c75038956039166cd750eaa037c3"
 dependencies = [
  "secp256k1-sys",
 ]
@@ -6616,9 +6659,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.14"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4"
+checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a"
 dependencies = [
  "serde",
 ]
@@ -6631,18 +6674,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
-version = "1.0.148"
+version = "1.0.151"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e53f64bb4ba0191d6d0676e1b141ca55047d83b74f5607e6d8eb88126c52c2dc"
+checksum = "97fed41fc1a24994d044e6db6935e69511a1153b52c15eb42493b26fa87feba0"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.148"
+version = "1.0.151"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a55492425aa53521babf6137309e7d34c20bbfbbfcfe2c7f3a047fd1f6b92c0c"
+checksum = "255abe9a125a985c05190d687b320c12f9b1f0b99445e608c21ba0782c719ad8"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6651,9 +6694,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.89"
+version = "1.0.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db"
+checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883"
 dependencies = [
  "itoa",
  "ryu",
@@ -6811,7 +6854,7 @@ dependencies = [
  "aes-gcm",
  "blake2",
  "chacha20poly1305",
- "curve25519-dalek 4.0.0-pre.1",
+ "curve25519-dalek 4.0.0-pre.5",
  "rand_core 0.6.4",
  "ring",
  "rustc_version 0.4.0",
@@ -7584,9 +7627,9 @@ dependencies = [
 
 [[package]]
 name = "ss58-registry"
-version = "1.35.0"
+version = "1.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa0813c10b9dbdc842c2305f949f724c64866e4ef4d09c9151e96f6a2106773c"
+checksum = "23d92659e7d18d82b803824a9ba5a6022cff101c3491d027c1c1d8d30e749284"
 dependencies = [
  "Inflector",
  "num-format",
@@ -7619,7 +7662,7 @@ dependencies = [
  "cfg_aliases",
  "libc",
  "parking_lot 0.11.2",
- "parking_lot_core 0.8.5",
+ "parking_lot_core 0.8.6",
  "static_init_macro",
  "winapi",
 ]
@@ -7696,7 +7739,7 @@ name = "substrate-build-script-utils"
 version = "3.0.0"
 source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.32#50f811363321449799ad0fb5d64b692e009bebc6"
 dependencies = [
- "platforms",
+ "platforms 2.0.0",
 ]
 
 [[package]]
@@ -7860,9 +7903,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
 
 [[package]]
 name = "syn"
-version = "1.0.105"
+version = "1.0.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908"
+checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7945,18 +7988,18 @@ checksum = "95059e91184749cb66be6dc994f67f182b6d897cb3df74a5bf66b5e709295fd8"
 
 [[package]]
 name = "thiserror"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
+checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
+checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8058,9 +8101,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.22.0"
+version = "1.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d76ce4a75fb488c605c54bf610f221cea8b0dafb53333c1a67e8ee199dcd2ae3"
+checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46"
 dependencies = [
  "autocfg",
  "bytes",
@@ -8073,7 +8116,7 @@ dependencies = [
  "signal-hook-registry",
  "socket2",
  "tokio-macros",
- "winapi",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
@@ -8126,9 +8169,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.5.9"
+version = "0.5.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
+checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f"
 dependencies = [
  "serde",
 ]
@@ -8326,9 +8369,9 @@ dependencies = [
 
 [[package]]
 name = "tt-call"
-version = "1.0.8"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e66dcbec4290c69dd03c57e76c2469ea5c7ce109c6dd4351c13055cf71ea055"
+checksum = "f4f195fd851901624eee5a58c4bb2b4f06399148fcd0ed336e6f1cb60a9881df"
 
 [[package]]
 name = "twox-hash"
@@ -8344,9 +8387,9 @@ dependencies = [
 
 [[package]]
 name = "typenum"
-version = "1.15.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
+checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
 
 [[package]]
 name = "uint"
@@ -8377,9 +8420,9 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.5"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
+checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
 
 [[package]]
 name = "unicode-normalization"
@@ -8648,7 +8691,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57d20cb3c59b788653d99541c646c561c9dd26506f25c0cebfe810659c54c6d7"
 dependencies = [
  "downcast-rs",
- "libm",
+ "libm 0.2.6",
  "memory_units",
  "num-rational",
  "num-traits",
@@ -8675,7 +8718,7 @@ dependencies = [
  "indexmap",
  "libc",
  "log",
- "object",
+ "object 0.29.0",
  "once_cell",
  "paste",
  "psm",
@@ -8732,9 +8775,9 @@ dependencies = [
  "cranelift-frontend",
  "cranelift-native",
  "cranelift-wasm",
- "gimli",
+ "gimli 0.26.2",
  "log",
- "object",
+ "object 0.29.0",
  "target-lexicon",
  "thiserror",
  "wasmparser",
@@ -8749,10 +8792,10 @@ checksum = "ebb881c61f4f627b5d45c54e629724974f8a8890d455bcbe634330cc27309644"
 dependencies = [
  "anyhow",
  "cranelift-entity",
- "gimli",
+ "gimli 0.26.2",
  "indexmap",
  "log",
- "object",
+ "object 0.29.0",
  "serde",
  "target-lexicon",
  "thiserror",
@@ -8766,14 +8809,14 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1985c628011fe26adf5e23a5301bdc79b245e0e338f14bb58b39e4e25e4d8681"
 dependencies = [
- "addr2line",
+ "addr2line 0.17.0",
  "anyhow",
  "bincode",
  "cfg-if",
  "cpp_demangle",
- "gimli",
+ "gimli 0.26.2",
  "log",
- "object",
+ "object 0.29.0",
  "rustc-demangle",
  "rustix 0.35.13",
  "serde",
@@ -8791,7 +8834,7 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f671b588486f5ccec8c5a3dba6b4c07eac2e66ab8c60e6f4e53717c77f709731"
 dependencies = [
- "object",
+ "object 0.29.0",
  "once_cell",
  "rustix 0.35.13",
 ]
@@ -8855,9 +8898,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.22.5"
+version = "0.22.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368bfe657969fb01238bb756d351dcade285e0f6fcbd36dcb23359a5169975be"
+checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
 dependencies = [
  "webpki",
 ]
diff --git a/aggregator/Cargo.toml b/aggregator/Cargo.toml
index a6ac01c701..307104bef6 100644
--- a/aggregator/Cargo.toml
+++ b/aggregator/Cargo.toml
@@ -1,14 +1,14 @@
 [package]
 name = "aggregator"
-version = "0.2.0"
+version = "0.3.0"
 authors = ["Cardinal Cryptography"]
 edition = "2021"
 license = "Apache 2.0"
 
 
 [dependencies]
-aleph-bft-rmc = "0.5.0"
-aleph-bft-types = "0.6.0"
+aleph-bft-rmc = "0.6"
+aleph-bft-types = "0.7"
 
 async-trait = "0.1"
 futures = "0.3"
diff --git a/finality-aleph/Cargo.toml b/finality-aleph/Cargo.toml
index a4c9ad51d3..580e9e2613 100644
--- a/finality-aleph/Cargo.toml
+++ b/finality-aleph/Cargo.toml
@@ -7,15 +7,15 @@ license = "Apache 2.0"
 
 [dependencies]
 # fixed version to 'freeze' some types used in abft, mainly `SignatureSet` used in justification and signature aggregation
-aleph-bft-crypto = "0.4.0"
+aleph-bft-crypto = "0.4"
 
-current-aleph-bft = { package = "aleph-bft", version = "0.19.1" }
-current-aleph-bft-rmc = { package = "aleph-bft-rmc", version = "0.5.0" }
-legacy-aleph-bft = { package = "aleph-bft", version = "0.18.1" }
-legacy-aleph-bft-rmc = { package = "aleph-bft-rmc", version = "0.4.0" }
+current-aleph-bft = { package = "aleph-bft", version = "0.20" }
+current-aleph-bft-rmc = { package = "aleph-bft-rmc", version = "0.6" }
+legacy-aleph-bft = { package = "aleph-bft", version = "0.19" }
+legacy-aleph-bft-rmc = { package = "aleph-bft-rmc", version = "0.5" }
 
 aleph-primitives = { package = "primitives", path = "../primitives" }
-legacy-aleph-aggregator = { package = "aggregator", git = "https://github.com/Cardinal-Cryptography/aleph-node.git", tag = "aggregator-v0.1.0" }
+legacy-aleph-aggregator = { package = "aggregator", git = "https://github.com/Cardinal-Cryptography/aleph-node.git", tag = "aggregator-v0.2.0" }
 current-aleph-aggregator = { path = "../aggregator", package = "aggregator" }
 
 async-trait = "0.1"

From f8df9baf3a1f429388730ba55be5e7cc798a977d Mon Sep 17 00:00:00 2001
From: Michal Swietek <michal.swietek@cardinals.cc>
Date: Tue, 20 Dec 2022 21:52:18 +0100
Subject: [PATCH 2/7] Adjust to new versions

---
 Cargo.lock                               | 78 ++++++++++++------------
 aggregator/Cargo.toml                    |  2 +-
 finality-aleph/Cargo.toml                |  4 +-
 finality-aleph/src/abft/common.rs        | 34 ++++++++---
 finality-aleph/src/abft/current.rs       | 14 ++++-
 finality-aleph/src/abft/legacy.rs        | 19 ++++--
 finality-aleph/src/aggregation/mod.rs    |  2 +-
 finality-aleph/src/testing/data_store.rs |  6 +-
 pallets/elections/src/mock.rs            |  5 +-
 9 files changed, 99 insertions(+), 65 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9ca70677ca..33a169e206 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -73,11 +73,11 @@ dependencies = [
 
 [[package]]
 name = "aggregator"
-version = "0.2.0"
-source = "git+https://github.com/Cardinal-Cryptography/aleph-node.git?tag=aggregator-v0.2.0#95c40fb64bfb741266cf2a424554cc454658befa"
+version = "0.2.1"
+source = "git+https://github.com/Cardinal-Cryptography/aleph-node.git?tag=aggregator-v0.2.1#95a6b02ccd2295f9d4c21ece2b0721a4b99e1ee5"
 dependencies = [
  "aleph-bft-rmc 0.5.2",
- "aleph-bft-types 0.6.0",
+ "aleph-bft-types 0.7.2",
  "async-trait",
  "futures",
  "log",
@@ -89,8 +89,8 @@ dependencies = [
 name = "aggregator"
 version = "0.3.0"
 dependencies = [
- "aleph-bft-rmc 0.6.0",
- "aleph-bft-types 0.7.2",
+ "aleph-bft-rmc 0.6.1",
+ "aleph-bft-types 0.8.1",
  "async-trait",
  "futures",
  "log",
@@ -139,12 +139,12 @@ dependencies = [
 
 [[package]]
 name = "aleph-bft"
-version = "0.20.2"
+version = "0.20.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afe6617ee3f8a1ae3a3829a669a1c1bf104804feb16241cf8ede472b9fb46066"
+checksum = "6b728a1cd327f84c61a3c0cf087f952703237fb6db8bde33284d67827e86e58f"
 dependencies = [
- "aleph-bft-rmc 0.6.0",
- "aleph-bft-types 0.7.2",
+ "aleph-bft-rmc 0.6.1",
+ "aleph-bft-types 0.8.1",
  "async-trait",
  "derivative",
  "futures",
@@ -158,9 +158,9 @@ dependencies = [
 
 [[package]]
 name = "aleph-bft-crypto"
-version = "0.4.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba414eaabb61c300a93267e7d07133a960fc417df394086da804b032ead6b715"
+checksum = "fcc63efe80dacbfe53bc008aab6a24e864142198355b1a9a4f31543246e3d63f"
 dependencies = [
  "async-trait",
  "bit-vec",
@@ -171,9 +171,9 @@ dependencies = [
 
 [[package]]
 name = "aleph-bft-crypto"
-version = "0.5.2"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcc63efe80dacbfe53bc008aab6a24e864142198355b1a9a4f31543246e3d63f"
+checksum = "39ef65bb0b342d411e32789cdf722cbf163667e1656577ef356221c5aebf75c9"
 dependencies = [
  "async-trait",
  "bit-vec",
@@ -198,11 +198,11 @@ dependencies = [
 
 [[package]]
 name = "aleph-bft-rmc"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2943e65245f82497df76b452b0cb7358687ecfb7cef2d8c0730bfd80ee2e8f42"
+checksum = "e1a34546c3d75df640c0224294be256fd0c17ed3f7191367124ece4d93753061"
 dependencies = [
- "aleph-bft-crypto 0.5.2",
+ "aleph-bft-crypto 0.6.0",
  "async-trait",
  "futures",
  "futures-timer",
@@ -212,11 +212,11 @@ dependencies = [
 
 [[package]]
 name = "aleph-bft-types"
-version = "0.6.0"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb9f5b8526b63c76102ef1b36400cf62381f6900585a8258511580af917dd580"
+checksum = "14c0995c7a6709cec7dc62ef8316426442ea4756b34182c21d6549a1c6bfb904"
 dependencies = [
- "aleph-bft-crypto 0.4.0",
+ "aleph-bft-crypto 0.5.2",
  "async-trait",
  "futures",
  "parity-scale-codec",
@@ -224,11 +224,11 @@ dependencies = [
 
 [[package]]
 name = "aleph-bft-types"
-version = "0.7.2"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c0995c7a6709cec7dc62ef8316426442ea4756b34182c21d6549a1c6bfb904"
+checksum = "4b39893b3cb3670ade7d8fe3cb807f9b032cd2a2937df88a64b53ad927fc1510"
 dependencies = [
- "aleph-bft-crypto 0.5.2",
+ "aleph-bft-crypto 0.6.0",
  "async-trait",
  "futures",
  "parity-scale-codec",
@@ -1888,13 +1888,13 @@ dependencies = [
 name = "finality-aleph"
 version = "0.5.4"
 dependencies = [
- "aggregator 0.2.0",
+ "aggregator 0.2.1",
  "aggregator 0.3.0",
  "aleph-bft 0.19.3",
- "aleph-bft 0.20.2",
- "aleph-bft-crypto 0.4.0",
+ "aleph-bft 0.20.4",
+ "aleph-bft-crypto 0.5.2",
  "aleph-bft-rmc 0.5.2",
- "aleph-bft-rmc 0.6.0",
+ "aleph-bft-rmc 0.6.1",
  "async-trait",
  "bytes",
  "derive_more",
@@ -2851,9 +2851,9 @@ checksum = "11b0d96e660696543b251e58030cf9787df56da39dab19ad60eae7353040917e"
 
 [[package]]
 name = "is-terminal"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "927609f78c2913a6f6ac3c27a4fe87f43e2a35367c0c4b0f8265e8f49a104330"
+checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189"
 dependencies = [
  "hermit-abi 0.2.6",
  "io-lifetimes 1.0.3",
@@ -4116,11 +4116,11 @@ dependencies = [
 
 [[package]]
 name = "num_cpus"
-version = "1.14.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5"
+checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
 dependencies = [
- "hermit-abi 0.1.19",
+ "hermit-abi 0.2.6",
  "libc",
 ]
 
@@ -5074,9 +5074,9 @@ dependencies = [
 
 [[package]]
 name = "prost"
-version = "0.11.3"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0b18e655c21ff5ac2084a5ad0611e827b3f92badf79f4910b5a5c58f4d87ff0"
+checksum = "c01db6702aa05baa3f57dec92b8eeeeb4cb19e894e73996b32a4093289e54592"
 dependencies = [
  "bytes",
  "prost-derive",
@@ -5084,9 +5084,9 @@ dependencies = [
 
 [[package]]
 name = "prost-build"
-version = "0.11.4"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "276470f7f281b0ed53d2ae42dd52b4a8d08853a3c70e7fe95882acbb98a6ae94"
+checksum = "cb5320c680de74ba083512704acb90fe00f28f79207286a848e730c45dd73ed6"
 dependencies = [
  "bytes",
  "heck",
@@ -5119,9 +5119,9 @@ dependencies = [
 
 [[package]]
 name = "prost-derive"
-version = "0.11.2"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "164ae68b6587001ca506d3bf7f1000bfa248d0e1217b618108fba4ec1d0cc306"
+checksum = "c8842bad1a5419bca14eac663ba798f6bc19c413c2fdceb5f3ba3b0932d96720"
 dependencies = [
  "anyhow",
  "itertools",
@@ -5132,9 +5132,9 @@ dependencies = [
 
 [[package]]
 name = "prost-types"
-version = "0.11.2"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "747761bc3dc48f9a34553bf65605cf6cb6288ba219f3450b4275dbd81539551a"
+checksum = "017f79637768cde62820bc2d4fe0e45daaa027755c323ad077767c6c5f173091"
 dependencies = [
  "bytes",
  "prost",
diff --git a/aggregator/Cargo.toml b/aggregator/Cargo.toml
index 307104bef6..77b50b8fb7 100644
--- a/aggregator/Cargo.toml
+++ b/aggregator/Cargo.toml
@@ -8,7 +8,7 @@ license = "Apache 2.0"
 
 [dependencies]
 aleph-bft-rmc = "0.6"
-aleph-bft-types = "0.7"
+aleph-bft-types = "0.8"
 
 async-trait = "0.1"
 futures = "0.3"
diff --git a/finality-aleph/Cargo.toml b/finality-aleph/Cargo.toml
index 580e9e2613..9b29d0e0e9 100644
--- a/finality-aleph/Cargo.toml
+++ b/finality-aleph/Cargo.toml
@@ -7,7 +7,7 @@ license = "Apache 2.0"
 
 [dependencies]
 # fixed version to 'freeze' some types used in abft, mainly `SignatureSet` used in justification and signature aggregation
-aleph-bft-crypto = "0.4"
+aleph-bft-crypto = "0.5"
 
 current-aleph-bft = { package = "aleph-bft", version = "0.20" }
 current-aleph-bft-rmc = { package = "aleph-bft-rmc", version = "0.6" }
@@ -15,7 +15,7 @@ legacy-aleph-bft = { package = "aleph-bft", version = "0.19" }
 legacy-aleph-bft-rmc = { package = "aleph-bft-rmc", version = "0.5" }
 
 aleph-primitives = { package = "primitives", path = "../primitives" }
-legacy-aleph-aggregator = { package = "aggregator", git = "https://github.com/Cardinal-Cryptography/aleph-node.git", tag = "aggregator-v0.2.0" }
+legacy-aleph-aggregator = { package = "aggregator", git = "https://github.com/Cardinal-Cryptography/aleph-node.git", tag = "aggregator-v0.2.1" }
 current-aleph-aggregator = { path = "../aggregator", package = "aggregator" }
 
 async-trait = "0.1"
diff --git a/finality-aleph/src/abft/common.rs b/finality-aleph/src/abft/common.rs
index 6354e36044..00b71a5930 100644
--- a/finality-aleph/src/abft/common.rs
+++ b/finality-aleph/src/abft/common.rs
@@ -25,23 +25,39 @@ fn exponential_slowdown(
 }
 
 pub type DelaySchedule = Arc<dyn Fn(usize) -> Duration + Sync + Send + 'static>;
+pub type RecipientCountSchedule = Arc<dyn Fn(usize) -> usize + Sync + Send + 'static>;
 
 pub fn unit_creation_delay_fn(unit_creation_delay: UnitCreationDelay) -> DelaySchedule {
-    Arc::new(move |t| {
-        if t == 0 {
-            Duration::from_millis(2000)
-        } else {
-            exponential_slowdown(t, unit_creation_delay.0 as f64, 5000, 1.005)
-        }
+    Arc::new(move |t| match t {
+        0 => Duration::from_millis(2000),
+        _ => exponential_slowdown(t, unit_creation_delay.0 as f64, 5000, 1.005),
+    })
+}
+
+pub fn coord_request_delay_fn() -> DelaySchedule {
+    Arc::new(|t| match t {
+        0 => Duration::from_millis(0),
+        1 => Duration::from_millis(50),
+        2 => Duration::from_millis(1000),
+        _ => Duration::from_millis(3000 * (t as u64 - 2)),
     })
 }
 
+pub fn coord_request_recipients_fn() -> RecipientCountSchedule {
+    Arc::new(|t| if t <= 2 { 3 } else { 1 })
+}
+
 pub struct DelayConfig {
     pub tick_interval: Duration,
     pub requests_interval: Duration,
     pub unit_rebroadcast_interval_min: Duration,
     pub unit_rebroadcast_interval_max: Duration,
     pub unit_creation_delay: DelaySchedule,
+    pub coord_request_delay: DelaySchedule,
+    pub coord_request_recipients: RecipientCountSchedule,
+    pub parent_request_delay: DelaySchedule,
+    pub parent_request_recipients: RecipientCountSchedule,
+    pub newest_request_delay: DelaySchedule,
 }
 
 pub struct AlephConfig {
@@ -83,10 +99,14 @@ impl From<DelayConfig> for current_aleph_bft::DelayConfig {
     fn from(cfg: DelayConfig) -> Self {
         Self {
             tick_interval: cfg.tick_interval,
-            requests_interval: cfg.requests_interval,
             unit_rebroadcast_interval_max: cfg.unit_rebroadcast_interval_max,
             unit_rebroadcast_interval_min: cfg.unit_rebroadcast_interval_min,
             unit_creation_delay: cfg.unit_creation_delay,
+            coord_request_delay: cfg.coord_request_delay,
+            coord_request_recipients: cfg.coord_request_recipients,
+            parent_request_delay: cfg.parent_request_delay,
+            parent_request_recipients: cfg.parent_request_recipients,
+            newest_request_delay: cfg.newest_request_delay,
         }
     }
 }
diff --git a/finality-aleph/src/abft/current.rs b/finality-aleph/src/abft/current.rs
index f647b5c791..8ef5f4e3d2 100644
--- a/finality-aleph/src/abft/current.rs
+++ b/finality-aleph/src/abft/current.rs
@@ -1,4 +1,4 @@
-use std::time::Duration;
+use std::{sync::Arc, time::Duration};
 
 use current_aleph_bft::{Config, LocalIO, Terminator};
 use log::debug;
@@ -7,7 +7,10 @@ use sp_runtime::traits::Block;
 
 use crate::{
     abft::{
-        common::{unit_creation_delay_fn, AlephConfig, DelayConfig},
+        common::{
+            coord_request_delay_fn, coord_request_recipients_fn, unit_creation_delay_fn,
+            AlephConfig, DelayConfig,
+        },
         NetworkWrapper, SpawnHandleT,
     },
     crypto::Signature,
@@ -76,11 +79,16 @@ pub fn create_aleph_config(
     unit_creation_delay: UnitCreationDelay,
 ) -> Config {
     let delay_config = DelayConfig {
-        tick_interval: Duration::from_millis(100),
+        tick_interval: Duration::from_millis(10),
         requests_interval: Duration::from_millis(3000),
         unit_rebroadcast_interval_min: Duration::from_millis(15000),
         unit_rebroadcast_interval_max: Duration::from_millis(20000),
         unit_creation_delay: unit_creation_delay_fn(unit_creation_delay),
+        coord_request_delay: coord_request_delay_fn(),
+        coord_request_recipients: coord_request_recipients_fn(),
+        parent_request_delay: Arc::new(|_| Duration::from_millis(3000)),
+        parent_request_recipients: Arc::new(|_| 1),
+        newest_request_delay: Arc::new(|_| Duration::from_millis(3000)),
     };
 
     AlephConfig::new(delay_config, n_members, node_id, session_id).into()
diff --git a/finality-aleph/src/abft/legacy.rs b/finality-aleph/src/abft/legacy.rs
index be749d526b..e9c9b618b2 100644
--- a/finality-aleph/src/abft/legacy.rs
+++ b/finality-aleph/src/abft/legacy.rs
@@ -1,13 +1,16 @@
-use std::time::Duration;
+use std::{sync::Arc, time::Duration};
 
-use legacy_aleph_bft::{Config, LocalIO};
+use legacy_aleph_bft::{Config, LocalIO, Terminator};
 use log::debug;
 use sp_blockchain::HeaderBackend;
 use sp_runtime::traits::Block;
 
 use crate::{
     abft::{
-        common::{unit_creation_delay_fn, AlephConfig, DelayConfig},
+        common::{
+            coord_request_delay_fn, coord_request_recipients_fn, unit_creation_delay_fn,
+            AlephConfig, DelayConfig,
+        },
         NetworkWrapper, SpawnHandleT,
     },
     data_io::{AlephData, OrderedDataInterpreter},
@@ -41,6 +44,7 @@ pub fn run_member<
         session_id,
     } = subtask_common;
     let (stop, exit) = oneshot::channel();
+    let member_terminator = Terminator::create_root(exit, "member");
     let local_io = LocalIO::new(data_provider, ordered_data_interpreter, backup.0, backup.1);
 
     let task = {
@@ -53,7 +57,7 @@ pub fn run_member<
                 network,
                 multikeychain,
                 spawn_handle,
-                exit,
+                member_terminator,
             )
             .await;
             debug!(target: "aleph-party", "Member task stopped for {:?}", session_id);
@@ -71,11 +75,16 @@ pub fn create_aleph_config(
     unit_creation_delay: UnitCreationDelay,
 ) -> Config {
     let delay_config = DelayConfig {
-        tick_interval: Duration::from_millis(100),
+        tick_interval: Duration::from_millis(10),
         requests_interval: Duration::from_millis(3000),
         unit_rebroadcast_interval_min: Duration::from_millis(15000),
         unit_rebroadcast_interval_max: Duration::from_millis(20000),
         unit_creation_delay: unit_creation_delay_fn(unit_creation_delay),
+        coord_request_delay: coord_request_delay_fn(),
+        coord_request_recipients: coord_request_recipients_fn(),
+        parent_request_delay: Arc::new(|_| Duration::from_millis(3000)),
+        parent_request_recipients: Arc::new(|_| 1),
+        newest_request_delay: Arc::new(|_| Duration::from_millis(3000)),
     };
 
     AlephConfig::new(delay_config, n_members, node_id, session_id).into()
diff --git a/finality-aleph/src/aggregation/mod.rs b/finality-aleph/src/aggregation/mod.rs
index c8f077a47c..3861230ad2 100644
--- a/finality-aleph/src/aggregation/mod.rs
+++ b/finality-aleph/src/aggregation/mod.rs
@@ -220,7 +220,7 @@ where
     fn send(
         &self,
         data: D,
-        recipient: legacy_aleph_bft::Recipient,
+        recipient: current_aleph_bft::Recipient,
     ) -> Result<(), CurrentNetworkError> {
         self.0.send(data, recipient.into()).map_err(|e| match e {
             SendError::SendFailed => CurrentNetworkError::SendFail,
diff --git a/finality-aleph/src/testing/data_store.rs b/finality-aleph/src/testing/data_store.rs
index 7005b69942..ceb32cfde3 100644
--- a/finality-aleph/src/testing/data_store.rs
+++ b/finality-aleph/src/testing/data_store.rs
@@ -260,7 +260,7 @@ async fn correct_messages_go_through() {
             .await;
 
         for i in 1..=MAX_DATA_BRANCH_LEN {
-            let blocks_branch = blocks[0..(i as usize)].to_vec();
+            let blocks_branch = blocks[0..i].to_vec();
             let test_data: TestData = vec![aleph_data_from_blocks(blocks_branch)];
             test_handler.send_data(test_data.clone());
 
@@ -282,7 +282,7 @@ async fn too_long_branch_message_does_not_go_through() {
 
         test_handler.finalize_block(&blocks[MAX_DATA_BRANCH_LEN + 2].hash());
 
-        let blocks_branch = blocks[0..((MAX_DATA_BRANCH_LEN + 1) as usize)].to_vec();
+        let blocks_branch = blocks[0..(MAX_DATA_BRANCH_LEN + 1)].to_vec();
         let test_data: TestData = vec![aleph_data_from_blocks(blocks_branch)];
         test_handler.send_data(test_data.clone());
         test_handler
@@ -381,7 +381,7 @@ async fn branch_with_not_finalized_ancestor_correctly_handled() {
 
 fn send_proposals_of_each_len(blocks: Vec<Block>, test_handler: &mut TestHandler) {
     for i in 1..=MAX_DATA_BRANCH_LEN {
-        let blocks_branch = blocks[0..(i as usize)].to_vec();
+        let blocks_branch = blocks[0..i].to_vec();
         let test_data: TestData = vec![aleph_data_from_blocks(blocks_branch)];
         test_handler.send_data(test_data.clone());
     }
diff --git a/pallets/elections/src/mock.rs b/pallets/elections/src/mock.rs
index 492823bfb5..d7eb53f13c 100644
--- a/pallets/elections/src/mock.rs
+++ b/pallets/elections/src/mock.rs
@@ -275,10 +275,7 @@ impl TestExtBuilder {
             .chain(self.reserved_validators.iter())
             .collect();
 
-        let balances: Vec<_> = validators
-            .iter()
-            .map(|i| (**i as u64, 10_000_000))
-            .collect();
+        let balances: Vec<_> = validators.iter().map(|i| (**i, 10_000_000)).collect();
 
         pallet_balances::GenesisConfig::<Test> { balances }
             .assimilate_storage(&mut t)

From 97174ad2c18e0aab00d8c21e3ad7997b48c887ce Mon Sep 17 00:00:00 2001
From: Michal Swietek <michal.swietek@cardinals.cc>
Date: Wed, 21 Dec 2022 12:12:28 +0100
Subject: [PATCH 3/7] Bump finality version

---
 Cargo.lock                | 6 +++---
 finality-aleph/Cargo.toml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 33a169e206..d828ae8c4a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1044,9 +1044,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.0.29"
+version = "4.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d63b9e9c07271b9957ad22c173bae2a4d9a81127680962039296abcd2f8251d"
+checksum = "656ad1e55e23d287773f7d8192c300dc715c3eeded93b3da651d11c42cfd74d2"
 dependencies = [
  "bitflags",
  "clap_derive",
@@ -1886,7 +1886,7 @@ dependencies = [
 
 [[package]]
 name = "finality-aleph"
-version = "0.5.4"
+version = "0.6.0"
 dependencies = [
  "aggregator 0.2.1",
  "aggregator 0.3.0",
diff --git a/finality-aleph/Cargo.toml b/finality-aleph/Cargo.toml
index 9b29d0e0e9..cd2dae041c 100644
--- a/finality-aleph/Cargo.toml
+++ b/finality-aleph/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "finality-aleph"
-version = "0.5.4"
+version = "0.6.0"
 authors = ["Cardinal Cryptography"]
 edition = "2021"
 license = "Apache 2.0"

From 021ecb50afdf9f3c8c3f930f1431b072ac4ad238 Mon Sep 17 00:00:00 2001
From: Michal Swietek <michal.swietek@cardinals.cc>
Date: Wed, 21 Dec 2022 13:19:35 +0100
Subject: [PATCH 4/7] bump versions and use defaults

---
 finality-aleph/src/abft/common.rs  | 13 ------------
 finality-aleph/src/abft/current.rs | 32 ++++++++----------------------
 finality-aleph/src/abft/legacy.rs  | 32 ++++++++----------------------
 3 files changed, 16 insertions(+), 61 deletions(-)

diff --git a/finality-aleph/src/abft/common.rs b/finality-aleph/src/abft/common.rs
index 00b71a5930..5ef41bccf7 100644
--- a/finality-aleph/src/abft/common.rs
+++ b/finality-aleph/src/abft/common.rs
@@ -34,19 +34,6 @@ pub fn unit_creation_delay_fn(unit_creation_delay: UnitCreationDelay) -> DelaySc
     })
 }
 
-pub fn coord_request_delay_fn() -> DelaySchedule {
-    Arc::new(|t| match t {
-        0 => Duration::from_millis(0),
-        1 => Duration::from_millis(50),
-        2 => Duration::from_millis(1000),
-        _ => Duration::from_millis(3000 * (t as u64 - 2)),
-    })
-}
-
-pub fn coord_request_recipients_fn() -> RecipientCountSchedule {
-    Arc::new(|t| if t <= 2 { 3 } else { 1 })
-}
-
 pub struct DelayConfig {
     pub tick_interval: Duration,
     pub requests_interval: Duration,
diff --git a/finality-aleph/src/abft/current.rs b/finality-aleph/src/abft/current.rs
index 8ef5f4e3d2..ba2ca6181c 100644
--- a/finality-aleph/src/abft/current.rs
+++ b/finality-aleph/src/abft/current.rs
@@ -1,18 +1,10 @@
-use std::{sync::Arc, time::Duration};
-
-use current_aleph_bft::{Config, LocalIO, Terminator};
+use current_aleph_bft::{default_config, Config, LocalIO, Terminator};
 use log::debug;
 use sp_blockchain::HeaderBackend;
 use sp_runtime::traits::Block;
 
 use crate::{
-    abft::{
-        common::{
-            coord_request_delay_fn, coord_request_recipients_fn, unit_creation_delay_fn,
-            AlephConfig, DelayConfig,
-        },
-        NetworkWrapper, SpawnHandleT,
-    },
+    abft::{NetworkWrapper, SpawnHandleT},
     crypto::Signature,
     data_io::{AlephData, OrderedDataInterpreter},
     network::data::Network,
@@ -24,8 +16,10 @@ use crate::{
     CurrentNetworkData, Hasher, Keychain, NodeIndex, SessionId, SignatureSet, UnitCreationDelay,
 };
 
+use super::common::unit_creation_delay_fn;
+
 /// Version of the current abft
-pub const VERSION: u32 = 1;
+pub const VERSION: u32 = 2;
 
 pub fn run_member<
     B: Block,
@@ -78,18 +72,8 @@ pub fn create_aleph_config(
     session_id: SessionId,
     unit_creation_delay: UnitCreationDelay,
 ) -> Config {
-    let delay_config = DelayConfig {
-        tick_interval: Duration::from_millis(10),
-        requests_interval: Duration::from_millis(3000),
-        unit_rebroadcast_interval_min: Duration::from_millis(15000),
-        unit_rebroadcast_interval_max: Duration::from_millis(20000),
-        unit_creation_delay: unit_creation_delay_fn(unit_creation_delay),
-        coord_request_delay: coord_request_delay_fn(),
-        coord_request_recipients: coord_request_recipients_fn(),
-        parent_request_delay: Arc::new(|_| Duration::from_millis(3000)),
-        parent_request_recipients: Arc::new(|_| 1),
-        newest_request_delay: Arc::new(|_| Duration::from_millis(3000)),
-    };
+    let mut config = default_config(n_members.into(), node_id.into(), session_id.0 as u64);
+    config.delay_config.unit_creation_delay = unit_creation_delay_fn(unit_creation_delay);
 
-    AlephConfig::new(delay_config, n_members, node_id, session_id).into()
+    config
 }
diff --git a/finality-aleph/src/abft/legacy.rs b/finality-aleph/src/abft/legacy.rs
index e9c9b618b2..f6a2577932 100644
--- a/finality-aleph/src/abft/legacy.rs
+++ b/finality-aleph/src/abft/legacy.rs
@@ -1,18 +1,10 @@
-use std::{sync::Arc, time::Duration};
-
-use legacy_aleph_bft::{Config, LocalIO, Terminator};
+use legacy_aleph_bft::{default_config, Config, LocalIO, Terminator};
 use log::debug;
 use sp_blockchain::HeaderBackend;
 use sp_runtime::traits::Block;
 
 use crate::{
-    abft::{
-        common::{
-            coord_request_delay_fn, coord_request_recipients_fn, unit_creation_delay_fn,
-            AlephConfig, DelayConfig,
-        },
-        NetworkWrapper, SpawnHandleT,
-    },
+    abft::{NetworkWrapper, SpawnHandleT},
     data_io::{AlephData, OrderedDataInterpreter},
     network::data::Network,
     oneshot,
@@ -23,8 +15,10 @@ use crate::{
     Keychain, LegacyNetworkData, NodeIndex, SessionId, UnitCreationDelay,
 };
 
+use super::common::unit_creation_delay_fn;
+
 /// Version of the legacy abft
-pub const VERSION: u32 = 0;
+pub const VERSION: u32 = 1;
 
 pub fn run_member<
     B: Block,
@@ -74,18 +68,8 @@ pub fn create_aleph_config(
     session_id: SessionId,
     unit_creation_delay: UnitCreationDelay,
 ) -> Config {
-    let delay_config = DelayConfig {
-        tick_interval: Duration::from_millis(10),
-        requests_interval: Duration::from_millis(3000),
-        unit_rebroadcast_interval_min: Duration::from_millis(15000),
-        unit_rebroadcast_interval_max: Duration::from_millis(20000),
-        unit_creation_delay: unit_creation_delay_fn(unit_creation_delay),
-        coord_request_delay: coord_request_delay_fn(),
-        coord_request_recipients: coord_request_recipients_fn(),
-        parent_request_delay: Arc::new(|_| Duration::from_millis(3000)),
-        parent_request_recipients: Arc::new(|_| 1),
-        newest_request_delay: Arc::new(|_| Duration::from_millis(3000)),
-    };
+    let mut config = default_config(n_members.into(), node_id.into(), session_id.0 as u64);
+    config.delay_config.unit_creation_delay = unit_creation_delay_fn(unit_creation_delay);
 
-    AlephConfig::new(delay_config, n_members, node_id, session_id).into()
+    config
 }

From ef0695b91fcf8f958de8260e0fd92d6469dd0b4d Mon Sep 17 00:00:00 2001
From: Michal Swietek <michal.swietek@cardinals.cc>
Date: Wed, 21 Dec 2022 13:35:09 +0100
Subject: [PATCH 5/7] fmt

---
 finality-aleph/src/abft/current.rs | 3 +--
 finality-aleph/src/abft/legacy.rs  | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/finality-aleph/src/abft/current.rs b/finality-aleph/src/abft/current.rs
index ba2ca6181c..8750969017 100644
--- a/finality-aleph/src/abft/current.rs
+++ b/finality-aleph/src/abft/current.rs
@@ -3,6 +3,7 @@ use log::debug;
 use sp_blockchain::HeaderBackend;
 use sp_runtime::traits::Block;
 
+use super::common::unit_creation_delay_fn;
 use crate::{
     abft::{NetworkWrapper, SpawnHandleT},
     crypto::Signature,
@@ -16,8 +17,6 @@ use crate::{
     CurrentNetworkData, Hasher, Keychain, NodeIndex, SessionId, SignatureSet, UnitCreationDelay,
 };
 
-use super::common::unit_creation_delay_fn;
-
 /// Version of the current abft
 pub const VERSION: u32 = 2;
 
diff --git a/finality-aleph/src/abft/legacy.rs b/finality-aleph/src/abft/legacy.rs
index f6a2577932..af3208bc42 100644
--- a/finality-aleph/src/abft/legacy.rs
+++ b/finality-aleph/src/abft/legacy.rs
@@ -3,6 +3,7 @@ use log::debug;
 use sp_blockchain::HeaderBackend;
 use sp_runtime::traits::Block;
 
+use super::common::unit_creation_delay_fn;
 use crate::{
     abft::{NetworkWrapper, SpawnHandleT},
     data_io::{AlephData, OrderedDataInterpreter},
@@ -15,8 +16,6 @@ use crate::{
     Keychain, LegacyNetworkData, NodeIndex, SessionId, UnitCreationDelay,
 };
 
-use super::common::unit_creation_delay_fn;
-
 /// Version of the legacy abft
 pub const VERSION: u32 = 1;
 

From a299ee57fbf6a93be790bf3ce3f79c924e6e0117 Mon Sep 17 00:00:00 2001
From: Michal Swietek <michal.swietek@cardinals.cc>
Date: Thu, 22 Dec 2022 08:23:53 +0100
Subject: [PATCH 6/7] consistent import

---
 finality-aleph/src/abft/current.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/finality-aleph/src/abft/current.rs b/finality-aleph/src/abft/current.rs
index 8750969017..c02c8af54a 100644
--- a/finality-aleph/src/abft/current.rs
+++ b/finality-aleph/src/abft/current.rs
@@ -3,9 +3,8 @@ use log::debug;
 use sp_blockchain::HeaderBackend;
 use sp_runtime::traits::Block;
 
-use super::common::unit_creation_delay_fn;
 use crate::{
-    abft::{NetworkWrapper, SpawnHandleT},
+    abft::{common::unit_creation_delay_fn, NetworkWrapper, SpawnHandleT},
     crypto::Signature,
     data_io::{AlephData, OrderedDataInterpreter},
     network::data::Network,

From a54cb229078822b912b6d88d2951fea73115c4b2 Mon Sep 17 00:00:00 2001
From: Michal Swietek <michal.swietek@cardinals.cc>
Date: Thu, 22 Dec 2022 10:38:05 +0100
Subject: [PATCH 7/7] Bump default abft version

---
 pallets/aleph/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pallets/aleph/src/lib.rs b/pallets/aleph/src/lib.rs
index a7198039b9..cbe54bfe38 100644
--- a/pallets/aleph/src/lib.rs
+++ b/pallets/aleph/src/lib.rs
@@ -37,7 +37,7 @@ use sp_std::prelude::*;
 /// The current storage version.
 const STORAGE_VERSION: StorageVersion = StorageVersion::new(2);
 
-const DEFAULT_FINALITY_VERSION: Version = 0;
+const DEFAULT_FINALITY_VERSION: Version = 2;
 
 #[frame_support::pallet]
 pub mod pallet {