From 009571f76bef5f3200876174a2e245189bd1e061 Mon Sep 17 00:00:00 2001
From: Siddharth Suresh <siddharth@stellar.org>
Date: Mon, 1 Jun 2026 09:14:11 -0700
Subject: [PATCH 1/2] Ungate CAP_0071 ifdefs

Remove the #ifdef CAP_0071 preprocessor gating so the CAP-0071 XDR
definitions are unconditionally present on main. Folds the gated
trailing commas in the EnvelopeType and SorobanCredentialsType enums
back onto the preceding line.
---
 Stellar-ledger-entries.x |  5 +----
 Stellar-transaction.x    | 11 +----------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/Stellar-ledger-entries.x b/Stellar-ledger-entries.x
index 87ef0d5..348311c 100644
--- a/Stellar-ledger-entries.x
+++ b/Stellar-ledger-entries.x
@@ -664,11 +664,8 @@ enum EnvelopeType
     ENVELOPE_TYPE_OP_ID = 6,
     ENVELOPE_TYPE_POOL_REVOKE_OP_ID = 7,
     ENVELOPE_TYPE_CONTRACT_ID = 8,
-    ENVELOPE_TYPE_SOROBAN_AUTHORIZATION = 9
-#ifdef CAP_0071
-    ,
+    ENVELOPE_TYPE_SOROBAN_AUTHORIZATION = 9,
     ENVELOPE_TYPE_SOROBAN_AUTHORIZATION_WITH_ADDRESS = 10
-#endif
 };
 
 enum BucketListType
diff --git a/Stellar-transaction.x b/Stellar-transaction.x
index dfc2b59..4f00d67 100644
--- a/Stellar-transaction.x
+++ b/Stellar-transaction.x
@@ -569,7 +569,6 @@ struct SorobanAddressCredentials
     SCVal signature;
 };
 
-#ifdef CAP_0071
 struct SorobanDelegateSignature {
     SCAddress address;
     SCVal signature;
@@ -581,17 +580,13 @@ struct SorobanAddressCredentialsWithDelegates
     SorobanAddressCredentials addressCredentials;
     SorobanDelegateSignature delegates<>;
 };
-#endif
 
 enum SorobanCredentialsType
 {
     SOROBAN_CREDENTIALS_SOURCE_ACCOUNT = 0,
-    SOROBAN_CREDENTIALS_ADDRESS = 1
-#ifdef CAP_0071
-    ,
+    SOROBAN_CREDENTIALS_ADDRESS = 1,
     SOROBAN_CREDENTIALS_ADDRESS_V2 = 2,
     SOROBAN_CREDENTIALS_ADDRESS_WITH_DELEGATES = 3
-#endif
 };
 
 union SorobanCredentials switch (SorobanCredentialsType type)
@@ -600,12 +595,10 @@ case SOROBAN_CREDENTIALS_SOURCE_ACCOUNT:
     void;
 case SOROBAN_CREDENTIALS_ADDRESS:
     SorobanAddressCredentials address;
-#ifdef CAP_0071
 case SOROBAN_CREDENTIALS_ADDRESS_V2:
     SorobanAddressCredentials addressV2;
 case SOROBAN_CREDENTIALS_ADDRESS_WITH_DELEGATES:
     SorobanAddressCredentialsWithDelegates addressWithDelegates;
-#endif
 };
 
 /* Unit of authorization data for Soroban.
@@ -756,7 +749,6 @@ case ENVELOPE_TYPE_SOROBAN_AUTHORIZATION:
         uint32 signatureExpirationLedger;
         SorobanAuthorizedInvocation invocation;
     } sorobanAuthorization;
-#ifdef CAP_0071
 case ENVELOPE_TYPE_SOROBAN_AUTHORIZATION_WITH_ADDRESS:
     struct
     {
@@ -766,7 +758,6 @@ case ENVELOPE_TYPE_SOROBAN_AUTHORIZATION_WITH_ADDRESS:
         SCAddress address;
         SorobanAuthorizedInvocation invocation;
     } sorobanAuthorizationWithAddress;
-#endif
 };
 
 enum MemoType

From 91df4af451d1247d2ecbd319e320c83421e5e528 Mon Sep 17 00:00:00 2001
From: Siddharth Suresh <siddharth@stellar.org>
Date: Mon, 1 Jun 2026 09:48:42 -0700
Subject: [PATCH 2/2] Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 Stellar-transaction.x | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Stellar-transaction.x b/Stellar-transaction.x
index 4f00d67..11cacd7 100644
--- a/Stellar-transaction.x
+++ b/Stellar-transaction.x
@@ -569,7 +569,8 @@ struct SorobanAddressCredentials
     SCVal signature;
 };
 
-struct SorobanDelegateSignature {
+struct SorobanDelegateSignature
+{
     SCAddress address;
     SCVal signature;
     SorobanDelegateSignature nestedDelegates<>;