Merge branch 'master' into wen_restart_set_root_when_finding_bankhash

anza-xyz · Aug 12, 2024 · 69b5614 · 69b5614
2 parents 333cf0d + e8ddd9c
commit 69b5614
Show file tree

Hide file tree

Showing 9 changed files with 395 additions and 51 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -322,7 +322,7 @@ seqlock = "0.2.0"
 serde = "1.0.205" # must match the serde_derive version, see https://github.com/serde-rs/serde/issues/2584#issuecomment-1685252251
 serde_bytes = "0.11.15"
 serde_derive = "1.0.205" # must match the serde version, see https://github.com/serde-rs/serde/issues/2584#issuecomment-1685252251
-serde_json = "1.0.122"
+serde_json = "1.0.124"
 serde_with = { version = "2.3.3", default-features = false }
 serde_yaml = "0.9.34"
 serial_test = "2.0.0"