Skip to content

Commit

Permalink
Revert "Add support for memos in Soroban auth (CAP-64)." (#230)
Browse files Browse the repository at this point in the history
This reverts commit cff82ba.
  • Loading branch information
dmkozh authored Feb 5, 2025
1 parent a76f7f9 commit 2afe23b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 28 deletions.
3 changes: 1 addition & 2 deletions Stellar-ledger-entries.x
Original file line number Diff line number Diff line change
Expand Up @@ -676,8 +676,7 @@ enum EnvelopeType
ENVELOPE_TYPE_OP_ID = 6,
ENVELOPE_TYPE_POOL_REVOKE_OP_ID = 7,
ENVELOPE_TYPE_CONTRACT_ID = 8,
ENVELOPE_TYPE_SOROBAN_AUTHORIZATION = 9,
ENVELOPE_TYPE_SOROBAN_AUTHORIZATION_V2 = 10
ENVELOPE_TYPE_SOROBAN_AUTHORIZATION = 9
};

enum BucketListType
Expand Down
27 changes: 1 addition & 26 deletions Stellar-transaction.x
Original file line number Diff line number Diff line change
Expand Up @@ -569,22 +569,10 @@ struct SorobanAddressCredentials
SCVal signature;
};

struct SorobanAddressCredentialsV2
{
ExtensionPoint ext;

SCAddress address;
int64 nonce;
uint32 signatureExpirationLedger;
Memo txMemo;
SCVal signature;
};

enum SorobanCredentialsType
{
SOROBAN_CREDENTIALS_SOURCE_ACCOUNT = 0,
SOROBAN_CREDENTIALS_ADDRESS = 1,
SOROBAN_CREDENTIALS_ADDRESS_V2 = 2
SOROBAN_CREDENTIALS_ADDRESS = 1
};

union SorobanCredentials switch (SorobanCredentialsType type)
Expand All @@ -593,8 +581,6 @@ case SOROBAN_CREDENTIALS_SOURCE_ACCOUNT:
void;
case SOROBAN_CREDENTIALS_ADDRESS:
SorobanAddressCredentials address;
case SOROBAN_CREDENTIALS_ADDRESS_V2:
SorobanAddressCredentialsV2 addressV2;
};

/* Unit of authorization data for Soroban.
Expand Down Expand Up @@ -743,17 +729,6 @@ case ENVELOPE_TYPE_SOROBAN_AUTHORIZATION:
uint32 signatureExpirationLedger;
SorobanAuthorizedInvocation invocation;
} sorobanAuthorization;
case ENVELOPE_TYPE_SOROBAN_AUTHORIZATION_V2:
struct
{
ExtensionPoint ext;

Hash networkID;
int64 nonce;
uint32 signatureExpirationLedger;
Memo txMemo;
SorobanAuthorizedInvocation invocation;
} sorobanAuthorizationV2;
};

enum MemoType
Expand Down

0 comments on commit 2afe23b

Please sign in to comment.