gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Nonce: Rename instructions with VerbNoun scheme (#7775)

Browse Source 
automerge
This commit is contained in:
Trent Nelson
2020-01-13 16:34:43 -07:00
committed by Grimes
parent c948814eae
commit 81ae44f858
4 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
sdk/src/system_instruction.rs
View File

@ -92,15 +92,15 @@ pub enum SystemInstruction {
space: u64,
program_id: Pubkey,
},
/// `NonceAdvance` consumes a stored nonce, replacing it with a successor
/// `AdvanceNonceAccount` consumes a stored nonce, replacing it with a successor
///
/// Expects 2 Accounts:
/// 0 - A NonceAccount
/// 1 - RecentBlockhashes sysvar
///
/// The current authority must sign a transaction executing this instrucion
NonceAdvance,
/// `NonceWithdraw` transfers funds out of the nonce account
AdvanceNonceAccount,
/// `WithdrawNonceAccount` transfers funds out of the nonce account
///
/// Expects 4 Accounts:
/// 0 - A NonceAccount
@ -112,8 +112,8 @@ pub enum SystemInstruction {
/// account balance above the rent exempt reserve or at zero.
///
/// The current authority must sign a transaction executing this instruction
NonceWithdraw(u64),
/// `NonceInitialize` drives state of Uninitalized NonceAccount to Initialized,
WithdrawNonceAccount(u64),
/// `InitializeNonceAccount` drives state of Uninitalized NonceAccount to Initialized,
/// setting the nonce value.
///
/// Expects 3 Accounts:
@ -126,8 +126,8 @@ pub enum SystemInstruction {
///
/// No signatures are required to execute this instruction, enabling derived
/// nonce account addresses
NonceInitialize(Pubkey),
/// `NonceAuthorize` changes the entity authorized to execute nonce instructions
InitializeNonceAccount(Pubkey),
/// `AuthorizeNonceAccount` changes the entity authorized to execute nonce instructions
/// on the account
///
/// Expects 1 Account:
@ -136,7 +136,7 @@ pub enum SystemInstruction {
/// The `Pubkey` parameter identifies the entity to authorize
///
/// The current authority must sign a transaction executing this instruction
NonceAuthorize(Pubkey),
AuthorizeNonceAccount(Pubkey),
}
pub fn create_account(
@ -256,7 +256,7 @@ pub fn create_nonce_account_with_seed(
),
Instruction::new(
system_program::id(),
&SystemInstruction::NonceInitialize(*authority),
&SystemInstruction::InitializeNonceAccount(*authority),
vec![
AccountMeta::new(*nonce_pubkey, false),
AccountMeta::new_readonly(recent_blockhashes::id(), false),
@ -282,7 +282,7 @@ pub fn create_nonce_account(
),
Instruction::new(
system_program::id(),
&SystemInstruction::NonceInitialize(*authority),
&SystemInstruction::InitializeNonceAccount(*authority),
vec![
AccountMeta::new(*nonce_pubkey, false),
AccountMeta::new_readonly(recent_blockhashes::id(), false),
@ -300,7 +300,7 @@ pub fn nonce_advance(nonce_pubkey: &Pubkey, authorized_pubkey: &Pubkey) -> Instr
.with_signer(authorized_pubkey);
Instruction::new(
system_program::id(),
&SystemInstruction::NonceAdvance,
&SystemInstruction::AdvanceNonceAccount,
account_metas,
)
}
@ -320,7 +320,7 @@ pub fn nonce_withdraw(
.with_signer(authorized_pubkey);
Instruction::new(
system_program::id(),
&SystemInstruction::NonceWithdraw(lamports),
&SystemInstruction::WithdrawNonceAccount(lamports),
account_metas,
)
}
@ -333,7 +333,7 @@ pub fn nonce_authorize(
let account_metas = vec![AccountMeta::new(*nonce_pubkey, false)].with_signer(authorized_pubkey);
Instruction::new(
system_program::id(),
&SystemInstruction::NonceAuthorize(*new_authority),
&SystemInstruction::AuthorizeNonceAccount(*new_authority),
account_metas,
)
}