Skip to content

SPIKE: Protocol 28 (CAP-0084) — muxed contract addresses #837

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.

Sign up for GitHub

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

Draft
sisuresh wants to merge 6 commits into
base: protocol-next
Choose a base branch
from
Draft

SPIKE: Protocol 28 (CAP-0084) — muxed contract addresses #837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cd4e29c
SPIKE: Protocol 28 (CAP-0084) — muxed contract addresses
sisuresh Jun 25, 2026
a240dc4
Repin CAP-0084 chain: env->87a9b56, xdr->8f826ca (env next feature); …
sisuresh Jul 1, 2026
97bc7d6
Re-pin -curr host/simulation to rs-soroban-env#1696 head 448016ac
sisuresh Jul 1, 2026
d11814a
Correct deferred P28 integration image target: e32fa423 -> b2b06a8
sisuresh Jul 1, 2026
a24e351
Re-pin go-stellar-sdk to #5961 head eeca7aa4; drop local-path replace…
sisuresh Jul 3, 2026
66c395c
Re-pin CAP-0084 Rust chain to current upstream heads
sisuresh Jul 3, 2026
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
6 changes: 6 additions & 0 deletions .github/workflows/stellar-rpc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,12 @@ jobs:
# Pinned to 3367 (3589a696b), which includes stellar-core#5329 — the
# fix for the QueryServer.cpp:124 contiguous-snapshot assertion that
# aborted captive-core catchup on builds 3313..3366.
#
# SPIKE (CAP-0084) DEFERRED: this is still the CAP-0083 vnext image; it
# exercises RPC against a P28 core but NOT the CAP-0084 muxed-contract SAC
# host behavior. Re-pin to the `4cdd2fc9…`-prefixed `-vnext` build
# (stellar/stellar-core#5337 head) once Jenkins publishes it — match the plain
# `~vnext` variant, not `~buildtests`. No such build exists yet.
core_deb_version: '27.0.1-3367.3589a696b.jammy~vnext'
core_docker_img: 'stellar/unsafe-stellar-core:27.0.1-3367.3589a696b.jammy-vnext'

Expand Down
5 changes: 5 additions & 0 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@ linters:
funlen:
lines: 100
statements: 50
gomoddirectives:
# SPIKE: CAP-0084 Go XDR pin (go-stellar-sdk#... unmerged). Remove this and
# the replace directive together once the upstream SDK PR is released.
replace-allow-list:
- github.com/stellar/go-stellar-sdk
misspell:
locale: US
testifylint:
Expand Down
57 changes: 33 additions & 24 deletions Cargo.lock
View file
Open in desktop

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

26 changes: 20 additions & 6 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,11 @@ version = "=27.0.0"
# Bump the rev as rs-soroban-env evolves on its protocol-next track.
[workspace.dependencies.soroban-env-host-curr]
package = "soroban-env-host"
git = "https://github.com/stellar/rs-soroban-env"
rev = "883fd56374fc619afaa4c4c7489563555b7173f2"
git = "https://github.com/sisuresh/rs-soroban-env"
rev = "26b035c00663a424a0cdc4732911d49ddb6bb26f"
# `next` now pulls in CAP-0084: rs-soroban-env#1700 gates the CAP on the umbrella
# `next` (which enables stellar-xdr/cap_0084_muxed_contract), so the host's
# SCAddress match handles the new MUXED_CONTRACT arm.
features = ["next"]

[workspace.dependencies.soroban-simulation-prev]
Expand All @@ -34,16 +37,27 @@ version = "=27.0.0"

[workspace.dependencies.soroban-simulation-curr]
package = "soroban-simulation"
git = "https://github.com/stellar/rs-soroban-env"
rev = "883fd56374fc619afaa4c4c7489563555b7173f2"
git = "https://github.com/sisuresh/rs-soroban-env"
rev = "26b035c00663a424a0cdc4732911d49ddb6bb26f"
features = ["unstable-next-api"]

[workspace.dependencies.stellar-xdr]
version = "=27.0.0"
# SPIKE: rs-stellar-xdr#552 (CAP-0084) — fork branch sisuresh/rs-stellar-xdr@p28-cap-0084.
# MUST match the git source+rev that rs-soroban-env#1700 uses, so cargo unifies
# the preflight's stellar-xdr with the host's into one package.
# Productionize -> stellar/rs-stellar-xdr merged SHA (or crates.io =28.x) once #552 lands.
git = "https://github.com/sisuresh/rs-stellar-xdr"
# Pinned to rs-stellar-xdr#552's head (cf7fded), which is exactly the rev that
# rs-soroban-env#1700 pins — env#1700 and xdr#552 heads are now aligned, so the
# "must match the git source+rev env uses" invariant holds and cargo unifies
# preflight's stellar-xdr with the host's into one package.
rev = "cf7fdedf7ca95fccf45c82e6829d14637c9b5e4c"
# `type_enum` provides the `Type`/`TypeVariant` reflection enums used by
# xdr2json. It was enabled by default in stellar-xdr v26 but is opt-in in v27.
# `cap_0083` gates the Protocol 28 EmptyTxSet StellarValueType variant.
features = ["serde", "type_enum", "cap_0083"]
# `cap_0084_muxed_contract` gates the Protocol 28 muxed contract addresses
# (SC_ADDRESS_TYPE_MUXED_CONTRACT / struct MuxedContract / SCAddress arm).
features = ["serde", "type_enum", "cap_0083", "cap_0084_muxed_contract"]

[workspace.dependencies.rand]
version = "0.8.5"
Expand Down
8 changes: 7 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ require (
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.7.0
github.com/spf13/pflag v1.0.5
github.com/stellar/go-stellar-sdk v0.6.1-0.20260616165505-26fec7c0e891
github.com/stellar/go-stellar-sdk v0.6.1-0.20260625060941-069643df4897
github.com/stretchr/testify v1.11.1
)

Expand Down Expand Up @@ -148,3 +148,9 @@ require (
gopkg.in/tylerb/graceful.v1 v1.2.15 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

// SPIKE (CAP-0084): the go-stellar-sdk CAP-0084 regen is not yet released, so
// pin to the fork branch sisuresh/go@p28-cap-0084 (go-stellar-sdk#5961). Remove
// this replace (and the .golangci.yml gomoddirectives allow-list) once the
// upstream SDK PR merges and the pseudo-version resolves via the module proxy.
replace github.com/stellar/go-stellar-sdk => github.com/sisuresh/go v0.0.0-20260701230520-eeca7aa4a3bc
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,8 @@ github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/sisuresh/go v0.0.0-20260701230520-eeca7aa4a3bc h1:WVa7+1/bWNhqwKTBIZ+yHdANMwmXDb4VOym4bn2YpME=
github.com/sisuresh/go v0.0.0-20260701230520-eeca7aa4a3bc/go.mod h1:IkcqcrE9UQi7n/1y+MxKB+7qzdjG1T2kGOD7Ss8dqjw=
github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0=
github.com/spf13/afero v1.10.0 h1:EaGW2JJh15aKOejeuJ+wpFSHnbd7GE6Wvp3TsNhb6LY=
Expand All @@ -429,8 +431,6 @@ github.com/spf13/viper v1.17.0 h1:I5txKw7MJasPL/BrfkbA0Jyo/oELqVmux4pR/UxOMfI=
github.com/spf13/viper v1.17.0/go.mod h1:BmMMMLQXSbcHK6KAOiFLz0l5JHrU89OdIRHvsk0+yVI=
github.com/spiffe/go-spiffe/v2 v2.6.0 h1:l+DolpxNWYgruGQVV0xsfeya3CsC7m8iBzDnMpsbLuo=
github.com/spiffe/go-spiffe/v2 v2.6.0/go.mod h1:gm2SeUoMZEtpnzPNs2Csc0D/gX33k1xIx7lEzqblHEs=
github.com/stellar/go-stellar-sdk v0.6.1-0.20260616165505-26fec7c0e891 h1:Y/PtLm4L4ZHLDI1dXIflRjI5pY+m+KD7FUVFM07tV+E=
github.com/stellar/go-stellar-sdk v0.6.1-0.20260616165505-26fec7c0e891/go.mod h1:IkcqcrE9UQi7n/1y+MxKB+7qzdjG1T2kGOD7Ss8dqjw=
github.com/stellar/go-xdr v0.0.0-20260529210834-0bf8f4956364 h1:gOKrfuWdZ92LFlv0TAwgZ7OsWKeBsOMDlGLyFgduI1w=
github.com/stellar/go-xdr v0.0.0-20260529210834-0bf8f4956364/go.mod h1:If+U9Z1W5xU97VrOgJandQT+2dN7/iOpkCrxBJEyF80=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
Expand Down