Skip to content
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

Jump to bottom

Move ContractAuth signatureArgs into Authorizer #89

Merged
merged 4 commits into from
May 23, 2023
Merged

Move ContractAuth signatureArgs into Authorizer #89

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
45a7d61
Replace ContractAuth addressWithNonce option with explicit union
leighmcculloch Apr 28, 2023
ea3a888
Move signatureArgs into Authorizer
leighmcculloch Apr 28, 2023
9782fa8
Merge branch 'next' into authorizer-owns-signatures
leighmcculloch May 23, 2023
89578bf
rename
leighmcculloch May 23, 2023
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
20 changes: 10 additions & 10 deletions Stellar-transaction.x
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,31 +534,31 @@ struct AuthorizedInvocation
AuthorizedInvocation subInvocations<>;
};

struct AddressWithNonce
struct AddressAuthorization
{
SCAddress address;
uint64 nonce;
SCVec signatureArgs;
};

enum AuthorizerType
enum AuthorizationType
{
AUTHORIZER_SOURCE_ACCOUNT = 0,
AUTHORIZER_ADDRESS = 1,
AUTHORIZATION_SOURCE_ACCOUNT = 0,
AUTHORIZATION_ADDRESS = 1,
};

union Authorizer switch (AuthorizerType type)
union Authorization switch (AuthorizationType type)
{
case AUTHORIZER_SOURCE_ACCOUNT:
case AUTHORIZATION_SOURCE_ACCOUNT:
void;
case AUTHORIZER_ADDRESS:
AddressWithNonce address;
case AUTHORIZATION_ADDRESS:
AddressAuthorization address;
};

struct ContractAuth
{
Authorizer authorizer;
Authorization authorizer;
AuthorizedInvocation rootInvocation;
SCVec signatureArgs;
};

struct HostFunction {
Expand Down