fix: update/pin dependencies (#311)

Fixes #310 

This PR updates some dependencies to get the new `clarinet-files`
version working. I've also pinned all stacks/hiro dependencies so we can
update manually and ensure everything is working so this doesn't happen
again.
This commit is contained in:
Micaiah Reid
2023-07-03 13:21:08 -04:00
committed by GitHub
parent 98d1a0a70b
commit f54b374b24
3 changed files with 56 additions and 158 deletions

203
Cargo.lock generated
View File

@@ -46,6 +46,12 @@ dependencies = [
"memchr",
]
[[package]]
name = "android-tzdata"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
[[package]]
name = "android_system_properties"
version = "0.1.5"
@@ -198,12 +204,6 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6107fe1be6682a68940da878d9e9f5e90ca5745b3dec9fd1bb393c8777d4f581"
[[package]]
name = "base64"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"
[[package]]
name = "base64"
version = "0.13.1"
@@ -376,18 +376,6 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
[[package]]
name = "bstr"
version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
dependencies = [
"lazy_static",
"memchr",
"regex-automata",
"serde",
]
[[package]]
name = "bumpalo"
version = "3.11.1"
@@ -471,6 +459,7 @@ dependencies = [
"clap_generate",
"clarinet-files",
"clarity-repl",
"clarity-vm",
"criterion",
"crossbeam-channel 0.5.8",
"csv",
@@ -503,7 +492,7 @@ version = "0.5.0"
dependencies = [
"anyhow",
"base58 0.2.0",
"base64 0.13.1",
"base64",
"bitcoincore-rpc",
"bitcoincore-rpc-json",
"chainhook-types 1.0.7",
@@ -538,10 +527,11 @@ dependencies = [
[[package]]
name = "chainhook-types"
version = "1.0.1"
version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe083f0dd830eb487602a3f1ebc56c1245d9cdb25cc83adb8f35e977bb477dc2"
checksum = "65268eb9aad0d567865cd13c5a5c7a9a301d99f6301f8f5cac1654744eda0a7c"
dependencies = [
"hex",
"schemars",
"serde",
"serde_derive",
@@ -563,13 +553,13 @@ dependencies = [
[[package]]
name = "chrono"
version = "0.4.23"
version = "0.4.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"
checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
dependencies = [
"android-tzdata",
"iana-time-zone",
"js-sys",
"num-integer",
"num-traits",
"time 0.1.45",
"wasm-bindgen",
@@ -658,13 +648,13 @@ dependencies = [
[[package]]
name = "clarinet-files"
version = "1.0.0"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "07a317e7aa292263aab236ef9c751983b6faca76f73f07d02385a6721c5dd444"
checksum = "1464355d97840afd89fcc04c4361a4d06200de1ddf4a311b649744c7e67d0155"
dependencies = [
"bip39",
"bitcoin",
"chainhook-types 1.0.1",
"chainhook-types 1.0.6",
"clarinet-utils",
"clarity-repl",
"libsecp256k1 0.7.1",
@@ -689,13 +679,14 @@ dependencies = [
[[package]]
name = "clarity-repl"
version = "1.5.0"
version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f70d4c9992140d15954e97c640b797f80e05ab58ceebbc3e608bffa205f799a"
checksum = "7f2d096ff86def33801c5ad13dc222befa42118326a80cfc1cf34d9ee1abc70b"
dependencies = [
"ansi_term",
"atty",
"bytes",
"chrono",
"clarity-vm",
"debug_types",
"futures",
@@ -704,17 +695,13 @@ dependencies = [
"httparse",
"integer-sqrt",
"lazy_static",
"libsecp256k1 0.5.0",
"log",
"memchr",
"pico-args",
"prettytable-rs",
"rand 0.7.3",
"rand_pcg",
"rand_seeder",
"regex",
"reqwest",
"ripemd160",
"rustyline",
"serde",
"serde_derive",
@@ -727,9 +714,9 @@ dependencies = [
[[package]]
name = "clarity-vm"
version = "2.0.2"
version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c6e381821d03b70f011cf233ab3e1115a93340071010041b3923c9be0eef7c2d"
checksum = "90cebf93044798d7729008e9a467b16578aead7f0b3568219a2b20b421b683db"
dependencies = [
"integer-sqrt",
"lazy_static",
@@ -744,6 +731,7 @@ dependencies = [
"serde_json",
"serde_stacker",
"sha2-asm",
"slog",
"stacks-common",
"time 0.2.27",
]
@@ -1050,13 +1038,12 @@ dependencies = [
[[package]]
name = "csv"
version = "1.1.6"
version = "1.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1"
checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086"
dependencies = [
"bstr",
"csv-core",
"itoa 0.4.8",
"itoa",
"ryu",
"serde",
]
@@ -1842,7 +1829,7 @@ checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
dependencies = [
"bytes",
"fnv",
"itoa 1.0.4",
"itoa",
]
[[package]]
@@ -1883,7 +1870,7 @@ dependencies = [
"http-body",
"httparse",
"httpdate",
"itoa 1.0.4",
"itoa",
"pin-project-lite",
"socket2",
"tokio",
@@ -2031,12 +2018,6 @@ dependencies = [
"either",
]
[[package]]
name = "itoa"
version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
[[package]]
name = "itoa"
version = "1.0.4"
@@ -2141,25 +2122,6 @@ dependencies = [
"typenum",
]
[[package]]
name = "libsecp256k1"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd1137239ab33b41aa9637a88a28249e5e70c40a42ccc92db7f12cc356c1fcd7"
dependencies = [
"arrayref",
"base64 0.12.3",
"digest 0.9.0",
"hmac-drbg 0.3.0",
"libsecp256k1-core 0.2.2",
"libsecp256k1-gen-ecmult 0.2.1",
"libsecp256k1-gen-genmult 0.2.1",
"rand 0.7.3",
"serde",
"sha2 0.9.9",
"typenum",
]
[[package]]
name = "libsecp256k1"
version = "0.7.1"
@@ -2167,29 +2129,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95b09eff1b35ed3b33b877ced3a691fc7a481919c7e29c53c906226fcf55e2a1"
dependencies = [
"arrayref",
"base64 0.13.1",
"base64",
"digest 0.9.0",
"hmac-drbg 0.3.0",
"libsecp256k1-core 0.3.0",
"libsecp256k1-gen-ecmult 0.3.0",
"libsecp256k1-gen-genmult 0.3.0",
"libsecp256k1-core",
"libsecp256k1-gen-ecmult",
"libsecp256k1-gen-genmult",
"rand 0.8.5",
"serde",
"sha2 0.9.9",
"typenum",
]
[[package]]
name = "libsecp256k1-core"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d0f6ab710cec28cef759c5f18671a27dae2a5f952cdaaee1d8e2908cb2478a80"
dependencies = [
"crunchy",
"digest 0.9.0",
"subtle 2.4.1",
]
[[package]]
name = "libsecp256k1-core"
version = "0.3.0"
@@ -2201,31 +2152,13 @@ dependencies = [
"subtle 2.4.1",
]
[[package]]
name = "libsecp256k1-gen-ecmult"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ccab96b584d38fac86a83f07e659f0deafd0253dc096dab5a36d53efe653c5c3"
dependencies = [
"libsecp256k1-core 0.2.2",
]
[[package]]
name = "libsecp256k1-gen-ecmult"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3038c808c55c87e8a172643a7d87187fc6c4174468159cb3090659d55bcb4809"
dependencies = [
"libsecp256k1-core 0.3.0",
]
[[package]]
name = "libsecp256k1-gen-genmult"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "67abfe149395e3aa1c48a2beb32b068e2334402df8181f818d3aee2b304c4f5d"
dependencies = [
"libsecp256k1-core 0.2.2",
"libsecp256k1-core",
]
[[package]]
@@ -2234,7 +2167,7 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3db8d6ba2cec9eacc40e6e8ccc98931840301f1006e95647ceb2dd5c3aa06f7c"
dependencies = [
"libsecp256k1-core 0.3.0",
"libsecp256k1-core",
]
[[package]]
@@ -2518,16 +2451,6 @@ dependencies = [
"winapi",
]
[[package]]
name = "num-integer"
version = "0.1.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
dependencies = [
"autocfg",
"num-traits",
]
[[package]]
name = "num-traits"
version = "0.2.15"
@@ -2539,11 +2462,11 @@ dependencies = [
[[package]]
name = "num_cpus"
version = "1.14.0"
version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5"
checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
dependencies = [
"hermit-abi 0.1.19",
"hermit-abi 0.3.1",
"libc",
]
@@ -3036,24 +2959,6 @@ dependencies = [
"rand_core 0.5.1",
]
[[package]]
name = "rand_pcg"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "59cad018caf63deb318e5a4586d99a24424a364f40f1e5778c29aca23f4fc73e"
dependencies = [
"rand_core 0.6.4",
]
[[package]]
name = "rand_seeder"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf2890aaef0aa82719a50e808de264f9484b74b442e1a3a0e5ee38243ac40bdb"
dependencies = [
"rand_core 0.6.4",
]
[[package]]
name = "rayon"
version = "1.7.0"
@@ -3084,7 +2989,7 @@ checksum = "571c252c68d09a2ad3e49edd14e9ee48932f3e0f27b06b4ea4c9b2a706d31103"
dependencies = [
"async-trait",
"combine",
"itoa 1.0.4",
"itoa",
"percent-encoding",
"ryu",
"sha1",
@@ -3172,7 +3077,7 @@ version = "0.11.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c"
dependencies = [
"base64 0.13.1",
"base64",
"bytes",
"encoding_rs",
"futures-core",
@@ -3233,17 +3138,6 @@ dependencies = [
"digest 0.10.6",
]
[[package]]
name = "ripemd160"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2eca4ecc81b7f313189bf73ce724400a07da2a6dac19588b03c8bd76a2dcc251"
dependencies = [
"block-buffer 0.9.0",
"digest 0.9.0",
"opaque-debug 0.3.0",
]
[[package]]
name = "rocket"
version = "0.5.0-rc.3"
@@ -3490,7 +3384,7 @@ version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55"
dependencies = [
"base64 0.13.1",
"base64",
]
[[package]]
@@ -3603,9 +3497,9 @@ dependencies = [
[[package]]
name = "secp256k1"
version = "0.24.2"
version = "0.24.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9512ffd81e3a3503ed401f79c33168b9148c75038956039166cd750eaa037c3"
checksum = "6b1629c9c557ef9b293568b338dddfc8208c98a18c59d722a9d53f859d9c9b62"
dependencies = [
"bitcoin_hashes 0.11.0",
"secp256k1-sys",
@@ -3751,7 +3645,7 @@ version = "1.0.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db"
dependencies = [
"itoa 1.0.4",
"itoa",
"ryu",
"serde",
]
@@ -3773,7 +3667,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
dependencies = [
"form_urlencoded",
"itoa 1.0.4",
"itoa",
"ryu",
"serde",
]
@@ -4021,9 +3915,9 @@ dependencies = [
[[package]]
name = "stacks-common"
version = "0.0.1"
version = "0.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bbe3cb43f95b8604323c93444665182acf4c6b46261c50e1179c14b9c86b312d"
checksum = "c887baefb047fb7cd1c82d5a62e1deaca4b9ea9c701f965407db6c39a3fc902f"
dependencies = [
"chrono",
"curve25519-dalek",
@@ -4040,6 +3934,9 @@ dependencies = [
"serde_json",
"sha2 0.10.6",
"sha3 0.10.6",
"slog",
"slog-json",
"slog-term",
"time 0.2.27",
]
@@ -4332,7 +4229,7 @@ version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376"
dependencies = [
"itoa 1.0.4",
"itoa",
"libc",
"num_threads",
"serde",

View File

@@ -6,8 +6,8 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
csv = "1"
num_cpus = "1.4"
csv = "1.2.2"
num_cpus = "1.16.0"
serde = "1"
serde_json = "1"
serde_derive = "1"
@@ -19,7 +19,7 @@ rand = "0.8.5"
# raft-proto = { git = "https://github.com/tikv/raft-rs", rev="f73766712a538c2f6eb135b455297ad6c03fc58d", version = "0.7.0"}
chainhook-sdk = { version = "0.5.0", default-features = false, features = ["ordinals", "zeromq"], path = "../chainhook-sdk" }
chainhook-types = { version = "1.0.6", path = "../chainhook-types-rs" }
clarinet-files = "1"
clarinet-files = "1.0.1"
hiro-system-kit = "0.1.0"
# clarinet-files = { path = "../../../clarinet/components/clarinet-files" }
# hiro-system-kit = { path = "../../../clarinet/components/hiro-system-kit" }
@@ -45,7 +45,8 @@ rocket = { version = "=0.5.0-rc.3", features = ["json"] }
[dev-dependencies]
criterion = "0.3"
redis = "0.21.5"
clarity-repl = "=1.5.0"
clarity-repl = "=1.7.0"
clarity-vm = "=2.1.1"
hex = "0.4.3"

View File

@@ -13,7 +13,7 @@ serde_json = { version = "1", features = ["arbitrary_precision"] }
serde-hex = "0.1.0"
serde_derive = "1"
stacks-rpc-client = "=1.0.7"
clarinet-utils = "1"
clarinet-utils = "1.0.0"
hiro-system-kit = "0.1.0"
# stacks-rpc-client = { version = "1", path = "../../../clarinet/components/stacks-rpc-client" }
# clarinet-utils = { version = "1", path = "../../../clarinet/components/clarinet-utils" }