Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: protobuf-generated json configs for the main node (BFT-371) #458

Merged
merged 27 commits into from
Jan 26, 2024
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
5cb1162
defined some protos
pompon0 Nov 8, 2023
bb53fc7
added some conversions
pompon0 Nov 9, 2023
1ce3125
added missing files
pompon0 Nov 10, 2023
d5d5213
nudge prover
pompon0 Nov 13, 2023
72f7cef
moved proto config encoding to a separate crate
pompon0 Nov 13, 2023
9fe41df
Merge remote-tracking branch 'origin/main' into gprusak-protobuf-configs
pompon0 Nov 13, 2023
27f62e2
added tests
pompon0 Nov 13, 2023
c80db41
Merge remote-tracking branch 'origin/main' into gprusak-protobuf-configs
pompon0 Jan 4, 2024
c520d23
splitted conversion code into files
pompon0 Jan 4, 2024
2eb869f
proto definitions
pompon0 Jan 5, 2024
247b914
more protos
pompon0 Jan 5, 2024
4afc72f
chain cfg conv
pompon0 Jan 5, 2024
ee6ee15
contracts conv
pompon0 Jan 5, 2024
6ea90ac
database conv
pompon0 Jan 5, 2024
20e3864
eth conv
pompon0 Jan 5, 2024
8bbc6d2
some fri conv
pompon0 Jan 8, 2024
3b7a0e2
more conv
pompon0 Jan 9, 2024
fef239d
conv done
pompon0 Jan 9, 2024
a20ef5a
cargo fmt
pompon0 Jan 9, 2024
f2bab42
Merge remote-tracking branch 'origin/main' into gprusak-protobuf-configs
pompon0 Jan 9, 2024
0efcc6e
Merge branch 'main' into gprusak-protobuf-configs
pompon0 Jan 11, 2024
8ff2a9b
Merge branch 'main' into gprusak-protobuf-configs
pompon0 Jan 25, 2024
c17ffba
updated configs
pompon0 Jan 25, 2024
915542d
Merge remote-tracking branch 'origin/main' into gprusak-protobuf-configs
pompon0 Jan 26, 2024
2f4b5f1
updated era-consensus commit
pompon0 Jan 26, 2024
e20f337
prover/Cargo.lock
pompon0 Jan 26, 2024
8138698
Cargo.toml
pompon0 Jan 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
284 changes: 284 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ members = [
"core/lib/state",
"core/lib/storage",
"core/lib/types",
"core/lib/protobuf_config",
"core/lib/prover_utils",
"core/lib/utils",
"core/lib/vlog",
Expand Down
22 changes: 22 additions & 0 deletions core/lib/protobuf_config/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
[package]
name = "zksync_protobuf_config"
version = "0.1.0"
edition = "2021"
authors = ["The Matter Labs Team <hello@matterlabs.dev>"]
homepage = "https://zksync.io/"
repository = "https://github.com/matter-labs/zksync-era"
license = "MIT OR Apache-2.0"
keywords = ["blockchain", "zksync"]
categories = ["cryptography"]

[dependencies]
zksync_basic_types = { path = "../../lib/basic_types" }
zksync_config = { path = "../../lib/config" }
zksync_protobuf = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "9b300371512a4e443d086ecd19c1877719c15646" }

anyhow = "1.0"
prost = "0.12.1"

[build-dependencies]
zksync_protobuf = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "9b300371512a4e443d086ecd19c1877719c15646" }

Loading