Merge remote-tracking branch 'origin/main' into ag/builder-api

EspressoSystems · Feb 28, 2024 · 52ac302 · 52ac302
2 parents 85229f1 + 5cfeb01
commit 52ac302
Show file tree

Hide file tree

Showing 50 changed files with 811 additions and 620 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -66,13 +66,15 @@ jf-plonk = { git = "https://github.com/EspressoSystems/jellyfish", tag = "0.4.0"
 jf-relation = { git = "https://github.com/EspressoSystems/jellyfish", tag = "0.4.0" }
 jf-utils = { git = "https://github.com/espressosystems/jellyfish", tag = "0.4.0" }
 hs-builder-api = { git = "https://github.com/EspressoSystems/hs-builder-api", rev = "071619ba71d0f9c108a0663548528677c843ecd7" }
+lazy_static = "1.4.0"
 libp2p-identity = "0.2"
 libp2p-networking = { path = "./crates/libp2p-networking", version = "0.1.0", default-features = false }
 libp2p-swarm-derive = { version = "0.34.1" }
 portpicker = "0.1.1"
 rand = "0.8.5"
 rand_chacha = { version = "0.3.1", default-features = false }
 serde = { version = "1.0.197", features = ["derive"] }
+serde_json = { version = "1.0.114" }
 sha2 = "0.10"
 snafu = "0.7.5"
 surf-disco = { git = "https://github.com/EspressoSystems/surf-disco.git", tag = "v0.4.6" }

diff --git a/crates/example-types/Cargo.toml b/crates/example-types/Cargo.toml
@@ -38,4 +38,3 @@ hotshot-task = { path = "../task" }
 tokio = { workspace = true }
 [target.'cfg(all(async_executor_impl = "async-std"))'.dependencies]
 async-std = { workspace = true }
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -38,4 +38,3 @@ hotshot-task = { path = "../task" }
		tokio = { workspace = true }
		[target.'cfg(all(async_executor_impl = "async-std"))'.dependencies]
		async-std = { workspace = true }