Adopt spec entry ids and id-based reference resolution

.github/workflows/bindings-ts.yml

@@ -27,7 +27,7 @@ jobs:
       - uses: stellar/quickstart@main
         with:
           tag: nightly
-          protocol_version: 27
+          protocol_version: 28
       - uses: actions/setup-node@v7
         with:
           node-version: "20.x"

.github/workflows/ledger-emulator.yml

@@ -37,7 +37,7 @@ jobs:
       - uses: stellar/quickstart@main
         with:
           tag: nightly
-          protocol_version: 27
+          protocol_version: 28
       - uses: actions/checkout@v7
 
       - uses: stellar/actions/rust-cache@main

.github/workflows/rpc-tests.yml

@@ -33,8 +33,8 @@ jobs:
     steps:
       - uses: stellar/quickstart@main
         with:
-          tag: latest
-          protocol_version: 27
+          tag: nightly
+          protocol_version: 28
       - uses: actions/checkout@v7
       - uses: stellar/actions/rust-cache@main
       - run: rustup update

Cargo.toml

@@ -44,30 +44,30 @@ path = "cmd/crates/stellar-ledger"
 
 # Dependencies from the rs-stellar-xdr repo:
 [workspace.dependencies.stellar-xdr]
-version = "27.0.0"
+version = "28.0.0"
 
 # Dependencies from the rs-stellar-env repo:
 [workspace.dependencies.soroban-env-host]
-version = "27.0.1"
+version = "28.0.1"
 
 # Dependencies from the rs-soroban-sdk repo:
 [workspace.dependencies.soroban-spec]
-version = "27.0.2"
+version = "27.0.5"
 
 [workspace.dependencies.soroban-spec-rust]
-version = "27.0.2"
+version = "27.0.5"
 
 [workspace.dependencies.soroban-sdk]
-version = "27.0.2"
+version = "27.0.5"
 
 [workspace.dependencies.soroban-token-sdk]
-version = "27.0.2"
+version = "27.0.5"
 
 [workspace.dependencies.stellar-asset-spec]
-version = "27.0.2"
+version = "27.0.5"
 
 [workspace.dependencies.soroban-ledger-snapshot]
-version = "27.0.2"
+version = "27.0.5"
 
 # Dependencies from the rs-stellar-rpc-client repo:
 [workspace.dependencies.soroban-rpc]
@@ -120,6 +120,23 @@ testcontainers = "0.27.2"
 httpmock = "0.7.0"
 astral-tokio-tar = "0.6.0"
 
+[patch.crates-io]
+# Pending https://github.com/stellar/rs-stellar-xdr/pull/568, which adds
+# user-defined type ids and the `ScSpecTypeUdtv2` reference type to the
+# contract spec.
+stellar-xdr = { git = "https://github.com/stellar/rs-stellar-xdr", rev = "2e565108988d9181c26477815e708ade929e67e0" }
+# Pending the rs-soroban-sdk change that stamps every user-defined type's spec
+# entry with an id and marries references up with entries by id.
+soroban-spec = { git = "https://github.com/stellar/rs-soroban-sdk", rev = "997dd6dbe9c0ce01a3c4cc940c392e9debab12dd" }
+soroban-spec-rust = { git = "https://github.com/stellar/rs-soroban-sdk", rev = "997dd6dbe9c0ce01a3c4cc940c392e9debab12dd" }
+soroban-sdk = { git = "https://github.com/stellar/rs-soroban-sdk", rev = "997dd6dbe9c0ce01a3c4cc940c392e9debab12dd" }
+soroban-token-sdk = { git = "https://github.com/stellar/rs-soroban-sdk", rev = "997dd6dbe9c0ce01a3c4cc940c392e9debab12dd" }
+stellar-asset-spec = { git = "https://github.com/stellar/rs-soroban-sdk", rev = "997dd6dbe9c0ce01a3c4cc940c392e9debab12dd" }
+soroban-ledger-snapshot = { git = "https://github.com/stellar/rs-soroban-sdk", rev = "997dd6dbe9c0ce01a3c4cc940c392e9debab12dd" }
+# Pending https://github.com/stellar/rs-stellar-rpc-client/pull/108, which
+# updates the client to stellar-xdr 28.
+stellar-rpc-client = { git = "https://github.com/stellar/rs-stellar-rpc-client", rev = "e0d44a0b97959820e855eb9058e2114ac390c1fa" }
+
 [profile.release]
 overflow-checks = true
 

Makefile

@@ -39,7 +39,7 @@ build:
 	cargo build
 
 build-test-wasms:
-	cargo build --package 'test_*' --profile test-wasms --target wasm32v1-none
+	SOROBAN_SDK_BUILD_SYSTEM_SUPPORTS_SPEC_SHAKING_V2=1 cargo build --package 'test_*' --profile test-wasms --target wasm32v1-none
 
 build-test: build-test-wasms build-fixtures install
 

cmd/crates/soroban-spec-tools/src/contract.rs

@@ -6,8 +6,8 @@ use std::{
 
 use stellar_xdr::{
     self as xdr, Limited, Limits, ReadXdr, ScEnvMetaEntry, ScEnvMetaEntryInterfaceVersion,
-    ScMetaEntry, ScMetaV0, ScSpecEntry, ScSpecFunctionV0, ScSpecUdtEnumV0, ScSpecUdtErrorEnumV0,
-    ScSpecUdtStructV0, ScSpecUdtUnionV0, StringM, WriteXdr,
+    ScMetaEntry, ScMetaV0, ScSpecEntry, ScSpecEntryV2Body, ScSpecFunctionV0, ScSpecUdtEnumV0,
+    ScSpecUdtErrorEnumV0, ScSpecUdtStructV0, ScSpecUdtUnionV0, StringM, WriteXdr,
 };
 
 /// Maximum recursion depth allowed when decoding contract spec/meta sections.
@@ -184,6 +184,14 @@ impl Display for Spec {
                     ScSpecEntry::UdtEnumV0(udt) => write_enum(f, udt)?,
                     ScSpecEntry::UdtErrorEnumV0(udt) => write_error(f, udt)?,
                     ScSpecEntry::EventV0(_) => {}
+                    ScSpecEntry::V2(v2) => match &v2.body {
+                        ScSpecEntryV2Body::FunctionV0(func) => write_func(f, func)?,
+                        ScSpecEntryV2Body::UdtUnionV0(udt) => write_union(f, udt)?,
+                        ScSpecEntryV2Body::UdtStructV0(udt) => write_struct(f, udt)?,
+                        ScSpecEntryV2Body::UdtEnumV0(udt) => write_enum(f, udt)?,
+                        ScSpecEntryV2Body::UdtErrorEnumV0(udt) => write_error(f, udt)?,
+                        ScSpecEntryV2Body::EventV0(_) => {}
+                    },
                 }
             }
         } else {