Skip to content

chore(mcm): reloads execute accounts after CPI #1309

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

Closed
wants to merge 3 commits into from
Closed

chore(mcm): reloads execute accounts after CPI #1309

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eed0262
chore(mcm): reloads execute accounts after CPI
xenoliss Oct 21, 2025
c6167d4
fix(mcm): move op_count increment after account reloads
xenoliss Oct 24, 2025
cbe3211
Merge branch 'main' into bo/mcm-invoke-signed
xenoliss Oct 24, 2025
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
10 changes: 8 additions & 2 deletions chains/solana/contracts/programs/mcm/src/instructions/execute.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,16 @@ pub fn execute<'info>(
];
let signer = &[&seeds[..]];

ctx.accounts.expiring_root_and_op_count.op_count += 1;

invoke_signed(&instruction, acc_infos, signer)?;

// Reload the accounts to avoid Anchor writing back the stale outer copy on exit
// (in case the CPI modified any accounts present in this outer context)
ctx.accounts.multisig_config.reload()?;
ctx.accounts.root_metadata.reload()?;
ctx.accounts.expiring_root_and_op_count.reload()?;

ctx.accounts.expiring_root_and_op_count.op_count += 1;

emit!(OpExecuted {
nonce,
to: instruction.program_id,
Expand Down