From 0bf9a0ee2c06c95b7481f94101ae6f8df9ce7aaf Mon Sep 17 00:00:00 2001 From: Steve Myers Date: Wed, 24 May 2023 12:06:38 -0500 Subject: [PATCH] Pin hashlink to 0.8.1 for sqlite feature to keep the MSRV to 1.57.0 --- Cargo.toml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 270bd67e..c91369e4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,6 +32,8 @@ rocksdb = { version = "0.14", default-features = false, features = ["snappy"], o cc = { version = ">=1.0.64", optional = true } socks = { version = "0.3", optional = true } hwi = { version = "0.5", optional = true, features = ["use-miniscript"] } +# required for sqlite feature, hashlink versions after 0.8.1 depend on Hashbrown 0.13 with MSRV 1.61.0 +hashlink = { version = "=0.8.1", optional = true } bip39 = { version = "2.0.0", optional = true } bitcoinconsensus = { version = "0.19.0-3", optional = true } @@ -56,7 +58,7 @@ default = ["std", "key-value-db", "electrum"] # std feature is always required unless building for wasm32-unknown-unknown target # if building for wasm user must add dependencies bitcoin/no-std,miniscript/no-std std = ["bitcoin/std", "miniscript/std"] -sqlite = ["rusqlite", "ahash"] +sqlite = ["rusqlite", "ahash", "hashlink"] sqlite-bundled = ["sqlite", "rusqlite/bundled"] compact_filters = ["rocksdb", "socks", "cc"] key-value-db = ["sled"] @@ -110,9 +112,9 @@ dev-getrandom-wasm = ["getrandom/js"] miniscript = { version = "9.0", features = ["std"] } bitcoin = { version = "0.29.2", features = ["std"] } lazy_static = "1.4" -env_logger = "0.7" +env_logger = { version = "0.7", default-features = false } electrsd = "0.22" -# Move back to importing from rust-bitcoin once https://github.com/rust-bitcoin/rust-bitcoin/pull/1342 is released +# Remove after upgrade to rust-bitcoin ^0.30 where base64 is re-exported base64 = "^0.13" assert_matches = "1.5.0" # zip versions after 0.6.3 don't work with our MSRV 1.57.0