Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/cargo/vergen-pretty-0.3.9
Browse files Browse the repository at this point in the history
  • Loading branch information
popcnt1 authored Jan 14, 2025
2 parents 508de01 + a2a94c4 commit 5847bfc
Show file tree
Hide file tree
Showing 24 changed files with 853 additions and 170 deletions.
266 changes: 134 additions & 132 deletions Cargo.lock

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ versions = "4.1.0"
pretty_assertions = "1.4.1"
syn = { version = "1.0.104", features = ["full", "extra-traits"] }
quote = "1.0"
proc-macro2 = "1.0.92"
proc-macro2 = "1.0.93"
derive-syn-parse = "0.1.5"
unescape = "0.1.0"
tempfile = "3.15.0"
Expand Down Expand Up @@ -310,9 +310,9 @@ csv = "1.3.1"
revm-precompile = "7.0.0"
revm-primitives = "4.0.0"
scopeguard = "1.1"
uuid = { version = "1.11.0", features = ["v4", "fast-rng"] }
uuid = { version = "1.11.1", features = ["v4", "fast-rng"] }
protobuf = { version = "2.28", features = ["with-bytes"] }
rocksdb = { git = "https://github.com/rooch-network/rust-rocksdb.git", rev = "41d102327ba3cf9a2335d1192e8312c92bc3d6f9", features = ["lz4", "mt_static"] }
rocksdb = { version = "0.23.0", features = ["lz4", "mt_static", "jemalloc"] }
lz4 = { version = "1.28.1" }
ripemd = { version = "0.1.3" }
fastcrypto-zkp = { version = "0.1.3" }
Expand All @@ -325,6 +325,8 @@ crossbeam-channel = "0.5.14"
inferno = "0.11.21"
handlebars = "4.2.2"
indexmap = "2.7.0"
tikv-jemallocator = { version = "0.6.0", features = ["unprefixed_malloc_on_supported_platforms", "profiling"] }
mimalloc = { version = "0.1.39" }

# Note: the BEGIN and END comments below are required for external tooling. Do not remove.
# BEGIN MOVE DEPENDENCIES
Expand Down
Loading

0 comments on commit 5847bfc

Please sign in to comment.