Skip to content

WIP: Demonstrate usage of the bitcoin-units compat layer #667

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jamillambert wants to merge 1 commit into from
Closed

WIP: Demonstrate usage of the bitcoin-units compat layer #667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
111 changes: 84 additions & 27 deletions Cargo-minimal.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,10 @@ dependencies = [

[[package]]
name = "base58ck"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c8d66485a3a2ea485c1913c4572ce0256067a5377ac8c75c4960e1cda98605f"
version = "0.1.101"
source = "git+https://github.com/tcharding/rust-bitcoin?branch=push-pwqxwuswpnsz#29160328b998377dde67adf353a417b4851212c9"
dependencies = [
"bitcoin-internals",
"bitcoin_hashes",
"bitcoin_hashes 0.14.101",
]

[[package]]
Expand All @@ -95,45 +93,86 @@ checksum = "d965446196e3b7decd44aa7ee49e31d630118f90ef12f97900f262eb915c951d"

[[package]]
name = "bitcoin"
version = "0.32.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4bf33434c870e98ecc8608588ccc990c5daba9ba9ad39733dc85fba22c211504"
version = "0.32.101"
source = "git+https://github.com/tcharding/rust-bitcoin?branch=push-pwqxwuswpnsz#29160328b998377dde67adf353a417b4851212c9"
dependencies = [
"base58ck",
"base64 0.21.7",
"bech32",
"bitcoin-internals",
"bitcoin-io",
"bitcoin-units",
"bitcoin_hashes",
"hex-conservative",
"bitcoin-consensus-encoding 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"bitcoin-io 0.1.101",
"bitcoin-units 0.1.101",
"bitcoin-units 1.0.0",
"bitcoin_hashes 0.14.101",
"hex-conservative 0.2.2",
"hex_lit",
"secp256k1",
"serde",
]

[[package]]
name = "bitcoin-internals"
version = "0.3.0"
name = "bitcoin-consensus-encoding"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "30bdbe14aa07b06e6cfeffc529a1f099e5fbe249524f8125358604df99a4bed2"
checksum = "207311705279250ba465076a1bac4b1ac982855fff73fc5f67e22158ac58cdc9"
dependencies = [
"bitcoin-internals 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"hex-conservative 1.2.0",
"serde",
]

[[package]]
name = "bitcoin-consensus-encoding"
version = "1.1.0"
source = "git+https://github.com/tcharding/rust-bitcoin?branch=push-puzmtlnlttlr#583a64812eb6ca17a262a7beffbfab0470cb061a"
dependencies = [
"bitcoin-internals 0.6.0 (git+https://github.com/tcharding/rust-bitcoin?branch=push-puzmtlnlttlr)",
"hex-conservative 1.2.0",
"serde",
]

[[package]]
name = "bitcoin-internals"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d573f4cf32996a8dce612e4348cece65a241f1882ed594047c9ba348e8869fa5"

[[package]]
name = "bitcoin-internals"
version = "0.6.0"
source = "git+https://github.com/tcharding/rust-bitcoin?branch=push-puzmtlnlttlr#583a64812eb6ca17a262a7beffbfab0470cb061a"

[[package]]
name = "bitcoin-io"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "340e09e8399c7bd8912f495af6aa58bea0c9214773417ffaa8f6460f93aaee56"

[[package]]
name = "bitcoin-io"
version = "0.1.101"
source = "git+https://github.com/tcharding/rust-bitcoin?branch=push-pwqxwuswpnsz#29160328b998377dde67adf353a417b4851212c9"
dependencies = [
"bitcoin-consensus-encoding 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
]

[[package]]
name = "bitcoin-units"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb54da0b28892f3c52203a7191534033e051b6f4b52bc15480681b57b7e036f5"
version = "0.1.101"
source = "git+https://github.com/tcharding/rust-bitcoin?branch=push-pwqxwuswpnsz#29160328b998377dde67adf353a417b4851212c9"
dependencies = [
"bitcoin-internals",
"bitcoin-consensus-encoding 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"bitcoin-units 1.0.0",
"serde",
]

[[package]]
name = "bitcoin-units"
version = "1.0.0"
source = "git+https://github.com/tcharding/rust-bitcoin?branch=push-puzmtlnlttlr#583a64812eb6ca17a262a7beffbfab0470cb061a"
dependencies = [
"bitcoin-consensus-encoding 1.1.0 (git+https://github.com/tcharding/rust-bitcoin?branch=push-puzmtlnlttlr)",
"bitcoin-internals 0.6.0 (git+https://github.com/tcharding/rust-bitcoin?branch=push-puzmtlnlttlr)",
"serde",
]

Expand All @@ -143,8 +182,17 @@ version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16"
dependencies = [
"bitcoin-io",
"hex-conservative",
"bitcoin-io 0.1.2",
"hex-conservative 0.2.2",
]

[[package]]
name = "bitcoin_hashes"
version = "0.14.101"
source = "git+https://github.com/tcharding/rust-bitcoin?branch=push-pwqxwuswpnsz#29160328b998377dde67adf353a417b4851212c9"
dependencies = [
"bitcoin-io 0.1.101",
"hex-conservative 0.2.2",
"serde",
]

Expand All @@ -153,7 +201,7 @@ name = "bitcoind"
version = "0.41.0"
dependencies = [
"anyhow",
"bitcoin_hashes",
"bitcoin_hashes 0.14.0",
"bitreq",
"corepc-client",
"env_logger 0.9.3",
Expand Down Expand Up @@ -320,7 +368,7 @@ name = "electrsd"
version = "0.41.0"
dependencies = [
"anyhow",
"bitcoin_hashes",
"bitcoin_hashes 0.14.0",
"bitcoind",
"bitreq",
"corepc-client",
Expand Down Expand Up @@ -558,9 +606,18 @@ checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"

[[package]]
name = "hex-conservative"
version = "0.2.1"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fda06d18ac606267c40c04e41b9947729bf8b9efe74bd4e82b61a5f26a510b9f"
dependencies = [
"arrayvec",
]

[[package]]
name = "hex-conservative"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5313b072ce3c597065a808dbf612c4c8e8590bdbf8b579508bf7a762c5eae6cd"
checksum = "35431185f361ccf3ffc58254628af5f1f5d5f28531da2e02e5d6c82bbc282a10"
dependencies = [
"arrayvec",
]
Expand Down Expand Up @@ -1109,7 +1166,7 @@ version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0e0cc0f1cf93f4969faf3ea1c7d8a9faed25918d96affa959720823dfe86d4f3"
dependencies = [
"bitcoin_hashes",
"bitcoin_hashes 0.14.0",
"secp256k1-sys",
"serde",
]
Expand Down
111 changes: 84 additions & 27 deletions Cargo-recent.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,10 @@ dependencies = [

[[package]]
name = "base58ck"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c8d66485a3a2ea485c1913c4572ce0256067a5377ac8c75c4960e1cda98605f"
version = "0.1.101"
source = "git+https://github.com/tcharding/rust-bitcoin?branch=push-pwqxwuswpnsz#29160328b998377dde67adf353a417b4851212c9"
dependencies = [
"bitcoin-internals",
"bitcoin_hashes",
"bitcoin_hashes 0.14.101",
]

[[package]]
Expand All @@ -95,45 +93,86 @@ checksum = "d965446196e3b7decd44aa7ee49e31d630118f90ef12f97900f262eb915c951d"

[[package]]
name = "bitcoin"
version = "0.32.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4bf33434c870e98ecc8608588ccc990c5daba9ba9ad39733dc85fba22c211504"
version = "0.32.101"
source = "git+https://github.com/tcharding/rust-bitcoin?branch=push-pwqxwuswpnsz#29160328b998377dde67adf353a417b4851212c9"
dependencies = [
"base58ck",
"base64 0.21.7",
"bech32",
"bitcoin-internals",
"bitcoin-io",
"bitcoin-units",
"bitcoin_hashes",
"hex-conservative",
"bitcoin-consensus-encoding 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"bitcoin-io 0.1.101",
"bitcoin-units 0.1.101",
"bitcoin-units 1.0.0",
"bitcoin_hashes 0.14.101",
"hex-conservative 0.2.2",
"hex_lit",
"secp256k1",
"serde",
]

[[package]]
name = "bitcoin-internals"
version = "0.3.0"
name = "bitcoin-consensus-encoding"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "30bdbe14aa07b06e6cfeffc529a1f099e5fbe249524f8125358604df99a4bed2"
checksum = "207311705279250ba465076a1bac4b1ac982855fff73fc5f67e22158ac58cdc9"
dependencies = [
"bitcoin-internals 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"hex-conservative 1.2.0",
"serde",
]

[[package]]
name = "bitcoin-consensus-encoding"
version = "1.1.0"
source = "git+https://github.com/tcharding/rust-bitcoin?branch=push-puzmtlnlttlr#583a64812eb6ca17a262a7beffbfab0470cb061a"
dependencies = [
"bitcoin-internals 0.6.0 (git+https://github.com/tcharding/rust-bitcoin?branch=push-puzmtlnlttlr)",
"hex-conservative 1.2.0",
"serde",
]

[[package]]
name = "bitcoin-internals"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d573f4cf32996a8dce612e4348cece65a241f1882ed594047c9ba348e8869fa5"

[[package]]
name = "bitcoin-internals"
version = "0.6.0"
source = "git+https://github.com/tcharding/rust-bitcoin?branch=push-puzmtlnlttlr#583a64812eb6ca17a262a7beffbfab0470cb061a"

[[package]]
name = "bitcoin-io"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "340e09e8399c7bd8912f495af6aa58bea0c9214773417ffaa8f6460f93aaee56"

[[package]]
name = "bitcoin-io"
version = "0.1.101"
source = "git+https://github.com/tcharding/rust-bitcoin?branch=push-pwqxwuswpnsz#29160328b998377dde67adf353a417b4851212c9"
dependencies = [
"bitcoin-consensus-encoding 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
]

[[package]]
name = "bitcoin-units"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb54da0b28892f3c52203a7191534033e051b6f4b52bc15480681b57b7e036f5"
version = "0.1.101"
source = "git+https://github.com/tcharding/rust-bitcoin?branch=push-pwqxwuswpnsz#29160328b998377dde67adf353a417b4851212c9"
dependencies = [
"bitcoin-internals",
"bitcoin-consensus-encoding 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"bitcoin-units 1.0.0",
"serde",
]

[[package]]
name = "bitcoin-units"
version = "1.0.0"
source = "git+https://github.com/tcharding/rust-bitcoin?branch=push-puzmtlnlttlr#583a64812eb6ca17a262a7beffbfab0470cb061a"
dependencies = [
"bitcoin-consensus-encoding 1.1.0 (git+https://github.com/tcharding/rust-bitcoin?branch=push-puzmtlnlttlr)",
"bitcoin-internals 0.6.0 (git+https://github.com/tcharding/rust-bitcoin?branch=push-puzmtlnlttlr)",
"serde",
]

Expand All @@ -143,8 +182,17 @@ version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16"
dependencies = [
"bitcoin-io",
"hex-conservative",
"bitcoin-io 0.1.2",
"hex-conservative 0.2.2",
]

[[package]]
name = "bitcoin_hashes"
version = "0.14.101"
source = "git+https://github.com/tcharding/rust-bitcoin?branch=push-pwqxwuswpnsz#29160328b998377dde67adf353a417b4851212c9"
dependencies = [
"bitcoin-io 0.1.101",
"hex-conservative 0.2.2",
"serde",
]

Expand All @@ -153,7 +201,7 @@ name = "bitcoind"
version = "0.41.0"
dependencies = [
"anyhow",
"bitcoin_hashes",
"bitcoin_hashes 0.14.0",
"bitreq",
"corepc-client",
"env_logger 0.9.3",
Expand Down Expand Up @@ -320,7 +368,7 @@ name = "electrsd"
version = "0.41.0"
dependencies = [
"anyhow",
"bitcoin_hashes",
"bitcoin_hashes 0.14.0",
"bitcoind",
"bitreq",
"corepc-client",
Expand Down Expand Up @@ -558,9 +606,18 @@ checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"

[[package]]
name = "hex-conservative"
version = "0.2.1"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fda06d18ac606267c40c04e41b9947729bf8b9efe74bd4e82b61a5f26a510b9f"
dependencies = [
"arrayvec",
]

[[package]]
name = "hex-conservative"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5313b072ce3c597065a808dbf612c4c8e8590bdbf8b579508bf7a762c5eae6cd"
checksum = "35431185f361ccf3ffc58254628af5f1f5d5f28531da2e02e5d6c82bbc282a10"
dependencies = [
"arrayvec",
]
Expand Down Expand Up @@ -1109,7 +1166,7 @@ version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0e0cc0f1cf93f4969faf3ea1c7d8a9faed25918d96affa959720823dfe86d4f3"
dependencies = [
"bitcoin_hashes",
"bitcoin_hashes 0.14.0",
"secp256k1-sys",
"serde",
]
Expand Down
4 changes: 4 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,7 @@ versions = [
"0_18_1",
"0_17_2",
]

[patch.crates-io]
# The compat layer branch: https://github.com/rust-bitcoin/rust-bitcoin/pull/6259
bitcoin = { git = "https://github.com/tcharding/rust-bitcoin", branch = "push-pwqxwuswpnsz" }
2 changes: 1 addition & 1 deletion client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ allowed_duplicates = ["base64"]
client-sync = ["jsonrpc"]

[dependencies]
bitcoin = { version = "0.32.0", default-features = false, features = ["std", "serde"] }
bitcoin = { version = "0.32.101", default-features = false, features = ["std", "serde", "compat"] }
log = "0.4"
serde = { version = "1.0.103", default-features = false, features = [ "derive", "alloc" ] }
serde_json = { version = "1.0.117" }
Expand Down
Loading
Loading