Skip to content

fix: ordering of Callback accounts #42

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: ordering of Callback accounts #42

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 21 additions & 15 deletions magic-actions/programs/magic-actions/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
use anchor_lang::prelude::*;
use anchor_lang::Discriminator;
Copy link

@coderabbitai coderabbitai bot Nov 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick | 🔵 Trivial

🧩 Analysis chain

Verify if the Discriminator import is needed.

The Discriminator trait is imported but doesn't appear to be used explicitly in the code. If it's not required by the macros or used elsewhere, consider removing it to keep imports clean.

Run the following script to check if Discriminator is actually used:

🏁 Script executed:

#!/bin/bash
# Check if Discriminator is used anywhere in the file
rg -n 'Discriminator' magic-actions/programs/magic-actions/src/lib.rs

Length of output: 33

Remove the unused Discriminator import on line 2.

The Discriminator trait is imported from anchor_lang but is never used anywhere in the file. This is dead code that should be cleaned up.

🤖 Prompt for AI Agents 
In magic-actions/programs/magic-actions/src/lib.rs around line 2, the file
imports the unused trait `Discriminator` from `anchor_lang`; remove the dead
import line `use anchor_lang::Discriminator;` so the file no longer contains an
unused import and rebuild to ensure no other references exist.

use ephemeral_rollups_sdk::anchor::{commit, delegate, ephemeral};
use ephemeral_rollups_sdk::cpi::DelegateConfig;
use ephemeral_rollups_sdk::ephem::commit_and_undelegate_accounts;
use ephemeral_rollups_sdk::ephem::{MagicInstructionBuilder, MagicAction, CallHandler, CommitType};
use ephemeral_rollups_sdk::ephem::{CallHandler, CommitType, MagicAction, MagicInstructionBuilder};
use ephemeral_rollups_sdk::{ActionArgs, ShortAccountMeta};
use anchor_lang::Discriminator;

declare_id!("FNG2W4yLLuT3ZsuHC94oDFKBxyyPtW6GHkPz1i669VPZ");

Expand Down Expand Up @@ -38,12 +38,15 @@ pub mod magic_actions {
let counter_info = &mut ctx.accounts.counter.to_account_info();
let mut data: &[u8] = &counter_info.try_borrow_data()?;
let counter = Counter::try_deserialize(&mut data)?;

if counter.count > leaderboard.high_score {
leaderboard.high_score = counter.count;
}

msg!("Leaderboard updated! High score: {}", leaderboard.high_score);

msg!(
"Leaderboard updated! High score: {}",
leaderboard.high_score
);
Ok(())
}

Expand All @@ -70,15 +73,14 @@ pub mod magic_actions {
}

pub fn commit_and_update_leaderboard(ctx: Context<CommitAndUpdateLeaderboard>) -> Result<()> {
let instruction_data = anchor_lang::InstructionData::data(
&crate::instruction::UpdateLeaderboard {}
);
let instruction_data =
anchor_lang::InstructionData::data(&crate::instruction::UpdateLeaderboard {});

let action_args = ActionArgs {
escrow_index: 0,
data: instruction_data,
};

let accounts = vec![
ShortAccountMeta {
pubkey: ctx.accounts.leaderboard.key(),
Expand All @@ -97,7 +99,7 @@ pub mod magic_actions {
destination_program: crate::ID,
accounts,
};

let magic_builder = MagicInstructionBuilder {
payer: ctx.accounts.payer.to_account_info(),
magic_context: ctx.accounts.magic_context.to_account_info(),
Expand All @@ -107,7 +109,7 @@ pub mod magic_actions {
call_handlers: vec![call_handler],
}),
};

magic_builder.build_and_invoke()?;
Ok(())
}
Expand Down Expand Up @@ -137,9 +139,13 @@ pub struct UpdateLeaderboard<'info> {
/// CHECK: Your program ID
pub counter: UncheckedAccount<'info>,
/// CHECK: the correct pda - this will be moved to the end in the future, meaning you can omit this unless needed
pub escrow: UncheckedAccount<'info>,
/// CHECK: the correct pda - this will be moved to the end in the future, meaning you can omit this unless needed
/// Escrow authority is an account from which we derived `escrow`
/// Using it one can verify if action was scheduled with expected authority
pub escrow_auth: UncheckedAccount<'info>,
/// CHECK: the correct pda - this will be moved to the end in the future, meaning you can omit this unless needed
/// Escrow account that is a `signer` in callback
/// It is derived from `escrow_auth` and `escrow_index` one specified in `CallHandler`
pub escrow: UncheckedAccount<'info>,
}

#[delegate]
Expand All @@ -165,7 +171,7 @@ pub struct UndelegateCounter<'info> {
pub struct CommitAndUpdateLeaderboard<'info> {
#[account(mut)]
pub payer: Signer<'info>,

#[account(mut, seeds = [TEST_PDA_SEED], bump)]
pub counter: Account<'info, Counter>,

Expand All @@ -185,4 +191,4 @@ pub struct Counter {
#[account]
pub struct Leaderboard {
pub high_score: u64,
}
}