d0zingcat/ore
1
0
Fork 0
mirror of https://github.com/d0zingcat/ore.git synced 2026-06-07 07:36:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #62 from regolith-labs/hardhat/open-payer

Browse Source 
Add separate payer account for pda creation
This commit is contained in:
Hardhat Chad
2024-07-11 18:22:45 -05:00
committed by GitHub
parent 599b722130 bd1ef11562
commit dddf3fc98a
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
api/src/instruction.rs
View File

@@ -50,8 +50,11 @@ pub enum OreInstruction {
#[account(0, name = "ore_program", desc = "Ore program")] #[account(0, name = "ore_program", desc = "Ore program")]
#[account(1, name = "signer", desc = "Signer", signer)] #[account(1, name = "signer", desc = "Signer", signer)]
#[account(2, name = "proof", desc = "Ore proof account", writable)] #[account(2, name = "miner", desc = "Address to be initialized as the miner")]
#[account(3, name = "system_program", desc = "Solana system program")] #[account(3, name = "payer", desc = "Account to pay for account creation", writable, signer)]
#[account(4, name = "proof", desc = "Ore proof account", writable)]
#[account(5, name = "system_program", desc = "Solana system program")]
#[account(6, name = "slot_hashes", desc = "Solana slot hashes sysvar")]
Open = 4, Open = 4,
#[account(0, name = "ore_program", desc = "Ore program")] #[account(0, name = "ore_program", desc = "Ore program")]

6
program/src/open.rs
View File

@@ -33,11 +33,13 @@ pub fn process_open<'a, 'info>(
let args = OpenArgs::try_from_bytes(data)?; let args = OpenArgs::try_from_bytes(data)?;
// Load accounts // Load accounts
let [signer, miner_info, proof_info, system_program, slot_hashes_info] = accounts else { let [signer, miner_info, payer_info, proof_info, system_program, slot_hashes_info] = accounts
else {
return Err(ProgramError::NotEnoughAccountKeys); return Err(ProgramError::NotEnoughAccountKeys);
}; };
load_signer(signer)?; load_signer(signer)?;
load_system_account(miner_info, false)?; load_system_account(miner_info, false)?;
load_signer(payer_info)?;
load_uninitialized_pda( load_uninitialized_pda(
proof_info, proof_info,
&[PROOF, signer.key.as_ref()], &[PROOF, signer.key.as_ref()],
@@ -54,7 +56,7 @@ pub fn process_open<'a, 'info>(
8 + size_of::<Proof>(), 8 + size_of::<Proof>(),
&[PROOF, signer.key.as_ref(), &[args.bump]], &[PROOF, signer.key.as_ref(), &[args.bump]],
system_program, system_program,
signer, payer_info,
)?; )?;
let clock = Clock::get().or(Err(ProgramError::InvalidAccountData))?; let clock = Clock::get().or(Err(ProgramError::InvalidAccountData))?;
let mut proof_data = proof_info.data.borrow_mut(); let mut proof_data = proof_info.data.borrow_mut();