Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
74 changes: 64 additions & 10 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "miniscript"
version = "12.0.0"
version = "13.0.0"
authors = ["Andrew Poelstra <[email protected]>, Sanket Kanjalkar <[email protected]>"]
license = "CC0-1.0"
homepage = "https://github.com/rust-bitcoin/rust-miniscript/"
Expand All @@ -12,25 +12,29 @@ edition = "2018"

[features]
default = ["std"]
std = ["bitcoin/std", "bitcoin/secp-recovery", "bech32/std"]
no-std = ["bech32/alloc"]
std = ["bip32/std", "bitcoin-address/std", "bitcoin-primitives/crypto-std", "bitcoin-primitives/bech32-std", "psbt-v0/std", "secp256k1/std", "secp256k1/recovery"]
no-std = []
compiler = []
trace = []

serde = ["actual-serde", "bitcoin/serde"]
rand = ["bitcoin/rand"]
base64 = ["bitcoin/base64"]
serde = ["actual-serde", "bip32/serde", "bitcoin-address/serde", "bitcoin-primitives/crypto-serde", "psbt-v0/serde", "secp256k1/serde"]
rand = ["secp256k1/rand"]
base64 = ["psbt-v0/base64"]

[dependencies]
bech32 = { version = "0.11.0", default-features = false }
bitcoin = { version = "0.32.0", default-features = false }
bitcoin-address = { version = "0.1.0", default-features = false }
bip32 = { version = "0.1.0", default-features = false }
bitcoin-primitives = { version = "0.1.0", default-features = false, features = ["crypto", "bech32"] }
psbt-v0 = { version = "0.1.0", default-features = false, features = [] }
secp256k1 = { version = "0.29.0", default-features = false, features = ["hashes", "alloc"] }

# Do NOT use this as a feature! Use the `serde` feature instead.
actual-serde = { package = "serde", version = "1.0.103", optional = true }

[dev-dependencies]
serde_test = "1.0.147"
bitcoin = { version = "0.32.0", features = ["base64"] }
bitcoin-primitives = { version = "0.1.0", features = ["crypto-std"] }
psbt-v0 = { version = "0.1.0", features = ["base64"] }
secp256k1 = {version = "0.29.0", features = ["rand-std"]}

[[example]]
Expand Down Expand Up @@ -66,5 +70,55 @@ name = "big"
required-features = ["std", "base64", "compiler"]

[workspace]
members = ["bitcoind-tests", "fuzz"]
members = ["fuzz"]
exclude = ["embedded"]

[patch.crates-io.base58ck]
path = "/home/tobin/build/github.com/tcharding/rust-bitcoin/crate-smashing/base58"
# git = "https://github.com/tcharding/rust-bitcoin"
# branch = "crate-smashing"

[patch.crates-io.bip32]
path = "/home/tobin/build/github.com/tcharding/rust-bitcoin/crate-smashing/bip32"
# git = "https://github.com/tcharding/rust-bitcoin"
# branch = "crate-smashing"

[patch.crates-io.bitcoin]
path = "/home/tobin/build/github.com/tcharding/rust-bitcoin/crate-smashing/bitcoin"
# git = "https://github.com/tcharding/rust-bitcoin"
# branch = "crate-smashing"

[patch.crates-io.bitcoin-address]
path = "/home/tobin/build/github.com/tcharding/rust-bitcoin/crate-smashing/address"
# git = "https://github.com/tcharding/rust-bitcoin"
# branch = "crate-smashing"

[patch.crates-io.bitcoin_hashes]
path = "/home/tobin/build/github.com/tcharding/rust-bitcoin/crate-smashing/hashes"
# git = "https://github.com/tcharding/rust-bitcoin"
# branch = "crate-smashing"

[patch.crates-io.bitcoin-internals]
path = "/home/tobin/build/github.com/tcharding/rust-bitcoin/crate-smashing/internals"
# git = "https://github.com/tcharding/rust-bitcoin"
# branch = "crate-smashing"

[patch.crates-io.bitcoin-io]
path = "/home/tobin/build/github.com/tcharding/rust-bitcoin/crate-smashing/io"
# git = "https://github.com/tcharding/rust-bitcoin"
# branch = "crate-smashing"

[patch.crates-io.bitcoin-primitives]
path = "/home/tobin/build/github.com/tcharding/rust-bitcoin/crate-smashing/primitives"
# git = "https://github.com/tcharding/rust-bitcoin"
# branch = "crate-smashing"

[patch.crates-io.psbt-v0]
path = "/home/tobin/build/github.com/tcharding/rust-bitcoin/crate-smashing/psbt"
# git = "https://github.com/tcharding/rust-bitcoin"
# branch = "crate-smashing"

[patch.crates-io.bitcoin-units]
path = "/home/tobin/build/github.com/tcharding/rust-bitcoin/crate-smashing/units"
# git = "https://github.com/tcharding/rust-bitcoin"
# branch = "crate-smashing"
14 changes: 0 additions & 14 deletions bitcoind-tests/Cargo.toml

This file was deleted.

Binary file removed bitcoind-tests/bin/bitcoind
Binary file not shown.
3 changes: 0 additions & 3 deletions bitcoind-tests/src/main.rs

This file was deleted.

34 changes: 0 additions & 34 deletions bitcoind-tests/tests/data/random_ms.txt

This file was deleted.

41 changes: 0 additions & 41 deletions bitcoind-tests/tests/setup/mod.rs

This file was deleted.

Loading