Skip to content

Merge main-v0.14.2 into main#14018

Merged
Yoni-Starkware merged 4 commits into
mainfrom
aviv/merge-main-v0.14.2-into-main-1778481175
May 11, 2026
Merged

Merge main-v0.14.2 into main#14018
Yoni-Starkware merged 4 commits into
mainfrom
aviv/merge-main-v0.14.2-into-main-1778481175

Conversation

@AvivYossef-starkware
Copy link
Copy Markdown
Contributor

No description provided.

@AvivYossef-starkware
Copy link
Copy Markdown
Contributor Author

Src Dst Cargo.lock
Src Dst crates/apollo_integration_tests/Cargo.toml
Src Dst crates/apollo_integration_tests/src/flow_test_setup.rs
Src Dst crates/apollo_integration_tests/src/integration_test_manager.rs
Src Dst crates/apollo_integration_tests/src/utils.rs

@cursor
Copy link
Copy Markdown

cursor Bot commented May 11, 2026

PR Summary

Medium Risk
Medium risk because it changes integration-test chain genesis/commitment handling and seeds committer metadata, which can affect test determinism and surface mismatches in block hash/state diff commitments.

Overview
Adds a new ProofFlowIntegrationTest mode that seeds integration-test storage with proof-flow-compatible genesis data (custom STRK fee token address, optional preset StateDiffCommitment, genesis GlobalRoot, and computed genesis BlockHash).

Updates integration/flow test setup to pass PresetTestContracts and optional commitment into storage initialization, seeds the committer’s CommitmentOffset metadata when running proof flow, and disables verify_state_diff_hash in ApolloCommitterConfig for proof-flow runs while enabling client-side proving in the gateway validator.

Bumps privacy-prove/privacy-circuit-verify and related proving-utils git revs, and adds missing test dependencies (apollo_committer, starknet_committer, starknet_patricia_storage) needed for the new seeding logic.

Reviewed by Cursor Bugbot for commit e7675fb. Bugbot is set up for automated code reviews on this repo. Configure here.

@reviewable-StarkWare
Copy link
Copy Markdown

This change is Reviewable

@github-actions
Copy link
Copy Markdown

github-actions Bot commented May 11, 2026

Artifacts upload workflows:

Copy link
Copy Markdown
Contributor Author

This stack of pull requests is managed by Graphite. Learn more about stacking.

Copy link
Copy Markdown
Contributor Author

@AvivYossef-starkware AvivYossef-starkware left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Per-file conflict resolution notes (commit fix_conflicts). Two feature lines collided in apollo_integration_tests: validation_only-mode on main (@asaf-sw#13879 / #13734 / #13736) vs. shared proof-flow infrastructure on main-v0.14.2 (@einat-starkware#13760). Inline notes on each conflict below.

Comment thread crates/apollo_integration_tests/Cargo.toml
Comment thread Cargo.lock
Comment thread crates/apollo_integration_tests/src/utils.rs
Comment thread crates/apollo_integration_tests/src/utils.rs
Comment thread crates/apollo_integration_tests/src/flow_test_setup.rs
Comment thread crates/apollo_integration_tests/src/integration_test_manager.rs
Copy link
Copy Markdown
Collaborator

@Yoni-Starkware Yoni-Starkware left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

@Yoni-Starkware reviewed 9 files and all commit messages, and made 1 comment.
Reviewable status: all files reviewed, 6 unresolved discussions (waiting on asaf-sw and einat-starkware).

Copy link
Copy Markdown
Contributor Author

@AvivYossef-starkware AvivYossef-starkware left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@AvivYossef-starkware resolved 6 discussions.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on AvivYossef-starkware).

@Yoni-Starkware Yoni-Starkware added this pull request to the merge queue May 11, 2026
Merged via the queue into main with commit ae57de9 May 11, 2026
40 checks passed
@github-actions github-actions Bot locked and limited conversation to collaborators May 12, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants