Merge pull request #4117 from Maan2003/aleph-bft-bump

v0.2.2-rc6 with fedimint-aleph-bft
fedimint · Jan 24, 2024 · e97ea79 · e97ea79
2 parents 8390e78 + 72bc4d7
commit e97ea79
Show file tree

Hide file tree

Showing 44 changed files with 278 additions and 284 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crypto/aead/Cargo.toml b/crypto/aead/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fedimint-aead"
-version = "0.2.2-rc5"
+version = "0.2.2-rc6"
 authors = ["The Fedimint Developers"]
 edition = "2021"
 description = "aead utilities on top of ring "

diff --git a/crypto/derive-secret/Cargo.toml b/crypto/derive-secret/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fedimint-derive-secret"
-version = "0.2.2-rc5"
+version = "0.2.2-rc6"
 authors = ["The Fedimint Developers"]
 edition = "2021"
 description = "Fedimint derivable secret implementation"
@@ -18,8 +18,8 @@ path = "src/lib.rs"
 
 [dependencies]
 anyhow = "1.0.66"
-fedimint-core = { version = "0.2.2-rc5", path = "../../fedimint-core" }
-hkdf = { package = "fedimint-hkdf", version = "0.2.2-rc5", path = "../../crypto/hkdf" }
+fedimint-core = { version = "0.2.2-rc6", path = "../../fedimint-core" }
+hkdf = { package = "fedimint-hkdf", version = "0.2.2-rc6", path = "../../crypto/hkdf" }
 ring = "0.17.5"
 secp256k1-zkp = { version = "0.7.0", features = [ "serde", "bitcoin_hashes" ] }
-tbs = { package = "fedimint-tbs", version = "0.2.2-rc5", path = "../../crypto/tbs" }
+tbs = { package = "fedimint-tbs", version = "0.2.2-rc6", path = "../../crypto/tbs" }
diff --git a/crypto/hkdf/Cargo.toml b/crypto/hkdf/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fedimint-hkdf"
-version = "0.2.2-rc5"
+version = "0.2.2-rc6"
 authors = ["The Fedimint Developers"]
 edition = "2021"
 description = "RFC5869 HKDF implementation on top of bitcoin_hashes"

diff --git a/crypto/tbs/Cargo.toml b/crypto/tbs/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fedimint-tbs"
-version = "0.2.2-rc5"
+version = "0.2.2-rc6"
 authors = ["The Fedimint Developers"]
 edition = "2021"
 description = "tbs is a helper cryptography library for threshold blind signatures"

diff --git a/devimint/Cargo.toml b/devimint/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "devimint"
-version = "0.2.2-rc5"
+version = "0.2.2-rc6"
 edition = "2021"
 license = "MIT"
 publish = false
@@ -42,4 +42,4 @@ url = "2.3.1"
 fedimint-portalloc = { path = "../utils/portalloc" }
 
 [build-dependencies]
-fedimint-build = { version = "0.2.2-rc5", path = "../fedimint-build" }
+fedimint-build = { version = "0.2.2-rc6", path = "../fedimint-build" }
diff --git a/fedimint-bip39/Cargo.toml b/fedimint-bip39/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fedimint-bip39"
-version = "0.2.2-rc5"
+version = "0.2.2-rc6"
 edition = "2021"
 license = "MIT"
 description = "Allows using bip39 mnemonic phrases to generate fedimint client keys"
@@ -17,6 +17,6 @@ path = "./src/lib.rs"
 
 [dependencies]
 bip39 = { version = "2.0.0", features = ["rand"] }
-fedimint-client = { version = "0.2.2-rc5", path = "../fedimint-client" }
-fedimint-core = { version = "0.2.2-rc5", path = "../fedimint-core" }
+fedimint-client = { version = "0.2.2-rc6", path = "../fedimint-client" }
+fedimint-core = { version = "0.2.2-rc6", path = "../fedimint-core" }
 rand = "0.8.5"
diff --git a/fedimint-bitcoind/Cargo.toml b/fedimint-bitcoind/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fedimint-bitcoind"
-version = "0.2.2-rc5"
+version = "0.2.2-rc6"
 authors = ["The Fedimint Developers"]
 edition = "2021"
 description = "Bitcoin Core connectivity used by Fedimint"
@@ -24,8 +24,8 @@ bitcoincore-rpc = { version = "0.16.0", optional = true }
 electrum-client = {version = "0.12.0", optional = true }
 esplora-client = { version = "0.5.0", default-features = false, features = ["async", "async-https-rustls"], optional = true }
 lazy_static = "1.4.0"
-fedimint-core  = { version = "0.2.2-rc5", path = "../fedimint-core" }
-fedimint-logging = { version = "0.2.2-rc5", path = "../fedimint-logging" }
+fedimint-core  = { version = "0.2.2-rc6", path = "../fedimint-core" }
+fedimint-logging = { version = "0.2.2-rc6", path = "../fedimint-logging" }
 rand = "0.8"
 serde = { version = "1.0.149", features = [ "derive" ] }
 tracing = "0.1.37"

diff --git a/fedimint-build/Cargo.toml b/fedimint-build/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fedimint-build"
-version = "0.2.2-rc5"
+version = "0.2.2-rc6"
 authors = ["The Fedimint Developers"]
 edition = "2021"
 description = "fedimint is the main consensus code for processing transactions and REST API"
@@ -12,4 +12,4 @@ name = "fedimint_build"
 path = "src/lib.rs"
 
 [dependencies]
-serde_json = "1.0.108"
+serde_json = "1.0.108"
diff --git a/fedimint-cli/Cargo.toml b/fedimint-cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fedimint-cli"
-version = "0.2.2-rc5"
+version = "0.2.2-rc6"
 authors = ["The Fedimint Developers"]
 edition = "2021"
 description = "fedimint-cli is a command line interface wrapper for the client library."
@@ -30,18 +30,18 @@ time = { version = "0.3.25", features = [ "formatting" ] }
 clap = { version = "4.1.6", features = ["derive", "std", "help", "usage", "error-context", "suggestions", "env" ], default-features = false }
 futures = "0.3.28"
 lightning-invoice = { version = "0.26.0", features = [ "serde" ] }
-fedimint-aead = { version = "0.2.2-rc5", path = "../crypto/aead" }
-fedimint-bip39 = { version = "0.2.2-rc5", path = "../fedimint-bip39" }
-fedimint-client = { version = "0.2.2-rc5", path = "../fedimint-client" }
-fedimint-core = { version = "0.2.2-rc5", path = "../fedimint-core" }
-fedimint-rocksdb = { version = "0.2.2-rc5", path = "../fedimint-rocksdb" }
-fedimint-mint-client = { version = "0.2.2-rc5", path = "../modules/fedimint-mint-client" }
-fedimint-mint-common = { version = "0.2.2-rc5", path = "../modules/fedimint-mint-common" }
-fedimint-ln-client = { version = "0.2.2-rc5", path = "../modules/fedimint-ln-client" }
-fedimint-ln-common = { version = "0.2.2-rc5", path = "../modules/fedimint-ln-common" }
-fedimint-wallet-client = { version = "0.2.2-rc5", path = "../modules/fedimint-wallet-client" }
-fedimint-logging = { version = "0.2.2-rc5", path = "../fedimint-logging" }
-fedimint-server = { version = "0.2.2-rc5", path = "../fedimint-server" }
+fedimint-aead = { version = "0.2.2-rc6", path = "../crypto/aead" }
+fedimint-bip39 = { version = "0.2.2-rc6", path = "../fedimint-bip39" }
+fedimint-client = { version = "0.2.2-rc6", path = "../fedimint-client" }
+fedimint-core = { version = "0.2.2-rc6", path = "../fedimint-core" }
+fedimint-rocksdb = { version = "0.2.2-rc6", path = "../fedimint-rocksdb" }
+fedimint-mint-client = { version = "0.2.2-rc6", path = "../modules/fedimint-mint-client" }
+fedimint-mint-common = { version = "0.2.2-rc6", path = "../modules/fedimint-mint-common" }
+fedimint-ln-client = { version = "0.2.2-rc6", path = "../modules/fedimint-ln-client" }
+fedimint-ln-common = { version = "0.2.2-rc6", path = "../modules/fedimint-ln-common" }
+fedimint-wallet-client = { version = "0.2.2-rc6", path = "../modules/fedimint-wallet-client" }
+fedimint-logging = { version = "0.2.2-rc6", path = "../fedimint-logging" }
+fedimint-server = { version = "0.2.2-rc6", path = "../fedimint-server" }
 fs-lock = "0.1.0"
 rand = "0.8"
 serde = { version = "1.0.149", features = [ "derive" ] }
@@ -56,4 +56,4 @@ lnurl-rs = { version = "0.3.1", features = ["async"], default-features = false }
 reqwest = { version = "0.11.14", features = [ "json", "rustls-tls" ], default-features = false }
 
 [build-dependencies]
-fedimint-build = { version = "0.2.2-rc5", path = "../fedimint-build" }
+fedimint-build = { version = "0.2.2-rc6", path = "../fedimint-build" }
diff --git a/fedimint-client/Cargo.toml b/fedimint-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fedimint-client"
-version = "0.2.2-rc5"
+version = "0.2.2-rc6"
 authors = ["The Fedimint Developers"]
 edition = "2021"
 description = "fedimint-client provides a library for sending transactions to the federation."
@@ -25,10 +25,10 @@ async-stream = "0.3.5"
 async-trait = "0.1.73"
 bitcoin = "0.29.2"
 bitcoin_hashes = "0.11.0"
-fedimint-core  = { version = "0.2.2-rc5", path = "../fedimint-core/" }
-fedimint-derive-secret = { version = "0.2.2-rc5", path = "../crypto/derive-secret" }
-fedimint-aead = { version = "0.2.2-rc5", path = "../crypto/aead" }
-fedimint-logging = { version = "0.2.2-rc5", path = "../fedimint-logging" }
+fedimint-core  = { version = "0.2.2-rc6", path = "../fedimint-core/" }
+fedimint-derive-secret = { version = "0.2.2-rc6", path = "../crypto/derive-secret" }
+fedimint-aead = { version = "0.2.2-rc6", path = "../crypto/aead" }
+fedimint-logging = { version = "0.2.2-rc6", path = "../fedimint-logging" }
 futures = "0.3.26"
 itertools = "0.10.5"
 rand = "0.8.5"
@@ -48,4 +48,4 @@ ring = { version = "0.17.5", features = ["wasm32_unknown_unknown_js"] }
 tracing-test = "0.2.4"
 
 [build-dependencies]
-fedimint-build = { version = "0.2.2-rc5", path = "../fedimint-build" }
+fedimint-build = { version = "0.2.2-rc6", path = "../fedimint-build" }
diff --git a/fedimint-core/Cargo.toml b/fedimint-core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fedimint-core"
-version = "0.2.2-rc5"
+version = "0.2.2-rc6"
 authors = ["The Fedimint Developers"]
 edition = "2021"
 description = "fedimint-core provides common code used by both client and server."
@@ -30,7 +30,7 @@ strum = "0.24"
 strum_macros = "0.24"
 hex = { version = "0.4.3", features = [ "serde"] }
 sha3 = "0.10.5"
-tbs = { package = "fedimint-tbs", version = "0.2.2-rc5", path = "../crypto/tbs" }
+tbs = { package = "fedimint-tbs", version = "0.2.2-rc6", path = "../crypto/tbs" }
 tokio = { version = "1.26.0", features = ["sync", "io-util"] }
 thiserror = "1.0.39"
 tracing ="0.1.37"
@@ -42,8 +42,8 @@ bitcoin_hashes = { version = "0.11", features = ["serde"] }
 erased-serde = "0.3"
 lightning = "0.0.118"
 lightning-invoice = "0.26.0"
-fedimint-derive = { version = "0.2.2-rc5", path = "../fedimint-derive" }
-fedimint-logging = { version = "0.2.2-rc5", path = "../fedimint-logging" }
+fedimint-derive = { version = "0.2.2-rc6", path = "../fedimint-derive" }
+fedimint-logging = { version = "0.2.2-rc6", path = "../fedimint-logging" }
 rand = "0.8.5"
 miniscript = { version = "9.0.2", features = [ "compiler", "serde" ] }
 secp256k1-zkp = { version = "0.7.0", features = [ "use-serde", "bitcoin_hashes", "global-context" ] }

diff --git a/fedimint-dbtool/Cargo.toml b/fedimint-dbtool/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fedimint-dbtool"
-version = "0.2.2-rc5"
+version = "0.2.2-rc6"
 edition = "2021"
 license = "MIT"
 description = "Tool to inspect Fedimint client and server databases"
@@ -17,25 +17,25 @@ name = "fedimint-dbtool"
 
 [dependencies]
 anyhow = "1.0.68"
-fedimint-aead = { version = "0.2.2-rc5", path = "../crypto/aead" }
+fedimint-aead = { version = "0.2.2-rc6", path = "../crypto/aead" }
 bitcoin_hashes = "0.11.0"
 bytes = "1.4.0"
 clap = { version = "4.1.6", features = ["derive", "env"] }
-fedimint-core = { version = "0.2.2-rc5", path = "../fedimint-core" }
-fedimint-client = { version = "0.2.2-rc5", path = "../fedimint-client" }
-fedimint-server = { version = "0.2.2-rc5", path = "../fedimint-server" }
-fedimint-rocksdb = { version = "0.2.2-rc5", path = "../fedimint-rocksdb" }
-fedimint-mint-server = { version = "0.2.2-rc5", path = "../modules/fedimint-mint-server" }
-fedimint-mint-client = { version = "0.2.2-rc5", path = "../modules/fedimint-mint-client" }
-fedimint-ln-server = { version = "0.2.2-rc5", path = "../modules/fedimint-ln-server" }
-fedimint-ln-client = { version = "0.2.2-rc5", path = "../modules/fedimint-ln-client" }
-fedimint-logging = { version = "0.2.2-rc5", path = "../fedimint-logging" }
-fedimint-wallet-server = { version = "0.2.2-rc5", path = "../modules/fedimint-wallet-server" }
-fedimint-wallet-client = { version = "0.2.2-rc5", path = "../modules/fedimint-wallet-client" }
+fedimint-core = { version = "0.2.2-rc6", path = "../fedimint-core" }
+fedimint-client = { version = "0.2.2-rc6", path = "../fedimint-client" }
+fedimint-server = { version = "0.2.2-rc6", path = "../fedimint-server" }
+fedimint-rocksdb = { version = "0.2.2-rc6", path = "../fedimint-rocksdb" }
+fedimint-mint-server = { version = "0.2.2-rc6", path = "../modules/fedimint-mint-server" }
+fedimint-mint-client = { version = "0.2.2-rc6", path = "../modules/fedimint-mint-client" }
+fedimint-ln-server = { version = "0.2.2-rc6", path = "../modules/fedimint-ln-server" }
+fedimint-ln-client = { version = "0.2.2-rc6", path = "../modules/fedimint-ln-client" }
+fedimint-logging = { version = "0.2.2-rc6", path = "../fedimint-logging" }
+fedimint-wallet-server = { version = "0.2.2-rc6", path = "../modules/fedimint-wallet-server" }
+fedimint-wallet-client = { version = "0.2.2-rc6", path = "../modules/fedimint-wallet-client" }
 futures = "0.3.24"
 erased-serde = "0.3"
 hex = { version = "0.4.3", features = ["serde"] }
-ln-gateway = { package = "fedimint-ln-gateway", version = "0.2.2-rc5", path = "../gateway/ln-gateway" }
+ln-gateway = { package = "fedimint-ln-gateway", version = "0.2.2-rc6", path = "../gateway/ln-gateway" }
 serde = { version = "1.0.149", features = ["derive"] }
 serde_json = "1.0.91"
 strum = "0.24"

diff --git a/fedimint-derive/Cargo.toml b/fedimint-derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fedimint-derive"
-version = "0.2.2-rc5"
+version = "0.2.2-rc6"
 authors = ["The Fedimint Developers"]
 edition = "2021"
 description = "fedimint-derive provides helper macros for serialization."

diff --git a/fedimint-load-test-tool/Cargo.toml b/fedimint-load-test-tool/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fedimint-load-test-tool"
-version = "0.2.2-rc5"
+version = "0.2.2-rc6"
 authors = ["The Fedimint Developers"]
 edition = "2021"
 description = "fedimint-load-test-tool is a tool to load test the fedimint server and gateway."
@@ -16,14 +16,14 @@ anyhow = "1"
 base64 = "0.20.0"
 bitcoin = "0.29.2"
 clap = { version = "4.1.6", features = ["derive", "std", "help", "usage", "error-context", "suggestions", "env" ], default-features = false }
-devimint = { version = "0.2.2-rc5", path = "../devimint" }
-fedimint-client = { version = "0.2.2-rc5", path = "../fedimint-client" }
-fedimint-core = { version = "0.2.2-rc5", path = "../fedimint-core" }
-fedimint-ln-client = { version = "0.2.2-rc5", path = "../modules/fedimint-ln-client" }
-fedimint-logging = { version = "0.2.2-rc5", path = "../fedimint-logging" }
-fedimint-mint-client = { version = "0.2.2-rc5", path = "../modules/fedimint-mint-client" }
-fedimint-rocksdb = { version = "0.2.2-rc5", path = "../fedimint-rocksdb" }
-fedimint-wallet-client = { version = "0.2.2-rc5", path = "../modules/fedimint-wallet-client" }
+devimint = { version = "0.2.2-rc6", path = "../devimint" }
+fedimint-client = { version = "0.2.2-rc6", path = "../fedimint-client" }
+fedimint-core = { version = "0.2.2-rc6", path = "../fedimint-core" }
+fedimint-ln-client = { version = "0.2.2-rc6", path = "../modules/fedimint-ln-client" }
+fedimint-logging = { version = "0.2.2-rc6", path = "../fedimint-logging" }
+fedimint-mint-client = { version = "0.2.2-rc6", path = "../modules/fedimint-mint-client" }
+fedimint-rocksdb = { version = "0.2.2-rc6", path = "../fedimint-rocksdb" }
+fedimint-wallet-client = { version = "0.2.2-rc6", path = "../modules/fedimint-wallet-client" }
 futures = "0.3"
 jsonrpsee-core = { version = "0.20.0", features = [ "client" ] }
 jsonrpsee-types = { version = "0.20.0" }
@@ -39,4 +39,4 @@ url = { version = "2.3.1", features = ["serde"] }
 jsonrpsee-ws-client = { version = "0.20.0", features = ["webpki-tls"], default-features = false }
 
 [build-dependencies]
-fedimint-build = { version = "0.2.2-rc5", path = "../fedimint-build" }
+fedimint-build = { version = "0.2.2-rc6", path = "../fedimint-build" }
diff --git a/fedimint-logging/Cargo.toml b/fedimint-logging/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fedimint-logging"
-version = "0.2.2-rc5"
+version = "0.2.2-rc6"
 authors = ["The Fedimint Developers"]
 edition = "2021"
 description = "contains some utilities for logging and tracing"

diff --git a/fedimint-metrics/Cargo.toml b/fedimint-metrics/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fedimint-metrics"
-version = "0.2.2-rc5"
+version = "0.2.2-rc6"
 edition = "2021"
 license = "MIT"
 description = "fedimint-metrics allows exporting prometheus metrics from Fedimint."
@@ -16,7 +16,7 @@ path = "./src/lib.rs"
 [dependencies]
 anyhow = { version = "1.0.71", features = ["backtrace"] }
 axum = "0.6.18"
-fedimint-core = { version = "0.2.2-rc5", path = "../fedimint-core" }
+fedimint-core = { version = "0.2.2-rc6", path = "../fedimint-core" }
 lazy_static = "1.4.0"
 prometheus = "0.13.3"
 tokio = "1"

diff --git a/fedimint-rocksdb/Cargo.toml b/fedimint-rocksdb/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fedimint-rocksdb"
-version = "0.2.2-rc5"
+version = "0.2.2-rc6"
 authors = ["The Fedimint Developers"]
 edition = "2021"
 description = "fedimint-rocksdb provides a rocksdb-backed database implementation for Fedimint."
@@ -19,7 +19,7 @@ path = "src/lib.rs"
 [dependencies]
 anyhow = "1.0.66"
 async-trait = "0.1.73"
-fedimint-core = { version = "0.2.2-rc5", path = "../fedimint-core" }
+fedimint-core = { version = "0.2.2-rc6", path = "../fedimint-core" }
 futures = "0.3.24"
 rocksdb = { version = "0.21.0" }
 tracing = "0.1.37"

diff --git a/fedimint-server/Cargo.toml b/fedimint-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fedimint-server"
-version = "0.2.2-rc5"
+version = "0.2.2-rc6"
 authors = ["The Fedimint Developers"]
 edition = "2021"
 description = "fedimint is the main consensus code for processing transactions and REST API"
@@ -17,7 +17,7 @@ name = "fedimint_server"
 path = "src/lib.rs"
 
 [dependencies]
-fedimint-aead = { version = "0.2.2-rc5", path = "../crypto/aead" }
+fedimint-aead = { version = "0.2.2-rc6", path = "../crypto/aead" }
 anyhow = "1.0.66"
 async-channel = "1.8.0"
 async-trait = "0.1.73"
@@ -28,8 +28,8 @@ bytes = "1.4.0"
 hbbft = { workspace = true }
 futures = "0.3.24"
 itertools = "0.10.5"
-fedimint-core = { version = "0.2.2-rc5", path = "../fedimint-core" }
-fedimint-logging = { version = "0.2.2-rc5", path = "../fedimint-logging" }
+fedimint-core = { version = "0.2.2-rc6", path = "../fedimint-core" }
+fedimint-logging = { version = "0.2.2-rc6", path = "../fedimint-logging" }
 rand = "0.8"
 rcgen = "=0.10.0"
 secp256k1-zkp = { version = "0.7.0", features = [ "global-context", "bitcoin_hashes" ] }
@@ -38,7 +38,7 @@ serde_json = "1.0.91"
 sha3 = "0.10.5"
 strum = "0.24"
 strum_macros = "0.24"
-tbs = { package = "fedimint-tbs", version = "0.2.2-rc5", path = "../crypto/tbs" }
+tbs = { package = "fedimint-tbs", version = "0.2.2-rc6", path = "../crypto/tbs" }
 thiserror = "1.0.39"
 tracing ="0.1.37"
 url = { version = "2.3.1", features = ["serde"] }
@@ -49,8 +49,8 @@ tokio-stream = "0.1.11"
 tokio-rustls = "0.23.4"
 tokio-util = { version = "0.7.4", features = [ "codec" ] }
 tracing-subscriber = { version = "0.3.16", features = [ "env-filter" ] }
-aleph-bft = { version = "0.30.0", default-features = false }
-aleph-bft-types = "0.10.0"
+aleph-bft = { package = "fedimint-aleph-bft", version = "0.33.0", default-features = false }
+aleph-bft-types = "0.11.0"
 bitcoin_30 = { package = "bitcoin", version = "0.30.0" }
 bitcoin_hashes_12 = { package = "bitcoin_hashes", version = "0.12.0" }
 parity-scale-codec = "3.5.0"
@@ -64,4 +64,4 @@ fedimint-testing = { path = "../fedimint-testing" }
 test-log = { version = "0.2", features = [ "trace" ], default-features = false }
 
 [build-dependencies]
-fedimint-build = { version = "0.2.2-rc5", path = "../fedimint-build" }
+fedimint-build = { version = "0.2.2-rc6", path = "../fedimint-build" }