diff --git a/Cargo.lock b/Cargo.lock index 333d246c18..085291e9b7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -441,6 +441,12 @@ version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +[[package]] +name = "bech32" +version = "0.10.0-beta" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98f7eed2b2781a6f0b5c903471d48e15f56fb4e1165df8a9a2337fd1a59d45ea" + [[package]] name = "bincode" version = "1.3.3" @@ -472,6 +478,36 @@ dependencies = [ "which", ] +[[package]] +name = "bitcoin" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd00f3c09b5f21fb357abe32d29946eb8bb7a0862bae62c0b5e4a692acbbe73c" +dependencies = [ + "bech32", + "bitcoin-internals", + "bitcoin_hashes", + "hex-conservative", + "hex_lit", + "secp256k1 0.28.1", +] + +[[package]] +name = "bitcoin-internals" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9425c3bf7089c983facbae04de54513cce73b41c7f9ff8c845b54e7bc64ebbfb" + +[[package]] +name = "bitcoin_hashes" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1930a4dabfebb8d7d9992db18ebe3ae2876f0a305fab206fd168df931ede293b" +dependencies = [ + "bitcoin-internals", + "hex-conservative", +] + [[package]] name = "bitflags" version = "1.3.2" @@ -1587,6 +1623,18 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "hex-conservative" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30ed443af458ccb6d81c1e7e661545f94d3176752fb1df2f543b902a1e0f51e2" + +[[package]] +name = "hex_lit" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3011d1213f159867b13cfd6ac92d2cd5f1345762c63be3554e84092d85a50bbd" + [[package]] name = "hkdf" version = "0.10.0" @@ -1963,7 +2011,7 @@ dependencies = [ "clarity", "libc", "libstackerdb", - "secp256k1", + "secp256k1 0.24.3", "serde", "serde_derive", "serde_json", @@ -1993,7 +2041,7 @@ name = "libstackerdb" version = "0.0.1" dependencies = [ "clarity", - "secp256k1", + "secp256k1 0.24.3", "serde", "serde_derive", "serde_stacker", @@ -3137,10 +3185,20 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b1629c9c557ef9b293568b338dddfc8208c98a18c59d722a9d53f859d9c9b62" dependencies = [ - "secp256k1-sys", + "secp256k1-sys 0.6.1", "serde", ] +[[package]] +name = "secp256k1" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f622567e3b4b38154fb8190bcf6b160d7a4301d70595a49195b48c116007a27" +dependencies = [ + "bitcoin_hashes", + "secp256k1-sys 0.9.2", +] + [[package]] name = "secp256k1-sys" version = "0.6.1" @@ -3150,6 +3208,15 @@ dependencies = [ "cc", ] +[[package]] +name = "secp256k1-sys" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d1746aae42c19d583c3c1a8c646bfad910498e2051c551a7f2e3c0c9fbb7eb" +dependencies = [ + "cc", +] + [[package]] name = "security-framework" version = "2.9.2" @@ -3493,6 +3560,7 @@ name = "stacks-common" version = "0.0.1" dependencies = [ "assert-json-diff", + "bitcoin", "chrono", "curve25519-dalek", "ed25519-dalek", @@ -3505,7 +3573,7 @@ dependencies = [ "rstest 0.11.0", "rstest_reuse 0.1.3", "rusqlite", - "secp256k1", + "secp256k1 0.24.3", "serde", "serde_derive", "serde_json", @@ -3570,7 +3638,7 @@ dependencies = [ "p256k1", "rand_core 0.6.4", "reqwest", - "secp256k1", + "secp256k1 0.24.3", "serde", "serde_derive", "serde_json", @@ -3613,7 +3681,7 @@ dependencies = [ "rstest 0.17.0", "rstest_reuse 0.5.0", "rusqlite", - "secp256k1", + "secp256k1 0.24.3", "serde", "serde_derive", "serde_json", diff --git a/clarity/src/vm/ast/parser/v2/mod.rs b/clarity/src/vm/ast/parser/v2/mod.rs index 8c8d31ed79..31f15b920e 100644 --- a/clarity/src/vm/ast/parser/v2/mod.rs +++ b/clarity/src/vm/ast/parser/v2/mod.rs @@ -207,6 +207,7 @@ impl<'a> Parser<'a> { } } + // Comment for diffs fn add_unviable_mutants() -> ParseResult< Option< Option< diff --git a/stacks-common/Cargo.toml b/stacks-common/Cargo.toml index 650446ea25..40d11e440f 100644 --- a/stacks-common/Cargo.toml +++ b/stacks-common/Cargo.toml @@ -19,6 +19,7 @@ path = "./src/lib.rs" [dependencies] rand = "0.7.3" +bitcoin = "0.31.1" serde = "1" serde_derive = "1" serde_stacker = "0.1" diff --git a/stacks-common/src/lib.rs b/stacks-common/src/lib.rs index a53f7db984..f759e9ca34 100644 --- a/stacks-common/src/lib.rs +++ b/stacks-common/src/lib.rs @@ -13,7 +13,6 @@ extern crate rand; extern crate rusqlite; extern crate secp256k1; extern crate serde; - #[macro_use] extern crate lazy_static; extern crate ripemd;