[qs] support pulling OptQuorumStorePayload::V2 #18453

ibalajiarun · 2026-01-15T00:53:26Z

Description

This PR adds support for OptQuorumStorePayload V2 by introducing configuration flags to control its transmission and reception. The changes include:

Added two new configuration flags to QuorumStoreConfig:
- enable_opt_qs_v2_tx: Controls whether to send V2 payloads
- enable_opt_qs_v2_rx: Controls whether to accept V2 payloads
Modified the payload verification logic to check the opt_qs_v2_rx_enabled flag before accepting V2 payloads, replacing the previous hard-coded rejection.
Updated the ProofManager to create V2 payloads when requested by adding a use_batch_v2 flag to OptQSPayloadPullParams.
Enhanced the payload creation process to preserve BatchInfoExt for V2 payloads while converting to BatchInfo for V1 payloads.
Propagated the new configuration flags through the verification chain in consensus components.

These changes enable a gradual rollout of the V2 payload format with separate controls for sending and receiving.

ibalajiarun · 2026-01-15T00:53:52Z

[test] enctx forge e2e #18478
dkg impl #1 #18441
BlockMetadataExtV2 with Decryption Key #18444
[qs] support pulling OptQuorumStorePayload::V2 #18453 👈 (View in Graphite)
[qs] Populate BatchKind for BatchV2 #18452
[api] local config flag to gate enc txn submission and batch validation #18086 : 1 other dependent PR (#18443 )
[batch-encryption] remove happy path in impls and traits #18445
main

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

cursor · 2026-01-16T00:24:25Z

consensus/src/liveness/proposal_status_tracker.rs

        Some(OptQSPayloadPullParams {
            exclude_authors,
            minimum_batch_age_usecs: self.minimum_batch_age_usecs,
+            use_batch_v2: false,


TX config flag enable_opt_qs_v2_tx is not wired up

Medium Severity

The enable_opt_qs_v2_tx configuration flag is added to control sending V2 payloads, but use_batch_v2 is hardcoded to false in OptQSPullParamsProvider::get_params(). The OptQSPullParamsProvider struct doesn't receive or store the enable_opt_qs_v2_tx config, so V2 payloads will never be created regardless of the config setting. The ProofManager checks params.use_batch_v2 to decide payload format, but this will always be false.

Additional Locations (1)

consensus/src/liveness/proposal_status_tracker.rs#L106-L123

danielxiangzl · 2026-01-16T00:27:27Z

config/src/config/quorum_store_config.rs

    pub enable_payload_v2: bool,
    pub enable_batch_v2: bool,
+    pub enable_opt_qs_v2_tx: bool,
+    pub enable_opt_qs_v2_rx: bool,


What are the differences between these flags and enable_payload_v2 / enable_batch_v2? What is the plan for roll out for the QS components?

There are a quite a bit of flags here to avoid bug bounty issues, because we are seeing bounties for validator networks these days. The plan is to enable enable_payload_v2, enable_opt_qs_v2_rx, enable_opt_qs_v2_tx, enable_batch_v2 in that order.

danielxiangzl · 2026-01-16T00:30:03Z

consensus/src/liveness/proposal_status_tracker.rs

        Some(OptQSPayloadPullParams {
            exclude_authors,
            minimum_batch_age_usecs: self.minimum_batch_age_usecs,
+            use_batch_v2: false,


Is this going to be set by config later?

danielxiangzl · 2026-01-16T00:31:25Z

consensus/src/quorum_store/proof_manager.rs

        counters::NUM_INLINE_BATCHES.observe(inline_block.len() as f64);
        counters::NUM_INLINE_TXNS.observe(inline_block_size.count() as f64);

-        // TODO(ibalajiarun): Avoid clones


nit: clones are still there

consensus/consensus-types/src/common.rs

cursor

Cursor Bugbot has reviewed your changes and found 1 potential issue.

^{Bugbot Autofix is OFF. To automatically fix reported issues with Cloud Agents, enable Autofix in the Cursor dashboard.}

consensus/src/consensus_observer/network/observer_message.rs

github-actions · 2026-01-20T22:04:05Z

✅ Forge suite `compat` success on `c06e1b8824e5d9db7535c9eed058e24aa7c19bf1` ==> `4460b7aebdeda395907e0b3cabd5f0fad37fc869`

Compatibility test results for c06e1b8824e5d9db7535c9eed058e24aa7c19bf1 ==> 4460b7aebdeda395907e0b3cabd5f0fad37fc869 (PR)
1. Check liveness of validators at old version: c06e1b8824e5d9db7535c9eed058e24aa7c19bf1
compatibility::simple-validator-upgrade::liveness-check : committed: 13421.72 txn/s, latency: 2597.88 ms, (p50: 2700 ms, p70: 2900, p90: 3300 ms, p99: 3500 ms), latency samples: 439420
2. Upgrading first Validator to new version: 4460b7aebdeda395907e0b3cabd5f0fad37fc869
compatibility::simple-validator-upgrade::single-validator-upgrade : committed: 5737.13 txn/s, latency: 5923.04 ms, (p50: 6600 ms, p70: 6700, p90: 6900 ms, p99: 6900 ms), latency samples: 197500
3. Upgrading rest of first batch to new version: 4460b7aebdeda395907e0b3cabd5f0fad37fc869
compatibility::simple-validator-upgrade::half-validator-upgrade : committed: 5839.17 txn/s, latency: 5826.11 ms, (p50: 6300 ms, p70: 6500, p90: 6600 ms, p99: 6700 ms), latency samples: 200520
4. upgrading second batch to new version: 4460b7aebdeda395907e0b3cabd5f0fad37fc869
compatibility::simple-validator-upgrade::rest-validator-upgrade : committed: 9939.27 txn/s, latency: 3300.59 ms, (p50: 3200 ms, p70: 3800, p90: 4300 ms, p99: 5100 ms), latency samples: 327300
5. check swarm health
Compatibility test for c06e1b8824e5d9db7535c9eed058e24aa7c19bf1 ==> 4460b7aebdeda395907e0b3cabd5f0fad37fc869 passed
Test Ok

github-actions · 2026-01-20T22:06:21Z

✅ Forge suite `realistic_env_max_load` success on `4460b7aebdeda395907e0b3cabd5f0fad37fc869`

two traffics test: inner traffic : committed: 13568.68 txn/s, submitted: 13568.84 txn/s, expired: 0.16 txn/s, latency: 2776.84 ms, (p50: 2700 ms, p70: 2900, p90: 3000 ms, p99: 3600 ms), latency samples: 5046760
two traffics test : committed: 100.01 txn/s, latency: 770.14 ms, (p50: 700 ms, p70: 800, p90: 800 ms, p99: 2400 ms), latency samples: 1740
Latency breakdown for phase 0: ["MempoolToBlockCreation: max: 2.278, avg: 2.197", "ConsensusProposalToOrdered: max: 0.170, avg: 0.165", "ConsensusOrderedToCommit: max: 0.047, avg: 0.043", "ConsensusProposalToCommit: max: 0.216, avg: 0.208"]
Max non-epoch-change gap was: 1 rounds at version 48414 (avg 0.00) [limit 4], 1.16s no progress at version 48414 (avg 0.07s) [limit 15].
Max epoch-change gap was: 0 rounds at version 0 (avg 0.00) [limit 4], 0.35s no progress at version 2292693 (avg 0.35s) [limit 16].
Test Ok

github-actions · 2026-01-20T22:10:15Z

✅ Forge suite `framework_upgrade` success on `c06e1b8824e5d9db7535c9eed058e24aa7c19bf1` ==> `4460b7aebdeda395907e0b3cabd5f0fad37fc869`

Compatibility test results for c06e1b8824e5d9db7535c9eed058e24aa7c19bf1 ==> 4460b7aebdeda395907e0b3cabd5f0fad37fc869 (PR)
Upgrade the nodes to version: 4460b7aebdeda395907e0b3cabd5f0fad37fc869
framework_upgrade::framework-upgrade::full-framework-upgrade : committed: 2338.97 txn/s, submitted: 2348.41 txn/s, failed submission: 9.45 txn/s, expired: 9.45 txn/s, latency: 1231.27 ms, (p50: 1200 ms, p70: 1200, p90: 1700 ms, p99: 2700 ms), latency samples: 212900
framework_upgrade::framework-upgrade::full-framework-upgrade : committed: 2342.54 txn/s, submitted: 2350.45 txn/s, failed submission: 7.92 txn/s, expired: 7.92 txn/s, latency: 1229.52 ms, (p50: 1200 ms, p70: 1200, p90: 1800 ms, p99: 2200 ms), latency samples: 213040
5. check swarm health
Compatibility test for c06e1b8824e5d9db7535c9eed058e24aa7c19bf1 ==> 4460b7aebdeda395907e0b3cabd5f0fad37fc869 passed
Upgrade the remaining nodes to version: 4460b7aebdeda395907e0b3cabd5f0fad37fc869
framework_upgrade::framework-upgrade::full-framework-upgrade : committed: 1550.72 txn/s, submitted: 1557.75 txn/s, failed submission: 7.03 txn/s, expired: 7.03 txn/s, latency: 1864.18 ms, (p50: 1200 ms, p70: 1300, p90: 1700 ms, p99: 11800 ms), latency samples: 141263
Test Ok

This was referenced Jan 15, 2026

dkg impl #1 #18441

Draft

BlockMetadataExtV2 with Decryption Key #18444

Draft

ibalajiarun mentioned this pull request Jan 15, 2026

[qs] Populate BatchKind for BatchV2 #18452

Merged

ibalajiarun force-pushed the balaji/batch-kind branch from 8066269 to f9f72c8 Compare January 15, 2026 19:41

ibalajiarun force-pushed the balaji/opt-qs-batch-v2 branch from 7074c0d to 5c74112 Compare January 15, 2026 20:02

ibalajiarun marked this pull request as ready for review January 15, 2026 20:03

ibalajiarun requested review from JoshLind, bchocho, gregnazario, sasha8 and zekun000 as code owners January 15, 2026 20:03

ibalajiarun requested a review from danielxiangzl January 15, 2026 20:04

ibalajiarun force-pushed the balaji/batch-kind branch from f9f72c8 to 8f474b1 Compare January 16, 2026 00:19

ibalajiarun force-pushed the balaji/opt-qs-batch-v2 branch from 5c74112 to def3a58 Compare January 16, 2026 00:19

cursor bot reviewed Jan 16, 2026

View reviewed changes

danielxiangzl approved these changes Jan 16, 2026

View reviewed changes

ibalajiarun force-pushed the balaji/opt-qs-batch-v2 branch from def3a58 to 34ae15f Compare January 16, 2026 03:02

ibalajiarun force-pushed the balaji/batch-kind branch from 8f474b1 to 4a7cef3 Compare January 16, 2026 03:02

cursor bot reviewed Jan 16, 2026

View reviewed changes

consensus/consensus-types/src/common.rs Show resolved Hide resolved

JoshLind approved these changes Jan 20, 2026

View reviewed changes

Base automatically changed from balaji/batch-kind to main January 20, 2026 17:52

[qs] support pulling OptQuorumStorePayload::V2

849d72f

ibalajiarun force-pushed the balaji/opt-qs-batch-v2 branch 2 times, most recently from b4b2113 to c35aa2d Compare January 20, 2026 20:38

ibalajiarun enabled auto-merge (squash) January 20, 2026 20:44

This comment was marked as outdated.

Sign in to view

This comment has been minimized.

Sign in to view

[consensus] accept opt qs v2 payload behind config flag

4460b7a

This comment has been minimized.

Sign in to view

ibalajiarun force-pushed the balaji/opt-qs-batch-v2 branch from c35aa2d to 4460b7a Compare January 20, 2026 21:30

cursor bot reviewed Jan 20, 2026

View reviewed changes

consensus/src/consensus_observer/network/observer_message.rs Show resolved Hide resolved

This comment has been minimized.

Sign in to view

ibalajiarun merged commit ab91501 into main Jan 20, 2026
48 checks passed

ibalajiarun deleted the balaji/opt-qs-batch-v2 branch January 20, 2026 22:21

ibalajiarun mentioned this pull request Jan 20, 2026

[test] enctx forge e2e #18478

Draft

22 tasks

[qs] support pulling OptQuorumStorePayload::V2 #18453

[qs] support pulling OptQuorumStorePayload::V2 #18453

Conversation

ibalajiarun commented Jan 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Uh oh!

ibalajiarun commented Jan 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cursor bot Jan 16, 2026

Choose a reason for hiding this comment

TX config flag enable_opt_qs_v2_tx is not wired up

Uh oh!

danielxiangzl Jan 16, 2026

Choose a reason for hiding this comment

Uh oh!

ibalajiarun Jan 20, 2026

Choose a reason for hiding this comment

Uh oh!

danielxiangzl Jan 16, 2026

Choose a reason for hiding this comment

Uh oh!

ibalajiarun Jan 20, 2026

Choose a reason for hiding this comment

Uh oh!

danielxiangzl Jan 16, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

This comment was marked as outdated.

Uh oh!

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.

cursor bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

github-actions bot commented Jan 20, 2026

✅ Forge suite compat success on c06e1b8824e5d9db7535c9eed058e24aa7c19bf1 ==> 4460b7aebdeda395907e0b3cabd5f0fad37fc869

Uh oh!

github-actions bot commented Jan 20, 2026

✅ Forge suite realistic_env_max_load success on 4460b7aebdeda395907e0b3cabd5f0fad37fc869

Uh oh!

github-actions bot commented Jan 20, 2026

✅ Forge suite framework_upgrade success on c06e1b8824e5d9db7535c9eed058e24aa7c19bf1 ==> 4460b7aebdeda395907e0b3cabd5f0fad37fc869

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

ibalajiarun commented Jan 15, 2026 •

edited

Loading

ibalajiarun commented Jan 15, 2026 •

edited

Loading

TX config flag `enable_opt_qs_v2_tx` is not wired up

✅ Forge suite `compat` success on `c06e1b8824e5d9db7535c9eed058e24aa7c19bf1` ==> `4460b7aebdeda395907e0b3cabd5f0fad37fc869`

✅ Forge suite `realistic_env_max_load` success on `4460b7aebdeda395907e0b3cabd5f0fad37fc869`

✅ Forge suite `framework_upgrade` success on `c06e1b8824e5d9db7535c9eed058e24aa7c19bf1` ==> `4460b7aebdeda395907e0b3cabd5f0fad37fc869`