[consensus] Introduce OptQS::V2 Payload #18087
Merged
+365
−149
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
Author
This was referenced Nov 11, 2025
ibalajiarun
force-pushed
the
balaji/enc-pool-6
branch
from
0669083 to
85e6a2e
Compare
ibalajiarun
force-pushed
the
balaji/enc-pool-5
branch
2 times, most recently
from
0680427 to
77720f1
Compare
ibalajiarun
force-pushed
the
balaji/enc-pool-6
branch
from
85e6a2e to
f1c025b
Compare
ibalajiarun
force-pushed
the
balaji/enc-pool-5
branch
from
77720f1 to
392b63e
Compare
ibalajiarun
force-pushed
the
balaji/enc-pool-6
branch
from
f1c025b to
81de0e4
Compare
ibalajiarun
force-pushed
the
balaji/enc-pool-5
branch
2 times, most recently
from
0006bf4 to
68e12f2
Compare
ibalajiarun
force-pushed
the
balaji/enc-pool-6
branch
from
81de0e4 to
1ff1ce5
Compare
ibalajiarun
changed the base branch from
balaji/enc-pool-5
to
graphite-base/18087
ibalajiarun
force-pushed
the
graphite-base/18087
branch
from
68e12f2 to
8a0a608
Compare
ibalajiarun
force-pushed
the
balaji/enc-pool-6
branch
from
1ff1ce5 to
16f977f
Compare
ibalajiarun
changed the base branch from
graphite-base/18087
to
balaji/enc-pool-4
ibalajiarun
force-pushed
the
balaji/enc-pool-6
branch
3 times, most recently
from
88d173e to
1d108f7
Compare
ibalajiarun
requested review from
bchocho,
sasha8 and
zekun000
as code owners
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
There was a problem hiding this comment.
This PR is being reviewed by Cursor Bugbot
Details
Your team is on the Bugbot Free tier. On this plan, Bugbot will review limited PRs each billing cycle for each member of your team.
To receive Bugbot reviews on all of your PRs, visit the Cursor dashboard to activate Pro and start your 14-day free trial.
Bug: Missing V2 handler causes unreachable panic
The get_transactions method handles OptQuorumStorePayload::V1 but not V2, causing V2 payloads to hit the unreachable!() macro and panic. This prevents processing of V2 payloads even though they're introduced in this PR and handled elsewhere in the codebase.
consensus/src/payload_manager/quorum_store_payload_manager.rs#L541-L548
aptos-core/consensus/src/payload_manager/quorum_store_payload_manager.rs
Lines 541 to 548 in 1d108f7
danielxiangzl
approved these changes
Nov 25, 2025
Contributor
danielxiangzl
left a comment
danielxiangzl
left a comment
There was a problem hiding this comment.
lgtm. cursor bot is good at reviewing pr like this..
JoshLind
approved these changes
Nov 26, 2025
| self.opt_batches.num_bytes() + self.proofs.num_bytes() + self.inline_batches.num_bytes() | ||
| pub(crate) fn extend(self, other: Self) -> Self { | ||
| match (self, other) { | ||
| (Self::V1(p1), Self::V1(p2)) => Self::V1(p1.extend(p2)), |
Contributor
There was a problem hiding this comment.
Silly question, but do we imagine cases where we're extending V1 and V2 batches together, e.g., during a rollout? Or would they only be exclusive (i.e., only V1 extending other V1s, and V2 extending other V2s?)
Contributor
Author
There was a problem hiding this comment.
This extend fn is just for the DAG implementation, where it is possible to have V1 extending V2, etc (we don't use that code path anymore, maybe time for a cleanup?). For our leader based consensus, we only propose one "Payload" and execute it.
ibalajiarun
force-pushed
the
balaji/enc-pool-4
branch
from
8a0a608 to
ad4e2c2
Compare
ibalajiarun
changed the base branch from
balaji/enc-pool-4
to
graphite-base/18087
ibalajiarun
force-pushed
the
balaji/enc-pool-6
branch
from
1d108f7 to
d500622
Compare
ibalajiarun
force-pushed
the
graphite-base/18087
branch
from
8a0a608 to
ca448ec
Compare
| .await? | ||
| }, | ||
| Payload::OptQuorumStore(opt_qs_payload) => { | ||
| Payload::OptQuorumStore(OptQuorumStorePayload::V1(opt_qs_payload)) => { |
There was a problem hiding this comment.
Bug: Missing V2 handler causes panic instead of graceful error
The get_transactions function only handles OptQuorumStorePayload::V1 and falls through to unreachable!() for V2. This is inconsistent with other functions in the same file (prefetch_payload_data, check_payload_availability, notify_commit, get_inline_transactions) which explicitly handle both V1 and V2 variants. The get_inline_transactions function demonstrates the expected pattern: handle V2 with error!("OptQSPayload V2 is not expected") and return gracefully. If V2 were to reach get_transactions, it would panic instead of returning an error.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
Contributor
✅ Forge suite
|
Contributor
✅ Forge suite
|
Contributor
✅ Forge suite
|
0o-de-lally
pushed a commit
to 0LNetworkCommunity/zapatos
that referenced
this pull request
Dec 9, 2025
* [consensus] Introduce OptQS::V2 Payload
This was referenced Jan 7, 2026
Draft
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Introduce OptQuorumStoreV2 Payload that can include BatchV2 in the payload. It uses the same generic trick as the prior PRs to have multiple implementation over BatchInfo and BatchInfoExt. Processing OptQuorumStoreV2 is disabled during proposal handling phase and will be enabled in a future PR.