From e6387f8f27d0449c37f4bca2685fc9b45ee9be8f Mon Sep 17 00:00:00 2001 From: Steve Myers Date: Mon, 20 Mar 2023 12:37:22 -0500 Subject: [PATCH 1/8] Remove keyword from file_store cargo metadata --- crates/file_store/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/file_store/Cargo.toml b/crates/file_store/Cargo.toml index e17593c1a..65168730a 100644 --- a/crates/file_store/Cargo.toml +++ b/crates/file_store/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" license = "MIT OR Apache-2.0" repository = "https://github.com/bitcoindevkit/bdk" documentation = "https://docs.rs/bdk_file_store" -keywords = ["bitcoin", "persist", "persistence", "bdk", "file", "store"] +keywords = ["bitcoin", "persist", "persistence", "bdk", "file"] authors = ["Bitcoin Dev Kit Developers"] readme = "README.md" From 747866579dea02d4609c5d4d7bcf2d426cdac58f Mon Sep 17 00:00:00 2001 From: Steve Myers Date: Mon, 20 Mar 2023 12:45:33 -0500 Subject: [PATCH 2/8] Add description to file_store cargo metadata --- crates/file_store/Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/crates/file_store/Cargo.toml b/crates/file_store/Cargo.toml index 65168730a..791780409 100644 --- a/crates/file_store/Cargo.toml +++ b/crates/file_store/Cargo.toml @@ -5,6 +5,7 @@ edition = "2021" license = "MIT OR Apache-2.0" repository = "https://github.com/bitcoindevkit/bdk" documentation = "https://docs.rs/bdk_file_store" +description = "A simple append-only flat file implementation of Persist for Bitcoin Dev Kit." keywords = ["bitcoin", "persist", "persistence", "bdk", "file"] authors = ["Bitcoin Dev Kit Developers"] readme = "README.md" From bea3d133f2c09c4bc1402f16bc89632c8b7a3036 Mon Sep 17 00:00:00 2001 From: Casey Bowman Date: Tue, 15 Aug 2023 15:02:16 -0500 Subject: [PATCH 3/8] Correct the derivation paths for the example wallets using testnet --- example-crates/wallet_electrum/src/main.rs | 4 ++-- example-crates/wallet_esplora/src/main.rs | 4 ++-- example-crates/wallet_esplora_async/src/main.rs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/example-crates/wallet_electrum/src/main.rs b/example-crates/wallet_electrum/src/main.rs index 5145d593b..d647dcf7b 100644 --- a/example-crates/wallet_electrum/src/main.rs +++ b/example-crates/wallet_electrum/src/main.rs @@ -19,8 +19,8 @@ fn main() -> Result<(), Box> { let db_path = std::env::temp_dir().join("bdk-electrum-example"); let db = KeychainStore::new_from_path(db_path)?; - let external_descriptor = "wpkh(tprv8ZgxMBicQKsPdy6LMhUtFHAgpocR8GC6QmwMSFpZs7h6Eziw3SpThFfczTDh5rW2krkqffa11UpX3XkeTTB2FvzZKWXqPY54Y6Rq4AQ5R8L/84'/0'/0'/0/*)"; - let internal_descriptor = "wpkh(tprv8ZgxMBicQKsPdy6LMhUtFHAgpocR8GC6QmwMSFpZs7h6Eziw3SpThFfczTDh5rW2krkqffa11UpX3XkeTTB2FvzZKWXqPY54Y6Rq4AQ5R8L/84'/0'/0'/1/*)"; + let external_descriptor = "wpkh(tprv8ZgxMBicQKsPdy6LMhUtFHAgpocR8GC6QmwMSFpZs7h6Eziw3SpThFfczTDh5rW2krkqffa11UpX3XkeTTB2FvzZKWXqPY54Y6Rq4AQ5R8L/84'/1'/0'/0/*)"; + let internal_descriptor = "wpkh(tprv8ZgxMBicQKsPdy6LMhUtFHAgpocR8GC6QmwMSFpZs7h6Eziw3SpThFfczTDh5rW2krkqffa11UpX3XkeTTB2FvzZKWXqPY54Y6Rq4AQ5R8L/84'/1'/0'/1/*)"; let mut wallet = Wallet::new( external_descriptor, diff --git a/example-crates/wallet_esplora/src/main.rs b/example-crates/wallet_esplora/src/main.rs index d8eda32a2..6838f089d 100644 --- a/example-crates/wallet_esplora/src/main.rs +++ b/example-crates/wallet_esplora/src/main.rs @@ -15,8 +15,8 @@ const PARALLEL_REQUESTS: usize = 5; fn main() -> Result<(), Box> { let db_path = std::env::temp_dir().join("bdk-esplora-example"); let db = KeychainStore::new_from_path(db_path)?; - let external_descriptor = "wpkh(tprv8ZgxMBicQKsPdy6LMhUtFHAgpocR8GC6QmwMSFpZs7h6Eziw3SpThFfczTDh5rW2krkqffa11UpX3XkeTTB2FvzZKWXqPY54Y6Rq4AQ5R8L/84'/0'/0'/0/*)"; - let internal_descriptor = "wpkh(tprv8ZgxMBicQKsPdy6LMhUtFHAgpocR8GC6QmwMSFpZs7h6Eziw3SpThFfczTDh5rW2krkqffa11UpX3XkeTTB2FvzZKWXqPY54Y6Rq4AQ5R8L/84'/0'/0'/1/*)"; + let external_descriptor = "wpkh(tprv8ZgxMBicQKsPdy6LMhUtFHAgpocR8GC6QmwMSFpZs7h6Eziw3SpThFfczTDh5rW2krkqffa11UpX3XkeTTB2FvzZKWXqPY54Y6Rq4AQ5R8L/84'/1'/0'/0/*)"; + let internal_descriptor = "wpkh(tprv8ZgxMBicQKsPdy6LMhUtFHAgpocR8GC6QmwMSFpZs7h6Eziw3SpThFfczTDh5rW2krkqffa11UpX3XkeTTB2FvzZKWXqPY54Y6Rq4AQ5R8L/84'/1'/0'/1/*)"; let mut wallet = Wallet::new( external_descriptor, diff --git a/example-crates/wallet_esplora_async/src/main.rs b/example-crates/wallet_esplora_async/src/main.rs index b78b09dfa..dea2bda48 100644 --- a/example-crates/wallet_esplora_async/src/main.rs +++ b/example-crates/wallet_esplora_async/src/main.rs @@ -16,8 +16,8 @@ const PARALLEL_REQUESTS: usize = 5; async fn main() -> Result<(), Box> { let db_path = std::env::temp_dir().join("bdk-esplora-example"); let db = KeychainStore::new_from_path(db_path)?; - let external_descriptor = "wpkh(tprv8ZgxMBicQKsPdy6LMhUtFHAgpocR8GC6QmwMSFpZs7h6Eziw3SpThFfczTDh5rW2krkqffa11UpX3XkeTTB2FvzZKWXqPY54Y6Rq4AQ5R8L/84'/0'/0'/0/*)"; - let internal_descriptor = "wpkh(tprv8ZgxMBicQKsPdy6LMhUtFHAgpocR8GC6QmwMSFpZs7h6Eziw3SpThFfczTDh5rW2krkqffa11UpX3XkeTTB2FvzZKWXqPY54Y6Rq4AQ5R8L/84'/0'/0'/1/*)"; + let external_descriptor = "wpkh(tprv8ZgxMBicQKsPdy6LMhUtFHAgpocR8GC6QmwMSFpZs7h6Eziw3SpThFfczTDh5rW2krkqffa11UpX3XkeTTB2FvzZKWXqPY54Y6Rq4AQ5R8L/84'/1'/0'/0/*)"; + - let internal_descriptor = "wpkh(tprv8ZgxMBicQKsPdy6LMhUtFHAgpocR8GC6QmwMSFpZs7h6Eziw3SpThFfczTDh5rW2krkqffa11UpX3XkeTTB2FvzZKWXqPY54Y6Rq4AQ5R8L/84'/1'/0'/1/*)"; let mut wallet = Wallet::new( external_descriptor, From d3d238fd7e11f62821905501f14f66b109082891 Mon Sep 17 00:00:00 2001 From: Casey Bowman Date: Tue, 15 Aug 2023 15:03:04 -0500 Subject: [PATCH 4/8] Update esplora-client version to 0.4 --- crates/esplora/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/esplora/Cargo.toml b/crates/esplora/Cargo.toml index e55b6fa01..7375ca26e 100644 --- a/crates/esplora/Cargo.toml +++ b/crates/esplora/Cargo.toml @@ -13,7 +13,7 @@ readme = "README.md" [dependencies] bdk_chain = { path = "../chain", version = "0.4.0", features = ["serde", "miniscript"] } -esplora-client = { version = "0.3", default-features = false } +esplora-client = { version = "0.4", default-features = false } async-trait = { version = "0.1.66", optional = true } futures = { version = "0.3.26", optional = true } From 9cb7a915c26c0390e8a7f4a446337a8eae6361e7 Mon Sep 17 00:00:00 2001 From: Casey Bowman Date: Tue, 15 Aug 2023 17:12:15 -0500 Subject: [PATCH 5/8] Remove hyphen; reverse esplora-client update so that PR is focused on coin type correction --- crates/esplora/Cargo.toml | 2 +- example-crates/wallet_esplora_async/src/main.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/esplora/Cargo.toml b/crates/esplora/Cargo.toml index 7375ca26e..e55b6fa01 100644 --- a/crates/esplora/Cargo.toml +++ b/crates/esplora/Cargo.toml @@ -13,7 +13,7 @@ readme = "README.md" [dependencies] bdk_chain = { path = "../chain", version = "0.4.0", features = ["serde", "miniscript"] } -esplora-client = { version = "0.4", default-features = false } +esplora-client = { version = "0.3", default-features = false } async-trait = { version = "0.1.66", optional = true } futures = { version = "0.3.26", optional = true } diff --git a/example-crates/wallet_esplora_async/src/main.rs b/example-crates/wallet_esplora_async/src/main.rs index dea2bda48..8e8172bfc 100644 --- a/example-crates/wallet_esplora_async/src/main.rs +++ b/example-crates/wallet_esplora_async/src/main.rs @@ -17,7 +17,7 @@ async fn main() -> Result<(), Box> { let db_path = std::env::temp_dir().join("bdk-esplora-example"); let db = KeychainStore::new_from_path(db_path)?; let external_descriptor = "wpkh(tprv8ZgxMBicQKsPdy6LMhUtFHAgpocR8GC6QmwMSFpZs7h6Eziw3SpThFfczTDh5rW2krkqffa11UpX3XkeTTB2FvzZKWXqPY54Y6Rq4AQ5R8L/84'/1'/0'/0/*)"; - - let internal_descriptor = "wpkh(tprv8ZgxMBicQKsPdy6LMhUtFHAgpocR8GC6QmwMSFpZs7h6Eziw3SpThFfczTDh5rW2krkqffa11UpX3XkeTTB2FvzZKWXqPY54Y6Rq4AQ5R8L/84'/1'/0'/1/*)"; + let internal_descriptor = "wpkh(tprv8ZgxMBicQKsPdy6LMhUtFHAgpocR8GC6QmwMSFpZs7h6Eziw3SpThFfczTDh5rW2krkqffa11UpX3XkeTTB2FvzZKWXqPY54Y6Rq4AQ5R8L/84'/1'/0'/1/*)"; let mut wallet = Wallet::new( external_descriptor, From 6a4c2b6424f057d6654628267e26bc1acf7d80bd Mon Sep 17 00:00:00 2001 From: Casey Bowman Date: Tue, 15 Aug 2023 17:33:23 -0500 Subject: [PATCH 6/8] Upgrade esplora-client to 0.4.0 --- crates/esplora/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/esplora/Cargo.toml b/crates/esplora/Cargo.toml index e55b6fa01..3a73c06bf 100644 --- a/crates/esplora/Cargo.toml +++ b/crates/esplora/Cargo.toml @@ -12,8 +12,8 @@ readme = "README.md" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -bdk_chain = { path = "../chain", version = "0.4.0", features = ["serde", "miniscript"] } -esplora-client = { version = "0.3", default-features = false } +bdk_chain = { path = "../chain",version = "0.4.0", features = ["serde", "miniscript"] } +esplora-client = { version = "0.4.0", default-features = false } async-trait = { version = "0.1.66", optional = true } futures = { version = "0.3.26", optional = true } From 0fca6f3196e2de0c91f19545316a2b2e2df583ac Mon Sep 17 00:00:00 2001 From: Casey Bowman Date: Tue, 15 Aug 2023 19:54:58 -0500 Subject: [PATCH 7/8] Reverse esplora-client version again to retain PR focus --- crates/esplora/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/esplora/Cargo.toml b/crates/esplora/Cargo.toml index 3a73c06bf..c1bfe9727 100644 --- a/crates/esplora/Cargo.toml +++ b/crates/esplora/Cargo.toml @@ -13,7 +13,7 @@ readme = "README.md" [dependencies] bdk_chain = { path = "../chain",version = "0.4.0", features = ["serde", "miniscript"] } -esplora-client = { version = "0.4.0", default-features = false } +esplora-client = { version = "0.3", default-features = false } async-trait = { version = "0.1.66", optional = true } futures = { version = "0.3.26", optional = true } From 086e60c84ff94a0a5ef59cf299847e2c33d04d02 Mon Sep 17 00:00:00 2001 From: Casey Bowman Date: Tue, 15 Aug 2023 20:06:52 -0500 Subject: [PATCH 8/8] Readd space to esplora Cargo file --- crates/esplora/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/esplora/Cargo.toml b/crates/esplora/Cargo.toml index c1bfe9727..e55b6fa01 100644 --- a/crates/esplora/Cargo.toml +++ b/crates/esplora/Cargo.toml @@ -12,7 +12,7 @@ readme = "README.md" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -bdk_chain = { path = "../chain",version = "0.4.0", features = ["serde", "miniscript"] } +bdk_chain = { path = "../chain", version = "0.4.0", features = ["serde", "miniscript"] } esplora-client = { version = "0.3", default-features = false } async-trait = { version = "0.1.66", optional = true } futures = { version = "0.3.26", optional = true }