Skip to content

Commit 68fa1ac

Browse files
sisureshCopilot
andauthored
Ungate CAP_0071 ifdefs (#303)
* 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. * Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
1 parent 5187e69 commit 68fa1ac

2 files changed

Lines changed: 4 additions & 15 deletions

File tree

Stellar-ledger-entries.x

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -664,11 +664,8 @@ enum EnvelopeType
664664
ENVELOPE_TYPE_OP_ID = 6,
665665
ENVELOPE_TYPE_POOL_REVOKE_OP_ID = 7,
666666
ENVELOPE_TYPE_CONTRACT_ID = 8,
667-
ENVELOPE_TYPE_SOROBAN_AUTHORIZATION = 9
668-
#ifdef CAP_0071
669-
,
667+
ENVELOPE_TYPE_SOROBAN_AUTHORIZATION = 9,
670668
ENVELOPE_TYPE_SOROBAN_AUTHORIZATION_WITH_ADDRESS = 10
671-
#endif
672669
};
673670

674671
enum BucketListType

Stellar-transaction.x

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -569,8 +569,8 @@ struct SorobanAddressCredentials
569569
SCVal signature;
570570
};
571571

572-
#ifdef CAP_0071
573-
struct SorobanDelegateSignature {
572+
struct SorobanDelegateSignature
573+
{
574574
SCAddress address;
575575
SCVal signature;
576576
SorobanDelegateSignature nestedDelegates<>;
@@ -581,17 +581,13 @@ struct SorobanAddressCredentialsWithDelegates
581581
SorobanAddressCredentials addressCredentials;
582582
SorobanDelegateSignature delegates<>;
583583
};
584-
#endif
585584

586585
enum SorobanCredentialsType
587586
{
588587
SOROBAN_CREDENTIALS_SOURCE_ACCOUNT = 0,
589-
SOROBAN_CREDENTIALS_ADDRESS = 1
590-
#ifdef CAP_0071
591-
,
588+
SOROBAN_CREDENTIALS_ADDRESS = 1,
592589
SOROBAN_CREDENTIALS_ADDRESS_V2 = 2,
593590
SOROBAN_CREDENTIALS_ADDRESS_WITH_DELEGATES = 3
594-
#endif
595591
};
596592

597593
union SorobanCredentials switch (SorobanCredentialsType type)
@@ -600,12 +596,10 @@ case SOROBAN_CREDENTIALS_SOURCE_ACCOUNT:
600596
void;
601597
case SOROBAN_CREDENTIALS_ADDRESS:
602598
SorobanAddressCredentials address;
603-
#ifdef CAP_0071
604599
case SOROBAN_CREDENTIALS_ADDRESS_V2:
605600
SorobanAddressCredentials addressV2;
606601
case SOROBAN_CREDENTIALS_ADDRESS_WITH_DELEGATES:
607602
SorobanAddressCredentialsWithDelegates addressWithDelegates;
608-
#endif
609603
};
610604

611605
/* Unit of authorization data for Soroban.
@@ -756,7 +750,6 @@ case ENVELOPE_TYPE_SOROBAN_AUTHORIZATION:
756750
uint32 signatureExpirationLedger;
757751
SorobanAuthorizedInvocation invocation;
758752
} sorobanAuthorization;
759-
#ifdef CAP_0071
760753
case ENVELOPE_TYPE_SOROBAN_AUTHORIZATION_WITH_ADDRESS:
761754
struct
762755
{
@@ -766,7 +759,6 @@ case ENVELOPE_TYPE_SOROBAN_AUTHORIZATION_WITH_ADDRESS:
766759
SCAddress address;
767760
SorobanAuthorizedInvocation invocation;
768761
} sorobanAuthorizationWithAddress;
769-
#endif
770762
};
771763

772764
enum MemoType

0 commit comments

Comments
 (0)