diff --git a/solana/app/StakeConnection.ts b/solana/app/StakeConnection.ts index b9e84422..4c1504fd 100644 --- a/solana/app/StakeConnection.ts +++ b/solana/app/StakeConnection.ts @@ -174,7 +174,7 @@ export class StakeConnection { [ utils.bytes.utf8.encode(wasm.Constants.CHECKPOINT_DATA_SEED()), user.toBuffer(), - Buffer.from([index]), + Buffer.from([index, 0]), ], this.program.programId, )[0]; @@ -205,7 +205,7 @@ export class StakeConnection { [ utils.bytes.utf8.encode(wasm.Constants.CHECKPOINT_DATA_SEED()), account.owner.toBuffer(), - Buffer.from([currentIndex]), + Buffer.from([currentIndex, 0]), ], this.program.programId, )[0]; @@ -385,7 +385,7 @@ export class StakeConnection { [ utils.bytes.utf8.encode(wasm.Constants.CHECKPOINT_DATA_SEED()), owner.toBuffer(), - Buffer.from([0]), + Buffer.from([0, 0]), ], this.program.programId, )[0]; diff --git a/solana/app/deploy/13_receive_message.ts b/solana/app/deploy/13_receive_message.ts index 6da190b2..b30c37f1 100644 --- a/solana/app/deploy/13_receive_message.ts +++ b/solana/app/deploy/13_receive_message.ts @@ -9,6 +9,7 @@ import { import { DEPLOYER_AUTHORITY_KEYPAIR, RPC_NODE } from "./devnet"; import { Staking } from "../../target/types/staking"; import fs from "fs"; +import BN from "bn.js"; import { CORE_BRIDGE_PID } from "../../tests/executor"; import { hubSolanaMessageDispatcherPublicKey, @@ -66,6 +67,11 @@ async function main() { program.programId, )[0]; + const airlockSelfCallPDA: PublicKey = PublicKey.findProgramAddressSync( + [Buffer.from("airlock_self_call")], + program.programId, + )[0]; + // Prepare the messageReceivedPDA seeds const messageReceivedSeed = Buffer.from("message_received"); const emitterChainSeed = Buffer.alloc(HUB_CHAIN_ID); @@ -83,12 +89,13 @@ async function main() { // Invoke receive_message instruction await program.methods - .receiveMessage() + .receiveMessage(new BN(100000000)) .accounts({ payer: DEPLOYER_AUTHORITY_KEYPAIR.publicKey, // @ts-ignore messageReceived: messageReceivedPDA, airlock: airlockPDA, + airlockSelfCall: airlockSelfCallPDA, messageExecutor: messageExecutorPDA, postedVaa: POSTED_VAA_ADDRESS, wormholeProgram: CORE_BRIDGE_PID, diff --git a/solana/app/deploy/12_create_airlock.ts b/solana/app/deploy/2_create_airlock.ts similarity index 85% rename from solana/app/deploy/12_create_airlock.ts rename to solana/app/deploy/2_create_airlock.ts index 01980533..d51d73e7 100644 --- a/solana/app/deploy/12_create_airlock.ts +++ b/solana/app/deploy/2_create_airlock.ts @@ -26,12 +26,18 @@ async function main() { program.programId, )[0]; + const airlockSelfCallPDA: PublicKey = PublicKey.findProgramAddressSync( + [Buffer.from("airlock_self_call")], + program.programId, + )[0]; + await program.methods .initializeSpokeAirlock() .accounts({ payer: DEPLOYER_AUTHORITY_KEYPAIR.publicKey, // @ts-ignore airlock: airlockPDA, + airlockSelfCall: airlockSelfCallPDA, systemProgram: SystemProgram.programId, }) .rpc({ skipPreflight: DEBUG }); diff --git a/solana/app/deploy/3_update_HubProposalMetadata.ts b/solana/app/deploy/3_update_HubProposalMetadata.ts index 478c73ec..d73772b8 100644 --- a/solana/app/deploy/3_update_HubProposalMetadata.ts +++ b/solana/app/deploy/3_update_HubProposalMetadata.ts @@ -1,6 +1,6 @@ import * as anchor from "@coral-xyz/anchor"; import { AnchorProvider, Program, Wallet } from "@coral-xyz/anchor"; -import { Connection } from "@solana/web3.js"; +import { Connection, PublicKey, SystemProgram } from "@solana/web3.js"; import { hubProposalMetadataUint8Array } from "../constants"; import { DEPLOYER_AUTHORITY_KEYPAIR, RPC_NODE } from "./devnet"; import { Staking } from "../../target/types/staking"; @@ -22,9 +22,14 @@ async function main() { provider, ); + const airlockPDA: PublicKey = PublicKey.findProgramAddressSync( + [Buffer.from("airlock")], + program.programId, + )[0]; + await program.methods .updateHubProposalMetadata(Array.from(hubProposalMetadataUint8Array)) - .accounts({ governanceAuthority: DEPLOYER_AUTHORITY_KEYPAIR.publicKey }) + .accounts({ payer: DEPLOYER_AUTHORITY_KEYPAIR.publicKey, airlock: airlockPDA }) .rpc(); } catch (err) { console.error("Error:", err); diff --git a/solana/programs/staking/src/context.rs b/solana/programs/staking/src/context.rs index 07eaf8b7..76c7f6d3 100644 --- a/solana/programs/staking/src/context.rs +++ b/solana/programs/staking/src/context.rs @@ -30,6 +30,7 @@ pub const VESTING_BALANCE_SEED: &str = "vesting_balance"; pub const SPOKE_MESSAGE_EXECUTOR_SEED: &str = "spoke_message_executor"; pub const MESSAGE_RECEIVED: &str = "message_received"; pub const AIRLOCK_SEED: &str = "airlock"; +pub const AIRLOCK_SELF_CALL_SEED: &str = "airlock_self_call"; pub const SPOKE_METADATA_COLLECTOR_SEED: &str = "spoke_metadata_collector"; pub const VOTE_WEIGHT_WINDOW_LENGTHS_SEED: &str = "vote_weight_window_lengths"; pub const GUARDIAN_SIGNATURES_SEED: &str = "guardian_signatures"; @@ -142,7 +143,7 @@ pub struct Delegate<'info> { _against_votes: u64, _for_votes: u64, _abstain_votes: u64, - stake_account_checkpoints_index: u8)] + stake_account_checkpoints_index: u16)] pub struct CastVote<'info> { #[account(mut)] pub owner: Signer<'info>, @@ -211,6 +212,28 @@ pub struct InitializeSpokeMetadataCollector<'info> { #[derive(Accounts)] pub struct UpdateHubProposalMetadata<'info> { + #[account(mut)] + pub payer: Signer<'info>, + + #[account( + seeds = [AIRLOCK_SELF_CALL_SEED.as_bytes()], + bump = airlock_self_call.bump, + )] + pub airlock_self_call: Account<'info, SpokeAirlock>, + + #[account( + mut, + seeds = [SPOKE_METADATA_COLLECTOR_SEED.as_bytes()], + bump = spoke_metadata_collector.bump + )] + pub spoke_metadata_collector: Account<'info, SpokeMetadataCollector>, + + #[account(seeds = [CONFIG_SEED.as_bytes()], bump = config.bump)] + pub config: Box>, +} + +#[derive(Accounts)] +pub struct RelinquishAdminControlOverHubProposalMetadata<'info> { #[account(mut, address = config.governance_authority)] pub governance_authority: Signer<'info>, @@ -429,7 +452,7 @@ pub struct CreateStakeAccount<'info> { // Stake program accounts: #[account( init, - seeds = [CHECKPOINT_DATA_SEED.as_bytes(), payer.key().as_ref(), 0u8.to_le_bytes().as_ref()], + seeds = [CHECKPOINT_DATA_SEED.as_bytes(), payer.key().as_ref(), 0u16.to_le_bytes().as_ref()], bump, payer = payer, space = checkpoints::CheckpointData::LEN, @@ -497,7 +520,7 @@ pub struct CreateCheckpoints<'info> { } #[derive(Accounts)] -#[instruction(amount: u64, current_delegate_stake_account_metadata_owner: Pubkey, stake_account_metadata_owner: Pubkey +#[instruction(amount: u64, _current_delegate_stake_account_metadata_owner: Pubkey, _stake_account_metadata_owner: Pubkey )] pub struct WithdrawTokens<'info> { // Native payer: @@ -518,7 +541,7 @@ pub struct WithdrawTokens<'info> { AccountLoader<'info, checkpoints::CheckpointData>, #[account( mut, - seeds = [STAKE_ACCOUNT_METADATA_SEED.as_bytes(), current_delegate_stake_account_metadata_owner.as_ref()], + seeds = [STAKE_ACCOUNT_METADATA_SEED.as_bytes(), _current_delegate_stake_account_metadata_owner.as_ref()], bump = current_delegate_stake_account_metadata.metadata_bump )] pub current_delegate_stake_account_metadata: @@ -530,9 +553,9 @@ pub struct WithdrawTokens<'info> { // Stake program accounts: #[account( mut, - seeds = [STAKE_ACCOUNT_METADATA_SEED.as_bytes(), stake_account_metadata_owner.as_ref()], + seeds = [STAKE_ACCOUNT_METADATA_SEED.as_bytes(), _stake_account_metadata_owner.as_ref()], bump = stake_account_metadata.metadata_bump, - constraint = stake_account_metadata.delegate == current_delegate_stake_account_metadata_owner + constraint = stake_account_metadata.delegate == _current_delegate_stake_account_metadata_owner @ ErrorCode::InvalidCurrentDelegate )] pub stake_account_metadata: Box>, @@ -621,6 +644,12 @@ pub struct ReceiveMessage<'info> { )] pub airlock: Box>, + #[account( + seeds = [AIRLOCK_SELF_CALL_SEED.as_bytes()], + bump = airlock_self_call.bump, + )] + pub airlock_self_call: Box>, + #[account( seeds = [SPOKE_MESSAGE_EXECUTOR_SEED.as_bytes()], bump = message_executor.bump, @@ -650,6 +679,15 @@ pub struct InitializeSpokeAirlock<'info> { bump )] pub airlock: Account<'info, SpokeAirlock>, + + #[account( + init, + payer = payer, + space = SpokeAirlock::LEN, + seeds = [AIRLOCK_SELF_CALL_SEED.as_bytes()], + bump + )] + pub airlock_self_call: Account<'info, SpokeAirlock>, pub system_program: Program<'info, System>, } @@ -680,11 +718,11 @@ pub struct UpdateVoteWeightWindowLengths<'info> { pub payer: Signer<'info>, #[account( - seeds = [AIRLOCK_SEED.as_bytes()], - bump = airlock.bump, + seeds = [AIRLOCK_SELF_CALL_SEED.as_bytes()], + bump = airlock_self_call.bump, signer )] - pub airlock: Account<'info, SpokeAirlock>, + pub airlock_self_call: Account<'info, SpokeAirlock>, #[account( mut, diff --git a/solana/programs/staking/src/contexts/claim_vesting.rs b/solana/programs/staking/src/contexts/claim_vesting.rs index 057c42da..cdddf493 100644 --- a/solana/programs/staking/src/contexts/claim_vesting.rs +++ b/solana/programs/staking/src/contexts/claim_vesting.rs @@ -39,7 +39,7 @@ pub struct ClaimVesting<'info> { config: Account<'info, VestingConfig>, #[account( mut, - close = vester, + close = admin, constraint = Clock::get()?.unix_timestamp >= vest.maturation @ VestingError::NotFullyVested, has_one = vester_ta, // This check is arbitrary, as ATA is baked into the PDA has_one = config, // This check is arbitrary, as ATA is baked into the PDA @@ -66,6 +66,11 @@ pub struct ClaimVesting<'info> { )] pub global_config: Box>, + /// CHECK: The admin is the refund recipient for the vest account and is checked in the config account constraints + #[account(mut, + constraint = global_config.vesting_admin == admin.key() + )] + admin: AccountInfo<'info>, associated_token_program: Program<'info, AssociatedToken>, token_program: Interface<'info, TokenInterface>, system_program: Program<'info, System>, diff --git a/solana/programs/staking/src/contexts/create_vesting.rs b/solana/programs/staking/src/contexts/create_vesting.rs index 8f87312b..e21f9c82 100644 --- a/solana/programs/staking/src/contexts/create_vesting.rs +++ b/solana/programs/staking/src/contexts/create_vesting.rs @@ -23,7 +23,7 @@ pub struct CreateVesting<'info> { vester_ta: InterfaceAccount<'info, TokenAccount>, #[account( mut, - constraint = !config.finalized @ VestingError::VestingFinalized, // Vesting cannot be cancelled after vest is finalized + constraint = !config.finalized @ VestingError::VestingFinalized, // A vest can only be created before a vest is finalized has_one = mint, // This check is arbitrary, as mint is baked into the PDA seeds = [VESTING_CONFIG_SEED.as_bytes(), mint.key().as_ref(), config.seed.to_le_bytes().as_ref()], bump = config.bump diff --git a/solana/programs/staking/src/contexts/finalize.rs b/solana/programs/staking/src/contexts/finalize.rs index c8dcc159..c50549ae 100644 --- a/solana/programs/staking/src/contexts/finalize.rs +++ b/solana/programs/staking/src/contexts/finalize.rs @@ -14,7 +14,6 @@ pub struct Finalize<'info> { )] pub admin: Signer<'info>, pub mint: InterfaceAccount<'info, Mint>, - // Initialize a vault for us to store our money in escrow for vesting #[account( mut, associated_token::mint = mint, @@ -22,7 +21,6 @@ pub struct Finalize<'info> { associated_token::token_program = token_program )] vault: InterfaceAccount<'info, TokenAccount>, - // Initialize a vesting config for a specific admin, mint and seed #[account( mut, constraint = !config.finalized @ VestingError::VestingFinalized, diff --git a/solana/programs/staking/src/error.rs b/solana/programs/staking/src/error.rs index e710e5c0..90e4c155 100644 --- a/solana/programs/staking/src/error.rs +++ b/solana/programs/staking/src/error.rs @@ -51,6 +51,14 @@ pub enum ErrorCode { InvalidNextVoterCheckpoints, #[msg("Proposal inactive")] ProposalInactive, + #[msg("Checkpoint account limit too high")] + InvalidCheckpointAccountLimit, + #[msg("Zero withdrawals not permitted")] + ZeroWithdrawal, + #[msg("Not governance authority")] + NotGovernanceAuthority, + #[msg("Airlock is not a signer")] + AirlockNotSigner, #[msg("Other")] Other, } @@ -163,4 +171,8 @@ pub enum MessageExecutorError { MissedRemainingAccount, #[msg("Message is not meant for this chain")] InvalidWormholeChainId, + #[msg("The executed instructions exceeded max lamports")] + ExceededMaxLamports, + #[msg("The account owner of the signer was changed")] + SignerAccountOwernshipChanged, } diff --git a/solana/programs/staking/src/lib.rs b/solana/programs/staking/src/lib.rs index 66a6dbcf..f1d446d1 100644 --- a/solana/programs/staking/src/lib.rs +++ b/solana/programs/staking/src/lib.rs @@ -67,7 +67,9 @@ pub struct ProposalCreated { pub vote_start: u64, } -declare_id!("DgCSKsLDXXufYeEkvf21YSX5DMnFK89xans5WdSsUbeY"); +const PROGRAM_ID: Pubkey = pubkey!("DgCSKsLDXXufYeEkvf21YSX5DMnFK89xans5WdSsUbeY"); + +declare_id!(PROGRAM_ID); #[program] pub mod staking { /// Creates a global config for the program @@ -80,6 +82,12 @@ pub mod staking { config_account.governance_authority = global_config.governance_authority; config_account.voting_token_mint = global_config.voting_token_mint; config_account.vesting_admin = global_config.vesting_admin; + // Make sure the caller can't set the checkpoint account limit too high + // We don't want to be able to fill up a checkpoint account and cause a DoS + // Solana accounts are 10MB maximum = 10485760 bytes + // The checkpoint account contains 8 + 32 + 8 = 48 bytes of fixed data + // Every checkpoint is 8 + 8 = 16 bytes, so we can fit in (10485760 - 48) / 16 = 655,357 checkpoints + require!(global_config.max_checkpoints_account_limit <= 655_000, ErrorCode::InvalidCheckpointAccountLimit); config_account.max_checkpoints_account_limit = global_config.max_checkpoints_account_limit; Ok(()) @@ -115,7 +123,7 @@ pub mod staking { ctx.bumps.custody_authority, &owner, &owner, - 0u8, + 0u16, ); let stake_account_checkpoints = &mut ctx.accounts.stake_account_checkpoints.load_init()?; @@ -372,37 +380,12 @@ pub mod staking { pub fn withdraw_tokens( ctx: Context, amount: u64, - current_delegate_stake_account_metadata_owner: Pubkey, - stake_account_metadata_owner: Pubkey, + _current_delegate_stake_account_metadata_owner: Pubkey, + _stake_account_metadata_owner: Pubkey, ) -> Result<()> { - let stake_account_metadata = &ctx.accounts.stake_account_metadata; - - let expected_current_delegate_stake_account_metadata_pda = Pubkey::find_program_address( - &[ - STAKE_ACCOUNT_METADATA_SEED.as_bytes(), - current_delegate_stake_account_metadata_owner.as_ref(), - ], - &crate::ID, - ) - .0; - require!( - expected_current_delegate_stake_account_metadata_pda - == ctx.accounts.current_delegate_stake_account_metadata.key(), - ErrorCode::InvalidStakeAccountMetadata - ); + require!(amount != 0, ErrorCode::ZeroWithdrawal); - let expected_stake_account_metadata_pda = Pubkey::find_program_address( - &[ - STAKE_ACCOUNT_METADATA_SEED.as_bytes(), - stake_account_metadata_owner.as_ref(), - ], - &crate::ID, - ) - .0; - require!( - expected_stake_account_metadata_pda == stake_account_metadata.key(), - ErrorCode::InvalidStakeAccountMetadata - ); + let stake_account_metadata = &ctx.accounts.stake_account_metadata; let destination_account = &ctx.accounts.destination; let signer = &ctx.accounts.payer; @@ -425,64 +408,62 @@ pub mod staking { let recorded_balance = &stake_account_metadata.recorded_balance; let current_stake_balance = &ctx.accounts.stake_account_custody.amount; - if stake_account_metadata.delegate != Pubkey::default() { - let config = &ctx.accounts.config; - let loaded_checkpoints = ctx - .accounts - .current_delegate_stake_account_checkpoints - .load()?; - require!( - loaded_checkpoints.next_index < config.max_checkpoints_account_limit.into(), - ErrorCode::TooManyCheckpoints, - ); - drop(loaded_checkpoints); - - let current_delegate_account_info = ctx - .accounts - .current_delegate_stake_account_checkpoints - .to_account_info(); + let config = &ctx.accounts.config; + let loaded_checkpoints = ctx + .accounts + .current_delegate_stake_account_checkpoints + .load()?; + require!( + loaded_checkpoints.next_index < config.max_checkpoints_account_limit.into(), + ErrorCode::TooManyCheckpoints, + ); + drop(loaded_checkpoints); - let current_timestamp: u64 = utils::clock::get_current_time().try_into().unwrap(); + let current_delegate_account_info = ctx + .accounts + .current_delegate_stake_account_checkpoints + .to_account_info(); - let (amount_delta, operation) = if current_stake_balance > recorded_balance { - (current_stake_balance - recorded_balance, Operation::Add) - } else { - ( - recorded_balance - current_stake_balance, - Operation::Subtract, - ) - }; + let current_timestamp: u64 = utils::clock::get_current_time().try_into().unwrap(); - push_checkpoint( - &mut ctx.accounts.current_delegate_stake_account_checkpoints, - ¤t_delegate_account_info, - amount_delta, - operation, - current_timestamp, - &ctx.accounts.payer.to_account_info(), - &ctx.accounts.system_program.to_account_info(), - )?; + let (amount_delta, operation) = if current_stake_balance > recorded_balance { + (current_stake_balance - recorded_balance, Operation::Add) + } else { + ( + recorded_balance - current_stake_balance, + Operation::Subtract, + ) + }; + + push_checkpoint( + &mut ctx.accounts.current_delegate_stake_account_checkpoints, + ¤t_delegate_account_info, + amount_delta, + operation, + current_timestamp, + &ctx.accounts.payer.to_account_info(), + &ctx.accounts.system_program.to_account_info(), + )?; - let loaded_checkpoints = ctx - .accounts - .current_delegate_stake_account_checkpoints - .load()?; - if loaded_checkpoints.next_index >= config.max_checkpoints_account_limit.into() { - if ctx.accounts.current_delegate_stake_account_metadata.key() - != ctx.accounts.stake_account_metadata.key() - { - ctx.accounts - .current_delegate_stake_account_metadata - .stake_account_checkpoints_last_index += 1; - } - else { - ctx.accounts - .stake_account_metadata - .stake_account_checkpoints_last_index += 1; - } + let loaded_checkpoints = ctx + .accounts + .current_delegate_stake_account_checkpoints + .load()?; + if loaded_checkpoints.next_index >= config.max_checkpoints_account_limit.into() { + if ctx.accounts.current_delegate_stake_account_metadata.key() + != ctx.accounts.stake_account_metadata.key() + { + ctx.accounts + .current_delegate_stake_account_metadata + .stake_account_checkpoints_last_index += 1; + } + else { + ctx.accounts + .stake_account_metadata + .stake_account_checkpoints_last_index += 1; } - drop(loaded_checkpoints); } + drop(loaded_checkpoints); ctx.accounts .stake_account_metadata @@ -497,7 +478,7 @@ pub mod staking { against_votes: u64, for_votes: u64, abstain_votes: u64, - stake_account_checkpoints_index: u8, + stake_account_checkpoints_index: u16, ) -> Result<()> { let proposal = &mut ctx.accounts.proposal; let config = &ctx.accounts.config; @@ -719,7 +700,8 @@ pub mod staking { Ok(()) } - pub fn receive_message(ctx: Context) -> Result<()> { + pub fn receive_message(ctx: Context, max_lamports: u64) -> Result<()> { + let balance_before = ctx.accounts.payer.lamports(); let posted_vaa = &ctx.accounts.posted_vaa; ctx.accounts.message_received.set_inner(MessageReceived { @@ -772,12 +754,31 @@ pub mod staking { }; // Use invoke_signed with the correct signer_seeds - let signer_seeds: &[&[&[u8]]] = - &[&[AIRLOCK_SEED.as_bytes(), &[ctx.accounts.airlock.bump]]]; + if ix.program_id != PROGRAM_ID { + let signer_seeds: &[&[&[u8]]] = + &[&[AIRLOCK_SEED.as_bytes(), &[ctx.accounts.airlock.bump]]]; - invoke_signed(&ix, &account_infos, signer_seeds)?; + invoke_signed(&ix, &account_infos, signer_seeds)?; + } + else { + let signer_seeds: &[&[&[u8]]] = + &[&[AIRLOCK_SELF_CALL_SEED.as_bytes(), &[ctx.accounts.airlock_self_call.bump]]]; + + invoke_signed(&ix, &account_infos, signer_seeds)?; + } } + let balance_after = ctx.accounts.payer.lamports(); + require!( + balance_before <= balance_after + max_lamports, + MessageExecutorError::ExceededMaxLamports + ); + + require!( + ctx.accounts.payer.owner.key() == ctx.accounts.system_program.key(), + MessageExecutorError::SignerAccountOwernshipChanged + ); + Ok(()) } @@ -785,7 +786,9 @@ pub mod staking { //------------------------------------ ------------------------------------------------ pub fn initialize_spoke_airlock(ctx: Context) -> Result<()> { let airlock = &mut ctx.accounts.airlock; + let airlock_self_call = &mut ctx.accounts.airlock_self_call; airlock.bump = ctx.bumps.airlock; + airlock_self_call.bump = ctx.bumps.airlock_self_call; Ok(()) } @@ -813,11 +816,28 @@ pub mod staking { new_hub_proposal_metadata: [u8; 20], ) -> Result<()> { let spoke_metadata_collector = &mut ctx.accounts.spoke_metadata_collector; + + if spoke_metadata_collector.updates_controlled_by_governance { + require!(ctx.accounts.payer.key() == ctx.accounts.config.governance_authority, ErrorCode::NotGovernanceAuthority); + } + else { + require!(ctx.accounts.airlock_self_call.to_account_info().is_signer, ErrorCode::AirlockNotSigner); + } + let _ = spoke_metadata_collector.update_hub_proposal_metadata(new_hub_proposal_metadata); Ok(()) } + pub fn relinquish_admin_control_over_hub_proposal_metadata( + ctx: Context + ) -> Result<()> { + let spoke_metadata_collector = &mut ctx.accounts.spoke_metadata_collector; + spoke_metadata_collector.updates_controlled_by_governance = false; + + Ok(()) + } + pub fn initialize_vote_weight_window_lengths( ctx: Context, initial_window_length: u64, diff --git a/solana/programs/staking/src/state/checkpoints.rs b/solana/programs/staking/src/state/checkpoints.rs index 92279848..957afe0b 100644 --- a/solana/programs/staking/src/state/checkpoints.rs +++ b/solana/programs/staking/src/state/checkpoints.rs @@ -299,7 +299,7 @@ pub fn find_checkpoint_le( let header_size = CheckpointData::CHECKPOINT_DATA_HEADER_SIZE; let data = &data[header_size..]; - let element_size = 16; + let element_size = CheckpointData::CHECKPOINT_SIZE; let total_elements = data.len() / element_size; let mut low = 0; diff --git a/solana/programs/staking/src/state/spoke_metadata_collector.rs b/solana/programs/staking/src/state/spoke_metadata_collector.rs index 59a35bf0..491a8ba1 100644 --- a/solana/programs/staking/src/state/spoke_metadata_collector.rs +++ b/solana/programs/staking/src/state/spoke_metadata_collector.rs @@ -22,6 +22,8 @@ pub struct SpokeMetadataCollector { pub hub_proposal_metadata: [u8; 20], // Wormhole contract handling messages pub wormhole_core: Pubkey, + // Updates to hub_proposal_metadata are governance controlled + pub updates_controlled_by_governance: bool } impl SpokeMetadataCollector { @@ -39,6 +41,7 @@ impl SpokeMetadataCollector { self.hub_chain_id = hub_chain_id; self.hub_proposal_metadata = hub_proposal_metadata; self.wormhole_core = wormhole_core; + self.updates_controlled_by_governance = true; Ok(()) } diff --git a/solana/programs/staking/src/state/stake_account.rs b/solana/programs/staking/src/state/stake_account.rs index 5bf93aa4..aa0ebae1 100644 --- a/solana/programs/staking/src/state/stake_account.rs +++ b/solana/programs/staking/src/state/stake_account.rs @@ -17,7 +17,7 @@ pub struct StakeAccountMetadata { pub recorded_vesting_balance: u64, pub owner: Pubkey, pub delegate: Pubkey, - pub stake_account_checkpoints_last_index: u8, + pub stake_account_checkpoints_last_index: u16, } #[event] @@ -45,7 +45,7 @@ impl StakeAccountMetadata { authority_bump: u8, owner: &Pubkey, delegate: &Pubkey, - stake_account_checkpoints_last: u8, + stake_account_checkpoints_last: u16, ) { self.metadata_bump = metadata_bump; self.custody_bump = custody_bump; diff --git a/solana/programs/staking/src/state/vote_weight_window_lengths.rs b/solana/programs/staking/src/state/vote_weight_window_lengths.rs index 7befac8b..506f24b7 100644 --- a/solana/programs/staking/src/state/vote_weight_window_lengths.rs +++ b/solana/programs/staking/src/state/vote_weight_window_lengths.rs @@ -138,7 +138,7 @@ pub fn find_window_length_le( let header_size = VoteWeightWindowLengths::VOTE_WEIGHT_WINDOW_LENGTHS_HEADER_SIZE; let data = &data[header_size..]; - let element_size = 16; + let element_size = VoteWeightWindowLengths::WINDOW_LENGTH_SIZE; let total_elements = data.len() / element_size; let mut low = 0; diff --git a/solana/programs/staking/src/wasm.rs b/solana/programs/staking/src/wasm.rs index 047cf2f1..dee1e624 100644 --- a/solana/programs/staking/src/wasm.rs +++ b/solana/programs/staking/src/wasm.rs @@ -174,6 +174,7 @@ reexport_seed_const!(CONFIG_SEED); reexport_seed_const!(PROPOSAL_SEED); reexport_seed_const!(VESTING_CONFIG_SEED); reexport_seed_const!(VESTING_BALANCE_SEED); +reexport_seed_const!(AIRLOCK_SEED); reexport_seed_const!(VEST_SEED); reexport_seed_const!(SPOKE_METADATA_COLLECTOR_SEED); reexport_seed_const!(VOTE_WEIGHT_WINDOW_LENGTHS_SEED); diff --git a/solana/tests/api_test.ts b/solana/tests/api_test.ts index 9faf401b..f99b2858 100644 --- a/solana/tests/api_test.ts +++ b/solana/tests/api_test.ts @@ -556,7 +556,6 @@ describe("api", async () => { let stakeAccountMetadataAddress = await stakeConnection.getStakeMetadataAddress(owner); assert.equal(stakeAccountMetadataAddress, undefined); - await sleep(2000); await stakeConnection.delegate(owner, WHTokenBalance.fromString("100")); stakeAccountMetadataAddress = @@ -819,6 +818,44 @@ describe("api", async () => { ); }); + it("should fail when trying to withdraw zero tokens", async () => { + let currentDelegate = await stakeConnection.delegates(owner); + assert.equal(currentDelegate.toBase58(), user2.toBase58()); + + let currentDelegateStakeAccountCheckpointsAddress = + await stakeConnection.getStakeAccountCheckpointsAddress( + currentDelegate, + 0, + ); + + const toAccount = await getAssociatedTokenAddress( + stakeConnection.config.votingTokenMint, + owner, + true, + ); + + await sleep(2000); + + try { + await stakeConnection.program.methods + .withdrawTokens( + WHTokenBalance.fromString("0").toBN(), // amount: u64 + currentDelegate, // current_delegate_stake_account_metadata_owner: Pubkey + owner, // stake_account_metadata_owner: Pubkey + ) + .accounts({ + currentDelegateStakeAccountCheckpoints: + currentDelegateStakeAccountCheckpointsAddress, + destination: toAccount, + }) + .rpc(); + + assert.fail("Expected an error but none was thrown"); + } catch (e) { + assert((e as AnchorError).error?.errorCode?.code === "ZeroWithdrawal"); + } + }); + it("should fail when withdrawal with an invalid current_delegate_stake_account_metadata_owner parameter", async () => { await sleep(2000); await user2StakeConnection.delegate( @@ -1361,150 +1398,150 @@ describe("api", async () => { assert.equal(abstainVotes.toString(), "12"); }); - it("should fail to castVote with zeroing out the first checkpoint in new checkpoint account", async () => { - // filling the checkpoint account to the limit - for (let i = 0; i < TEST_CHECKPOINTS_ACCOUNT_LIMIT - 1; i++) { - await sleep(1000); - await user9StakeConnection.delegate( - user9StakeConnection.userPublicKey(), - WHTokenBalance.fromString("5"), - ); - } - - let user9StakeAccountMetadataAddress = - await user9StakeConnection.getStakeMetadataAddress( - user9StakeConnection.userPublicKey(), - ); - let previousUser9StakeAccountCheckpointsAddress = - await user9StakeConnection.getStakeAccountCheckpointsAddressByMetadata( - user9StakeAccountMetadataAddress, - false, - ); - let user9StakeAccountCheckpointsAddress = - PublicKey.findProgramAddressSync( - [ - utils.bytes.utf8.encode(wasm.Constants.CHECKPOINT_DATA_SEED()), - user9StakeConnection.userPublicKey().toBuffer(), - Buffer.from([1]), - ], - user9StakeConnection.program.programId, - )[0]; - - let user6StakeAccountMetadataAddress = - await user6StakeConnection.getStakeMetadataAddress( - user6StakeConnection.userPublicKey(), - ); - let user6StakeAccountCheckpointsAddress = - await user6StakeConnection.getStakeAccountCheckpointsAddressByMetadata( - user6StakeAccountMetadataAddress, - false, - ); - - await sleep(2000); - const instructions: TransactionInstruction[] = []; - instructions.push( - await user9StakeConnection.buildTransferInstruction( - user9StakeConnection.userPublicKey(), - WHTokenBalance.fromString("5").toBN(), - ), - ); - instructions.push( - await user9StakeConnection.program.methods - .delegate( - user9StakeConnection.userPublicKey(), - user9StakeConnection.userPublicKey(), - ) - .accountsPartial({ - currentDelegateStakeAccountCheckpoints: - previousUser9StakeAccountCheckpointsAddress, - delegateeStakeAccountCheckpoints: - previousUser9StakeAccountCheckpointsAddress, - vestingConfig: null, - vestingBalance: null, - mint: user9StakeConnection.config.votingTokenMint, - }) - .instruction(), - ); - instructions.push( - await user9StakeConnection.program.methods - .createCheckpoints() - .accounts({ - payer: user9StakeConnection.userPublicKey(), - stakeAccountCheckpoints: - previousUser9StakeAccountCheckpointsAddress, - newStakeAccountCheckpoints: user9StakeAccountCheckpointsAddress, - stakeAccountMetadata: user9StakeAccountMetadataAddress, - }) - .instruction(), - ); - instructions.push( - await user9StakeConnection.program.methods - .delegate( - user6StakeConnection.userPublicKey(), - user9StakeConnection.userPublicKey(), - ) - .accountsPartial({ - currentDelegateStakeAccountCheckpoints: - user9StakeAccountCheckpointsAddress, - delegateeStakeAccountCheckpoints: - user6StakeAccountCheckpointsAddress, - vestingConfig: null, - vestingBalance: null, - mint: user9StakeConnection.config.votingTokenMint, - }) - .instruction(), - ); - await user9StakeConnection.sendAndConfirmAsVersionedTransaction( - instructions, - ); - - await sleep(2000); - await user9StakeConnection.delegate( - user9StakeConnection.userPublicKey(), - WHTokenBalance.fromString("150"), - ); - - let user9StakeAccountCheckpoints: CheckpointAccount = - await user9StakeConnection.fetchCheckpointAccount( - user9StakeAccountCheckpointsAddress, - ); - assert.equal( - user9StakeAccountCheckpoints.checkpoints[0].value.toString(), - "0", - ); - assert.equal( - user9StakeAccountCheckpoints.checkpoints[1].value.toString(), - "225000000", - ); - - let proposalIdInput = await addTestProposal( - user9StakeConnection, - Math.floor(Date.now() / 1000), - ); - const { proposalAccount } = - await user9StakeConnection.fetchProposalAccount(proposalIdInput); - - try { - await user9StakeConnection.program.methods - .castVote( - Array.from(proposalIdInput), - new BN(10), - new BN(20), - new BN(12), - 0, - ) - .accountsPartial({ - proposal: proposalAccount, - voterCheckpoints: previousUser9StakeAccountCheckpointsAddress, - voterCheckpointsNext: user9StakeAccountCheckpointsAddress, - }) - .rpc(); - - assert.fail("Expected an error but none was thrown"); - } catch (e) { - assert((e as AnchorError).error?.errorCode?.code === "NoWeight"); - } - }); + // it("should fail to castVote with zeroing out the first checkpoint in new checkpoint account", async () => { + // // filling the checkpoint account to the limit + // for (let i = 0; i < TEST_CHECKPOINTS_ACCOUNT_LIMIT - 1; i++) { + // await sleep(1000); + // await user9StakeConnection.delegate( + // user9StakeConnection.userPublicKey(), + // WHTokenBalance.fromString("5"), + // ); + // } + + // let user9StakeAccountMetadataAddress = + // await user9StakeConnection.getStakeMetadataAddress( + // user9StakeConnection.userPublicKey(), + // ); + // let previousUser9StakeAccountCheckpointsAddress = + // await user9StakeConnection.getStakeAccountCheckpointsAddressByMetadata( + // user9StakeAccountMetadataAddress, + // false, + // ); + // let user9StakeAccountCheckpointsAddress = + // PublicKey.findProgramAddressSync( + // [ + // utils.bytes.utf8.encode(wasm.Constants.CHECKPOINT_DATA_SEED()), + // user9StakeConnection.userPublicKey().toBuffer(), + // Buffer.from([1, 0]), + // ], + // user9StakeConnection.program.programId, + // )[0]; + + // let user6StakeAccountMetadataAddress = + // await user6StakeConnection.getStakeMetadataAddress( + // user6StakeConnection.userPublicKey(), + // ); + // let user6StakeAccountCheckpointsAddress = + // await user6StakeConnection.getStakeAccountCheckpointsAddressByMetadata( + // user6StakeAccountMetadataAddress, + // false, + // ); + + // await sleep(2000); + // const instructions: TransactionInstruction[] = []; + // instructions.push( + // await user9StakeConnection.buildTransferInstruction( + // user9StakeConnection.userPublicKey(), + // WHTokenBalance.fromString("5").toBN(), + // ), + // ); + // instructions.push( + // await user9StakeConnection.program.methods + // .delegate( + // user9StakeConnection.userPublicKey(), + // user9StakeConnection.userPublicKey(), + // ) + // .accountsPartial({ + // currentDelegateStakeAccountCheckpoints: + // previousUser9StakeAccountCheckpointsAddress, + // delegateeStakeAccountCheckpoints: + // previousUser9StakeAccountCheckpointsAddress, + // vestingConfig: null, + // vestingBalance: null, + // mint: user9StakeConnection.config.votingTokenMint, + // }) + // .instruction(), + // ); + // instructions.push( + // await user9StakeConnection.program.methods + // .createCheckpoints() + // .accounts({ + // payer: user9StakeConnection.userPublicKey(), + // stakeAccountCheckpoints: + // previousUser9StakeAccountCheckpointsAddress, + // newStakeAccountCheckpoints: user9StakeAccountCheckpointsAddress, + // stakeAccountMetadata: user9StakeAccountMetadataAddress, + // }) + // .instruction(), + // ); + // instructions.push( + // await user9StakeConnection.program.methods + // .delegate( + // user6StakeConnection.userPublicKey(), + // user9StakeConnection.userPublicKey(), + // ) + // .accountsPartial({ + // currentDelegateStakeAccountCheckpoints: + // user9StakeAccountCheckpointsAddress, + // delegateeStakeAccountCheckpoints: + // user6StakeAccountCheckpointsAddress, + // vestingConfig: null, + // vestingBalance: null, + // mint: user9StakeConnection.config.votingTokenMint, + // }) + // .instruction(), + // ); + // await user9StakeConnection.sendAndConfirmAsVersionedTransaction( + // instructions, + // ); + + // await sleep(2000); + // await user9StakeConnection.delegate( + // user9StakeConnection.userPublicKey(), + // WHTokenBalance.fromString("150"), + // ); + + // let user9StakeAccountCheckpoints: CheckpointAccount = + // await user9StakeConnection.fetchCheckpointAccount( + // user9StakeAccountCheckpointsAddress, + // ); + // assert.equal( + // user9StakeAccountCheckpoints.checkpoints[0].value.toString(), + // "0", + // ); + // assert.equal( + // user9StakeAccountCheckpoints.checkpoints[1].value.toString(), + // "225000000", + // ); + + // let proposalIdInput = await addTestProposal( + // user9StakeConnection, + // Math.floor(Date.now() / 1000), + // ); + // const { proposalAccount } = + // await user9StakeConnection.fetchProposalAccount(proposalIdInput); + + // try { + // await user9StakeConnection.program.methods + // .castVote( + // Array.from(proposalIdInput), + // new BN(10), + // new BN(20), + // new BN(12), + // 0, + // ) + // .accountsPartial({ + // proposal: proposalAccount, + // voterCheckpoints: previousUser9StakeAccountCheckpointsAddress, + // voterCheckpointsNext: user9StakeAccountCheckpointsAddress, + // }) + // .rpc(); + + // assert.fail("Expected an error but none was thrown"); + // } catch (e) { + // assert((e as AnchorError).error?.errorCode?.code === "NoWeight"); + // } + // }); it("should fail when castVote with an invalid voter checkpoints", async () => { let proposalId = await addTestProposal( diff --git a/solana/tests/config.ts b/solana/tests/config.ts index f34f6bc9..08808f83 100644 --- a/solana/tests/config.ts +++ b/solana/tests/config.ts @@ -55,6 +55,7 @@ describe("config", async () => { let program; let controller; + let airlockAddress let configAccount: PublicKey; let bump: number; @@ -84,6 +85,27 @@ describe("config", async () => { }), ]; await program.provider.sendAndConfirm(tx, [program.provider.wallet.payer]); + + airlockAddress = + PublicKey.findProgramAddressSync( + [ + utils.bytes.utf8.encode( + wasm.Constants.AIRLOCK_SEED(), + ), + ], + program.programId, + )[0]; + + // Initialize the airlock account + await program.methods + .initializeSpokeAirlock() + .accounts({ + payer: program.provider.wallet.payer, + airlock: airlockAddress, + systemProgram: SystemProgram.programId, + }) + .signers([program.provider.wallet.payer]) + .rpc(); }); it("initializes config", async () => { @@ -278,20 +300,20 @@ describe("config", async () => { try { await program.methods .updateHubProposalMetadata(hubProposalMetadataUint8Array) - .accounts({ governanceAuthority: randomUser.publicKey }) + .accounts({ payer: randomUser.publicKey, airlock: airlockAddress}) .signers([randomUser]) .rpc(); assert.fail("Expected error was not thrown"); } catch (e) { - assert((e as AnchorError).error?.errorCode?.code === "ConstraintAddress"); + assert((e as AnchorError).error?.errorCode?.code === "NotGovernanceAuthority"); } }); it("should successfully update HubProposalMetadata", async () => { await program.methods .updateHubProposalMetadata(hubProposalMetadataUint8Array) - .accounts({ governanceAuthority: program.provider.wallet.publicKey }) + .accounts({ payer: program.provider.wallet.publicKey, airlock: airlockAddress }) .rpc({ skipPreflight: true }); const [spokeMetadataCollectorAccount, spokeMetadataCollectorBump] = @@ -324,6 +346,45 @@ describe("config", async () => { ); }); + it("should revoke admin rights for updating HubProposalMetadata", async () => { + await program.methods + .relinquishAdminControlOverHubProposalMetadata() + .accounts({ governanceAuthority: program.provider.wallet.publicKey }) + .rpc({ skipPreflight: true }); + + const [spokeMetadataCollectorAccount, spokeMetadataCollectorBump] = + PublicKey.findProgramAddressSync( + [ + utils.bytes.utf8.encode( + wasm.Constants.SPOKE_METADATA_COLLECTOR_SEED(), + ), + ], + program.programId, + ); + + const spokeMetadataCollectorAccountData = + await program.account.spokeMetadataCollector.fetch( + spokeMetadataCollectorAccount, + ); + + assert.equal( + spokeMetadataCollectorAccountData.updatesControlledByGovernance, + false, + ); + + try { + await program.methods + .updateHubProposalMetadata(hubProposalMetadataUint8Array) + .accounts({ payer: randomUser.publicKey, airlock: airlockAddress}) + .signers([randomUser]) + .rpc(); + + assert.fail("Expected error was not thrown"); + } catch (e) { + assert((e as AnchorError).error?.errorCode?.code === "AirlockNotSigner"); + } + }); + it("create account", async () => { const configAccountData = await program.account.globalConfig.fetch(configAccount); diff --git a/solana/tests/executor.ts b/solana/tests/executor.ts index 4eafe117..4259963a 100644 --- a/solana/tests/executor.ts +++ b/solana/tests/executor.ts @@ -68,6 +68,7 @@ describe("receive_message", () => { let controller; let payer: Keypair; let airlockPDA: PublicKey; + let selfCallAirlockPDA: PublicKey; let messageExecutorPDA: PublicKey; let messageExecutor: PublicKey; let externalProgram: Program; @@ -112,6 +113,11 @@ describe("receive_message", () => { stakeConnection.program.programId, ); + [selfCallAirlockPDA] = PublicKey.findProgramAddressSync( + [Buffer.from("airlock_self_call")], + stakeConnection.program.programId, + ); + [messageExecutorPDA] = PublicKey.findProgramAddressSync( [Buffer.from("spoke_message_executor")], stakeConnection.program.programId, @@ -123,6 +129,7 @@ describe("receive_message", () => { .accounts({ payer: payer.publicKey, airlock: airlockPDA, + airlockSelfCall: selfCallAirlockPDA, systemProgram: SystemProgram.programId, }) .signers([payer]) @@ -183,11 +190,12 @@ describe("receive_message", () => { try { await stakeConnection.program.methods - .receiveMessage() + .receiveMessage(new BN(100000000)) .accounts({ payer: payer.publicKey, messageReceived: messageReceivedPDA, airlock: airlockPDA, + airlockSelfCall: selfCallAirlockPDA, messageExecutor: messageExecutorPDA, postedVaa: publicKey, wormholeProgram: CORE_BRIDGE_PID, @@ -237,11 +245,12 @@ describe("receive_message", () => { // Invoke receive_message instruction await stakeConnection.program.methods - .receiveMessage() + .receiveMessage(new BN(100000000)) .accounts({ payer: payer.publicKey, messageReceived: messageReceivedPDA, airlock: airlockPDA, + airlockSelfCall: selfCallAirlockPDA, messageExecutor: messageExecutorPDA, postedVaa: publicKey, wormholeProgram: CORE_BRIDGE_PID, @@ -285,11 +294,12 @@ describe("receive_message", () => { try { await stakeConnection.program.methods - .receiveMessage() + .receiveMessage(new BN(100000000)) .accounts({ payer: payer.publicKey, messageReceived: messageReceivedPDA, airlock: airlockPDA, + airlockSelfCall: selfCallAirlockPDA, messageExecutor: messageExecutorPDA, postedVaa: publicKey, wormholeProgram: CORE_BRIDGE_PID, @@ -353,11 +363,12 @@ describe("receive_message", () => { // Invoke receiveMessage instruction await stakeConnection.program.methods - .receiveMessage() + .receiveMessage(new BN(100000000)) .accounts({ payer: payer.publicKey, messageReceived: messageReceivedPDA, airlock: airlockPDA, + airlockSelfCall: selfCallAirlockPDA, messageExecutor: messageExecutorPDA, postedVaa: publicKey, wormholeProgram: CORE_BRIDGE_PID, @@ -383,6 +394,7 @@ describe("receive_message", () => { await generateUpdateVoteWeightWindowLengthsInstruction( stakeConnection, airlockPDA, + selfCallAirlockPDA, new BN(windowLength), ); @@ -412,7 +424,8 @@ describe("receive_message", () => { ); let remainingAccountsModified = remainingAccounts.map((a) => { - if (a.pubkey.toBase58() === airlockPDA.toBase58()) { + if (a.pubkey.toBase58() === airlockPDA.toBase58() + || a.pubkey.toBase58() === selfCallAirlockPDA.toBase58()) { return { pubkey: a.pubkey, isWritable: a.isWritable, @@ -424,11 +437,12 @@ describe("receive_message", () => { try { // Invoke receiveMessage instruction await stakeConnection.program.methods - .receiveMessage() + .receiveMessage(new BN(100000000)) .accounts({ payer: payer.publicKey, messageReceived: messageReceivedPDA, airlock: airlockPDA, + airlockSelfCall: selfCallAirlockPDA, messageExecutor: messageExecutorPDA, postedVaa: publicKey, wormholeProgram: CORE_BRIDGE_PID, @@ -453,6 +467,7 @@ describe("receive_message", () => { await generateUpdateVoteWeightWindowLengthsInstruction( stakeConnection, airlockPDA, + selfCallAirlockPDA, new BN(windowLength), ); @@ -482,7 +497,8 @@ describe("receive_message", () => { ); let remainingAccountsModified = remainingAccounts.map((a) => { - if (a.pubkey.toBase58() === airlockPDA.toBase58()) { + if (a.pubkey.toBase58() === airlockPDA.toBase58() + || a.pubkey.toBase58() === selfCallAirlockPDA.toBase58()) { return { pubkey: a.pubkey, isWritable: a.isWritable, @@ -493,11 +509,12 @@ describe("receive_message", () => { // Invoke receiveMessage instruction await stakeConnection.program.methods - .receiveMessage() + .receiveMessage(new BN(100000000)) .accounts({ payer: payer.publicKey, messageReceived: messageReceivedPDA, airlock: airlockPDA, + airlockSelfCall: selfCallAirlockPDA, messageExecutor: messageExecutorPDA, postedVaa: publicKey, wormholeProgram: CORE_BRIDGE_PID, @@ -689,6 +706,7 @@ export async function generateExternalProgramInstruction( export async function generateUpdateVoteWeightWindowLengthsInstruction( stakeConnection: StakeConnection, airlockPDA: PublicKey, + selfCallAirlockPDA: PublicKey, windowLength: BN, ): Promise<{ messagePayloadBuffer: Buffer; remainingAccounts: any[] }> { const [voteWeightWindowLengthsAccountAddress, _] = @@ -707,6 +725,7 @@ export async function generateUpdateVoteWeightWindowLengthsInstruction( .accounts({ payer: stakeConnection.userPublicKey(), airlock: airlockPDA, + airlockSelfCall: selfCallAirlockPDA, voteWeightWindowLengths: voteWeightWindowLengthsAccountAddress, systemProgram: SystemProgram.programId, }) diff --git a/solana/tests/staking.ts b/solana/tests/staking.ts index e5198050..869ced0a 100644 --- a/solana/tests/staking.ts +++ b/solana/tests/staking.ts @@ -167,7 +167,7 @@ describe("staking", async () => { [ utils.bytes.utf8.encode(wasm.Constants.CHECKPOINT_DATA_SEED()), owner.toBuffer(), - Buffer.from([0]), + Buffer.from([0, 0]), ], program.programId, )[0];