Skip to content

Protocol 30 (CAP-0084) - #5472

Merged
sisuresh merged 4 commits into
stellar:masterfrom
sisuresh:p30-cap-0084-validate
Sep 29, 2026
Merged

sisuresh merged 4 commits into
stellar:masterfrom
sisuresh:p30-cap-0084-validate

Conversation

@sisuresh

@sisuresh sisuresh commented Sep 24, 2026 •

Copy link
Copy Markdown
Contributor

Changes

  • p30 host (rs-soroban-env#1700 169890d5 (merged), 30.0.0) as WIP_SOROBAN_PROTOCOL: vnext-only, no next; CAP_0084_MUXED_CONTRACT only under vnext; SAC transfer to muxed contract tests; LCM in test-lcm-next/InvokeHostFunctionTests.
  • p29 stand-in host (rs-soroban-env cb32250d, 29.0.0) in ALL_SOROBAN_PROTOCOLS; CURRENT_LEDGER_PROTOCOL_VERSION 29 (vnext 30); protocol-curr/xdr ee040cd6; current-tier goldens and protocol-30 ledger-close-meta refs recorded.
  • stellar-quorum-analyzer → Bump stellar-xdr to 28.0.0 stellar-quorum-analyzer#27 3a023060 (rs-stellar-xdr a9c9750e, same XDR hashes as the p29 host), so non-vnext startup passes the XDR identity check.

Deferred

  • The 28→29 bump and p29 host stand in for the internal protocol-29 release; swap for it when it lands.

Upstream: stellar/stellar-xdr#307, stellar/rs-stellar-xdr#592, stellar/rs-soroban-env#1700, stellar/stellar-quorum-analyzer#27. Supersedes #5337.

@sisuresh
sisuresh force-pushed the p30-cap-0084-validate branch from 99d1d47 to e8a5e6d Compare September 26, 2026 00:20
@sisuresh sisuresh changed the title SPIKE: Protocol 30 (CAP-0084) Protocol 30 (CAP-0084) Sep 28, 2026
Adds the protocol-30 host (rs-soroban-env#1700) as a vnext-only WIP host, with
CAP_0084_MUXED_CONTRACT defined only in vnext builds, and SAC transfer tests to
muxed contracts. Protocol 29 is an internal release, so a stand-in p29 host at
rs-soroban-env main becomes the current host and CURRENT_LEDGER_PROTOCOL_VERSION
moves to 29. stellar-quorum-analyzer moves to #27 so non-vnext startup passes
the XDR identity check.
Muxed accounts (M...) and, under CAP_0084_MUXED_CONTRACT, muxed contracts
(W...) can be stored as contract data values but rendered as "UNKNOWN".
Re-recorded for protocols 29 (current) and 30 (next) with --capture-lcm
(stellar#5435), plus the protocol-30 ledger-close-meta reference files.
@sisuresh
sisuresh force-pushed the p30-cap-0084-validate branch from 890f729 to 387990e Compare September 28, 2026 21:49
@sisuresh
sisuresh marked this pull request as ready for review September 28, 2026 21:49
Copilot AI balanced review requested due to automatic review settings September 28, 2026 21:49

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Copilot review overview

🟡 Changes recommended

Generated XDR headers can remain stale after switching CAP-0084 configuration because they do not depend on the regenerated Makefile.

Review effort: Balanced
Findings: 1 Medium severity

Open (1)
What changed in this PR

Introduces protocol 30 CAP-0084 support while promoting protocol 29 to current.

Changes:

  • Adds protocol 29/30 Soroban hosts and dispatch.
  • Implements muxed-contract encoding, hashing, serialization, and SAC tests.
  • Regenerates protocol 29/30 TxMeta and LCM goldens.
File Description
.gitmodules Registers p29/p30 hosts.
Cargo.lock Locks updated Rust dependencies.
common.mk, configure.ac, src/​Makefile.am Configures CAP-0084 and host builds.
src/​crypto/​StrKey.h, src/​ledger/​LedgerHashUtils.h Supports muxed-contract identifiers.
src/​main/​Config.cpp, src/​main/​main.cpp Advances protocols and validates XDR identity.
src/​protocol-curr/​xdr Updates current XDR definitions.
src/​rust/​Cargo.toml, src/​rust/​soroban/​p29, src/​rust/​soroban/​p30 Adds pinned hosts.
src/​rust/​src/​dep-trees/​* Records host dependency trees.
src/​rust/​src/​soroban_module_cache.rs, soroban_proto_all.rs Dispatches and caches p29/p30 hosts.
src/​transactions/​test/​* Tests muxed-contract SAC transfers.
src/​util/​ProtocolVersion.h, XDRCereal.cpp, xdrquery/​* Adds protocol and utility support.
src/​testdata/​*protocol-30.json Adds protocol-30 metadata references.
test-tx-meta-baseline-{current,next}/​* Regenerates transaction metadata goldens.
test-lcm-{current,next}/​* Regenerates LCM indexes and XDR goldens.

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

Comment thread src/Makefile.am Resolved

@graydon graydon left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

couple nits but basically ok. I'll be around for a while if you need a quick re-review rubber stamp.

Comment thread src/Makefile.am Resolved
Comment thread src/Makefile.am Resolved
Regenerate XDR headers when the Makefile changes, keep the commented-out
module-cache adjustment, move the CAP-0084 guard into demuxContractAddress,
and drop p27 from fastdev.
Copilot AI review requested due to automatic review settings September 29, 2026 01:35

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Copilot review overview

🔵 Needs a closer look

It changes protocol-critical C++/Rust/XDR integration and extensive binary golden data, requiring final human validation.

Review effort: Balanced
Findings: None

Resolved since last review (1)

@sisuresh
sisuresh added this pull request to the merge queue Sep 29, 2026
Merged via the queue into stellar:master with commit 73f2bdd Sep 29, 2026
57 of 58 checks passed
@sisuresh
sisuresh deleted the p30-cap-0084-validate branch September 29, 2026 04:15
SirTyson added a commit to SirTyson/stellar-core that referenced this pull request Nov 9, 2026
Brings overlay-v2-shared up to date with master. The previous master
merge (b90d48e, stellar#5428) was recorded with master's tip 100cc38 missing
from its parents, so this merge used 100cc38 as its base (temporary
graft of b90d48e, removed afterwards).

Notable master changes brought in:
- Protocol 30: CURRENT_LEDGER_PROTOCOL_VERSION follows
  MAX_SUPPORTED_PROTOCOL_VERSION; CAP-0084 and CAP-0087 ungated, p29 and
  p30 Soroban hosts (stellar#5472, stellar#5478, stellar#5484, stellar#5483).
- Millisecond-resolution close times at protocol 30 (stellar#5423):
  ConsensusTime/ApplyTime types, STELLAR_VALUE_SIGNED_MS and
  STELLAR_VALUE_EMPTY_TX_SET_MS.
- Tx set validity hardening (stellar#5481), lower max message size in protocol
  29 (stellar#733), sub-second ledger edge-case fixes.
- Simplified ledger view hierarchy (stellar#5461); the overlay-only-mode
  sequence number skip now lives in TransactionFrame::checkValid.
- Banned accounts deprecated (CAP-0077 is active).
- Apply-path performance work (stellar#5402, stellar#5411, stellar#5414, stellar#5415, stellar#5418, stellar#5421,
  stellar#5436, stellar#5286), apply-load tx set construction mode (stellar#5448), --check-lcm
  (stellar#5435), v29.0.0 release merge.

Conflict resolution:
- Files overlay-v2-shared deleted and master modified (the C++ overlay,
  TransactionQueue, TransactionQueueTests, UpgradesTests, private/Horizon/RPC
  workflows): kept deleted. Master's changes to them are C++ overlay
  peer/flow-control logic, tx queue admission and tests for those.
- Herder: kept the Rust-overlay submission path (recvTransaction returns
  TxSubmitStatus) and dropped the deprecated `force` parameter as master did.
  triggerNextLedger keeps the prepared/built tx set path from the Rust
  mempool, now with ConsensusTime close times and master's apply-time
  close-time offset. The early tx set preparation path (prepareTxSet,
  buildTxSet, setupTriggerNextLedger) takes ConsensusTime. Kept master's
  mNominatedTxSetOverride test hook (applied before the tx set is cached in
  the Rust overlay) and the herder.txset.build timer (now timing
  buildTxSet). Dropped the banned-accounts setup and tx queue maintenance.
- AppConnector: dropped both ov2's maybeUpdateImmutableLedgerView and
  master's C++-overlay getOverlayThreadSnapshot.
- LoadGenerator: master's CachedTestAccountPtr with ov2's TxSubmitStatus.
- Tests: kept ov2's removal of tests that need the C++ overlay, standalone
  mode or the tx queue (standalone, manualclose, flooding, tx queue limits,
  far-future slot cleanup, herderExternalizesValuesWithProtocol, MAX_SAC_TPS,
  custom token, soroswap and noisy binary search apply-load tests). Added
  master's ms close time HerderTests and the non-canonical empty tx set test
  on ov2's Rust-overlay topologies. The tx set size test checks against
  overlay-v2's own tx set allowance. The sub-second
  getUpperBoundCloseTimeOffset test checks the offset directly, since there
  is no C++ tx queue admission. Tests that used CheckValidLedgerViewWrapper
  now use getLCLView().
- Cargo.lock: master's lockfile plus the overlay crate's packages,
  regenerated by cargo; semver-compatible duplicates take the newer
  version.
- Build: Makefile.am keeps the Rust overlay rules and adds tracy
  import-chrome; ci-build.sh keeps ASAN off and takes master's -g1.
- Needed to compile: PendingEnvelopes.cpp includes LedgerManager.h
  (master got it through the C++ OverlayManager.h); ov2's early-nomination
  and checkpoint-slot tests use ConsensusTime/ApplyTimeOffset; OverlayIPC
  tests take ledger views from the LedgerManager.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants