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.

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

Restaking: Change max_slashable_per_epoch from tuple-like structure to named field syntax #173

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -92,18 +92,18 @@ export type InitializeNcnVaultSlasherTicketInstruction<

export type InitializeNcnVaultSlasherTicketInstructionData = {
discriminator: number;
args: bigint;
maxSlashablePerEpoch: bigint;
};

export type InitializeNcnVaultSlasherTicketInstructionDataArgs = {
args: number | bigint;
maxSlashablePerEpoch: number | bigint;
};

export function getInitializeNcnVaultSlasherTicketInstructionDataEncoder(): Encoder<InitializeNcnVaultSlasherTicketInstructionDataArgs> {
return transformEncoder(
getStructEncoder([
['discriminator', getU8Encoder()],
['args', getU64Encoder()],
['maxSlashablePerEpoch', getU64Encoder()],
]),
(value) => ({
...value,
Expand All @@ -115,7 +115,7 @@ export function getInitializeNcnVaultSlasherTicketInstructionDataEncoder(): Enco
export function getInitializeNcnVaultSlasherTicketInstructionDataDecoder(): Decoder<InitializeNcnVaultSlasherTicketInstructionData> {
return getStructDecoder([
['discriminator', getU8Decoder()],
['args', getU64Decoder()],
['maxSlashablePerEpoch', getU64Decoder()],
]);
}

Expand Down Expand Up @@ -149,7 +149,7 @@ export type InitializeNcnVaultSlasherTicketInput<
admin: TransactionSigner<TAccountAdmin>;
payer: TransactionSigner<TAccountPayer>;
systemProgram?: Address<TAccountSystemProgram>;
args: InitializeNcnVaultSlasherTicketInstructionDataArgs['args'];
maxSlashablePerEpoch: InitializeNcnVaultSlasherTicketInstructionDataArgs['maxSlashablePerEpoch'];
};

export function getInitializeNcnVaultSlasherTicketInstruction<
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ impl Default for InitializeNcnVaultSlasherTicketInstructionData {
#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)]
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
pub struct InitializeNcnVaultSlasherTicketInstructionArgs {
pub args: u64,
pub max_slashable_per_epoch: u64,
}

/// Instruction builder for `InitializeNcnVaultSlasherTicket`.
Expand All @@ -135,7 +135,7 @@ pub struct InitializeNcnVaultSlasherTicketBuilder {
admin: Option<solana_program::pubkey::Pubkey>,
payer: Option<solana_program::pubkey::Pubkey>,
system_program: Option<solana_program::pubkey::Pubkey>,
args: Option<u64>,
max_slashable_per_epoch: Option<u64>,
__remaining_accounts: Vec<solana_program::instruction::AccountMeta>,
}

Expand Down Expand Up @@ -196,8 +196,8 @@ impl InitializeNcnVaultSlasherTicketBuilder {
self
}
#[inline(always)]
pub fn args(&mut self, args: u64) -> &mut Self {
self.args = Some(args);
pub fn max_slashable_per_epoch(&mut self, max_slashable_per_epoch: u64) -> &mut Self {
self.max_slashable_per_epoch = Some(max_slashable_per_epoch);
self
}
/// Add an additional account to the instruction.
Expand Down Expand Up @@ -236,7 +236,10 @@ impl InitializeNcnVaultSlasherTicketBuilder {
.unwrap_or(solana_program::pubkey!("11111111111111111111111111111111")),
};
let args = InitializeNcnVaultSlasherTicketInstructionArgs {
args: self.args.clone().expect("args is not set"),
max_slashable_per_epoch: self
.max_slashable_per_epoch
.clone()
.expect("max_slashable_per_epoch is not set"),
};

accounts.instruction_with_remaining_accounts(args, &self.__remaining_accounts)
Expand Down Expand Up @@ -452,7 +455,7 @@ impl<'a, 'b> InitializeNcnVaultSlasherTicketCpiBuilder<'a, 'b> {
admin: None,
payer: None,
system_program: None,
args: None,
max_slashable_per_epoch: None,
__remaining_accounts: Vec::new(),
});
Self { instruction }
Expand Down Expand Up @@ -518,8 +521,8 @@ impl<'a, 'b> InitializeNcnVaultSlasherTicketCpiBuilder<'a, 'b> {
self
}
#[inline(always)]
pub fn args(&mut self, args: u64) -> &mut Self {
self.instruction.args = Some(args);
pub fn max_slashable_per_epoch(&mut self, max_slashable_per_epoch: u64) -> &mut Self {
self.instruction.max_slashable_per_epoch = Some(max_slashable_per_epoch);
self
}
/// Add an additional account to the instruction.
Expand Down Expand Up @@ -564,7 +567,11 @@ impl<'a, 'b> InitializeNcnVaultSlasherTicketCpiBuilder<'a, 'b> {
signers_seeds: &[&[&[u8]]],
) -> solana_program::entrypoint::ProgramResult {
let args = InitializeNcnVaultSlasherTicketInstructionArgs {
args: self.instruction.args.clone().expect("args is not set"),
max_slashable_per_epoch: self
.instruction
.max_slashable_per_epoch
.clone()
.expect("max_slashable_per_epoch is not set"),
};
let instruction = InitializeNcnVaultSlasherTicketCpi {
__program: self.instruction.__program,
Expand Down Expand Up @@ -616,7 +623,7 @@ struct InitializeNcnVaultSlasherTicketCpiBuilderInstruction<'a, 'b> {
admin: Option<&'b solana_program::account_info::AccountInfo<'a>>,
payer: Option<&'b solana_program::account_info::AccountInfo<'a>>,
system_program: Option<&'b solana_program::account_info::AccountInfo<'a>>,
args: Option<u64>,
max_slashable_per_epoch: Option<u64>,
/// Additional instruction accounts `(AccountInfo, is_writable, is_signer)`.
__remaining_accounts: Vec<(
&'b solana_program::account_info::AccountInfo<'a>,
Expand Down
2 changes: 1 addition & 1 deletion idl/jito_restaking.json
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@
],
"args": [
{
"name": "args",
"name": "maxSlashablePerEpoch",
"type": "u64"
}
],
Expand Down
4 changes: 3 additions & 1 deletion restaking_program/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,9 @@ pub fn process_instruction(
msg!("Instruction: InitializeNcnOperatorState");
process_initialize_ncn_operator_state(program_id, accounts)
}
RestakingInstruction::InitializeNcnVaultSlasherTicket(max_slashable_per_epoch) => {
RestakingInstruction::InitializeNcnVaultSlasherTicket {
max_slashable_per_epoch,
} => {
msg!("Instruction: InitializeNcnVaultSlasherTicket");
process_initialize_ncn_vault_slasher_ticket(
program_id,
Expand Down
2 changes: 1 addition & 1 deletion restaking_sdk/src/instruction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ pub enum RestakingInstruction {
#[account(6, signer, name = "admin")]
#[account(7, writable, signer, name = "payer")]
#[account(8, name = "system_program")]
InitializeNcnVaultSlasherTicket(u64),
InitializeNcnVaultSlasherTicket { max_slashable_per_epoch: u64 },

/// NCN adds support for receiving delegation from a vault
#[account(0, name = "config")]
Expand Down
11 changes: 6 additions & 5 deletions restaking_sdk/src/sdk.rs
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,7 @@ pub fn initialize_ncn_vault_slasher_ticket(
ncn_vault_slasher_ticket: &Pubkey,
admin: &Pubkey,
payer: &Pubkey,

max_slash_amount: u64,
max_slashable_per_epoch: u64,
) -> Instruction {
let accounts = vec![
AccountMeta::new_readonly(*config, false),
Expand All @@ -178,9 +177,11 @@ pub fn initialize_ncn_vault_slasher_ticket(
Instruction {
program_id: *program_id,
accounts,
data: RestakingInstruction::InitializeNcnVaultSlasherTicket(max_slash_amount)
.try_to_vec()
.unwrap(),
data: RestakingInstruction::InitializeNcnVaultSlasherTicket {
max_slashable_per_epoch,
}
.try_to_vec()
.unwrap(),
}
}

Expand Down
Loading