Skip to content

Ungate CAP_0071 ifdefs #303

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

Merged
sisuresh merged 2 commits into from
Jun 1, 2026
+4 −15
Merged

Ungate CAP_0071 ifdefs #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
009571f
Ungate CAP_0071 ifdefs
sisuresh Jun 1, 2026
91df4af
Potential fix for pull request finding
sisuresh Jun 1, 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
5 changes: 1 addition & 4 deletions Stellar-ledger-entries.x
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment thread
sisuresh marked this conversation as resolved.
#endif
};

enum BucketListType
Expand Down
14 changes: 3 additions & 11 deletions Stellar-transaction.x
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,8 +569,8 @@ struct SorobanAddressCredentials
SCVal signature;
};

#ifdef CAP_0071
struct SorobanDelegateSignature {
struct SorobanDelegateSignature
{
SCAddress address;
SCVal signature;
SorobanDelegateSignature nestedDelegates<>;
Expand All @@ -581,17 +581,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)
Expand All @@ -600,12 +596,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.
Expand Down Expand Up @@ -756,7 +750,6 @@ case ENVELOPE_TYPE_SOROBAN_AUTHORIZATION:
uint32 signatureExpirationLedger;
SorobanAuthorizedInvocation invocation;
} sorobanAuthorization;
#ifdef CAP_0071
case ENVELOPE_TYPE_SOROBAN_AUTHORIZATION_WITH_ADDRESS:
struct
{
Expand All @@ -766,7 +759,6 @@ case ENVELOPE_TYPE_SOROBAN_AUTHORIZATION_WITH_ADDRESS:
SCAddress address;
SorobanAuthorizedInvocation invocation;
} sorobanAuthorizationWithAddress;
#endif
};

enum MemoType
Expand Down
Loading