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(eigen-client-m0): merge extra features #364

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
99b153a
Merge pull request #354 from lambdaclass/eigen-client-extra-features-…
gianbelinche Nov 22, 2024
f4b772a
docs: add interop docs to mdbook (#3327)
kaymomin Nov 25, 2024
193c855
chore: Upgrade rustls to fix security vulnerability (#3331)
matias-gonz Nov 25, 2024
440fe8d
feat(zksync_cli): Health checkpoint improvements (#3193)
manuelmauro Nov 26, 2024
26f630c
feat(tee): add error handling for unstable_getTeeProofs API endpoint …
pbeza Nov 26, 2024
86efd40
chore(main): release prover 17.1.1 (#3312)
zksync-era-bot Nov 27, 2024
533bfe6
fix: remove foundry-zksync install script (#3336)
kaymomin Nov 27, 2024
7b6e590
feat(pruning): Record L1 batch root hash in pruning logs (#3266)
slowli Nov 27, 2024
40f8123
fix(prover): Create reqwest client only once (#3324)
yorik Nov 27, 2024
cbc91e3
feat: integrate gateway changes for some components (#3274)
perekopskiy Nov 27, 2024
aa9575f
feat(consensus): Update consensus dependencies (#3339)
brunoffranca Nov 27, 2024
a0a74aa
feat: change seal criteria for gateway (#3320)
perekopskiy Nov 27, 2024
38afdd5
fix(ci): Ability to publish zk-environment from manual trigger (#3341)
artmakh Nov 28, 2024
01b50ed
feat(eigen-client-extra-features): Move inclusion logic (#357)
gianbelinche Nov 28, 2024
daace34
feat(eigen-client-extra-features): Remove verify cert (#359)
gianbelinche Nov 28, 2024
99c6d42
feat(eigen-client-extra-features): Small changes (#358)
gianbelinche Nov 28, 2024
163c41a
feat(eigen-client-extra-features): minimal client changes (#362)
juan518munoz Nov 28, 2024
cef9a89
feat(eigen-client-extra-features): Add option to download points (#361)
gianbelinche Nov 28, 2024
75090b6
feat(eigen-client-extra-features): Replace third party dependant test…
juan518munoz Nov 28, 2024
7a61574
feat(eigen-client-extra-features): Remove steps to run from integrati…
gianbelinche Nov 28, 2024
bc90cc6
Merge branch 'main' into eigen-client-extra-features-and-main
gianbelinche Nov 28, 2024
87d450f
Update Cargo.lock
gianbelinche Nov 28, 2024
e2d4dab
Merge pull request #363 from lambdaclass/eigen-client-extra-features-…
gianbelinche Nov 29, 2024
f0dc911
Merge branch 'eigen-client-extra-features' into eigen-client-m0-imple…
gianbelinche Dec 2, 2024
4439795
Fix concurrent dispatcher
gianbelinche Dec 3, 2024
e1d42c7
Go back to sequential dispatcher
gianbelinche Dec 3, 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
2 changes: 1 addition & 1 deletion .github/release-please/manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"core": "25.2.0",
"prover": "17.1.0",
"prover": "17.1.1",
"zkstack_cli": "0.1.2"
}
3 changes: 1 addition & 2 deletions .github/workflows/zk-environment-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,7 @@ jobs:
push: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/main') || (github.event_name == 'workflow_dispatch') }}

zk_environment_multiarch_manifest:
# We'll update the 'latest' tag, only on environments generated from 'main'.
if: needs.changed_files.outputs.zk_environment == 'true' && github.event_name == 'push' && github.ref == 'refs/heads/main'
if: ${{ (needs.changed_files.outputs.zk_environment == 'true' && github.event_name == 'push' && github.ref == 'refs/heads/main') || (github.event_name == 'workflow_dispatch') }}
# Needed to push to Gihub Package Registry
permissions:
packages: write
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -120,3 +120,6 @@ configs/*
era-observability/
core/tests/ts-integration/deployments-zk
transactions/

# foundry-zksync
install
67 changes: 46 additions & 21 deletions Cargo.lock

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

22 changes: 12 additions & 10 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ members = [
"core/tests/loadnext",
"core/tests/vm-benchmark",
"get_all_blobs",
"core/lib/bin_metadata",
]
resolver = "2"

Expand Down Expand Up @@ -250,16 +251,16 @@ zk_evm_1_5_0 = { package = "zk_evm", version = "=0.150.7" }
zksync_vm2 = { git = "https://github.com/matter-labs/vm2.git", rev = "457d8a7eea9093af9440662e33e598c13ba41633" }

# Consensus dependencies.
zksync_concurrency = "=0.5.0"
zksync_consensus_bft = "=0.5.0"
zksync_consensus_crypto = "=0.5.0"
zksync_consensus_executor = "=0.5.0"
zksync_consensus_network = "=0.5.0"
zksync_consensus_roles = "=0.5.0"
zksync_consensus_storage = "=0.5.0"
zksync_consensus_utils = "=0.5.0"
zksync_protobuf = "=0.5.0"
zksync_protobuf_build = "=0.5.0"
zksync_concurrency = "=0.6.0"
zksync_consensus_bft = "=0.6.0"
zksync_consensus_crypto = "=0.6.0"
zksync_consensus_executor = "=0.6.0"
zksync_consensus_network = "=0.6.0"
zksync_consensus_roles = "=0.6.0"
zksync_consensus_storage = "=0.6.0"
zksync_consensus_utils = "=0.6.0"
zksync_protobuf = "=0.6.0"
zksync_protobuf_build = "=0.6.0"

# "Local" dependencies
zksync_multivm = { version = "0.1.0", path = "core/lib/multivm" }
Expand All @@ -282,6 +283,7 @@ zksync_health_check = { version = "0.1.0", path = "core/lib/health_check" }
zksync_l1_contract_interface = { version = "0.1.0", path = "core/lib/l1_contract_interface" }
zksync_mempool = { version = "0.1.0", path = "core/lib/mempool" }
zksync_merkle_tree = { version = "0.1.0", path = "core/lib/merkle_tree" }
zksync_bin_metadata = { version = "0.1.0", path = "core/lib/bin_metadata" }
zksync_mini_merkle_tree = { version = "0.1.0", path = "core/lib/mini_merkle_tree" }
zksync_object_store = { version = "0.1.0", path = "core/lib/object_store" }
zksync_protobuf_config = { version = "0.1.0", path = "core/lib/protobuf_config" }
Expand Down
Loading
Loading