fix: use system program assign to prevent invalid runtime failure (#46)

Author: GabrielePicco

rust/Cargo.lock

@@ -11,7 +11,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = "0.2.9"
+version = "0.2.10"
 authors = ["Magicblock Labs <[email protected]>"]
 edition = "2021"
 license = "MIT"
@@ -22,10 +22,10 @@ readme = "README.md"
 keywords = ["solana", "crypto", "delegation", "ephemeral-rollups", "magicblock"]
 
 [workspace.dependencies]
-ephemeral-rollups-sdk = { path = "sdk", version = "=0.2.9" }
-ephemeral-rollups-sdk-attribute-ephemeral = { path = "ephemeral", version = "=0.2.9" }
-ephemeral-rollups-sdk-attribute-delegate = { path = "delegate", version = "=0.2.9" }
-ephemeral-rollups-sdk-attribute-commit = { path = "commit-attribute", version = "=0.2.9" }
+ephemeral-rollups-sdk = { path = "sdk", version = "=0.2.10" }
+ephemeral-rollups-sdk-attribute-ephemeral = { path = "ephemeral", version = "=0.2.10" }
+ephemeral-rollups-sdk-attribute-delegate = { path = "delegate", version = "=0.2.10" }
+ephemeral-rollups-sdk-attribute-commit = { path = "commit-attribute", version = "=0.2.10" }
 
 ## External crates
 anchor-lang = { version = ">=0.28.0" }

rust/Cargo.toml

@@ -1,15 +1,15 @@
+use crate::consts::BUFFER;
+use crate::types::DelegateAccountArgs;
+use crate::utils::{close_pda_with_system_transfer, create_pda, seeds_with_bump};
 use borsh::BorshSerialize;
 use solana_program::account_info::AccountInfo;
 use solana_program::entrypoint::ProgramResult;
 use solana_program::instruction::{AccountMeta, Instruction};
+use solana_program::program::invoke_signed;
 use solana_program::program_error::ProgramError;
-use solana_program::program_memory::{sol_memcpy, sol_memset};
+use solana_program::program_memory::sol_memset;
 use solana_program::pubkey::Pubkey;
-
-// TODO: import from the delegation program crate once open-sourced
-use crate::consts::BUFFER;
-use crate::types::DelegateAccountArgs;
-use crate::utils::{close_pda_with_system_transfer, create_pda, seeds_with_bump};
+use solana_program::system_instruction;
 
 pub struct DelegateAccounts<'a, 'info> {
     pub payer: &'a AccountInfo<'info>,
@@ -76,7 +76,7 @@ pub fn delegate_account<'a, 'info>(
     {
         let pda_ro = accounts.pda.try_borrow_data()?;
         let mut buf = accounts.buffer.try_borrow_mut_data()?;
-        sol_memcpy(&mut buf, &pda_ro, data_len);
+        buf.copy_from_slice(&pda_ro);
     }
 
     // Zero PDA (single RW borrow)
@@ -85,7 +85,17 @@ pub fn delegate_account<'a, 'info>(
         sol_memset(&mut pda_mut, 0, data_len);
     }
 
-    accounts.pda.assign(accounts.delegation_program.key);
+    // Assign the PDA to the delegation program if not already assigned
+    if accounts.pda.owner != accounts.system_program.key {
+        accounts.pda.assign(accounts.system_program.key);
+    }
+    if accounts.pda.owner != accounts.delegation_program.key {
+        invoke_signed(
+            &system_instruction::assign(accounts.pda.key, accounts.delegation_program.key),
+            &[accounts.pda.clone(), accounts.system_program.clone()],
+            pda_signer_seeds,
+        )?;
+    }
 
     let seeds_vec: Vec<Vec<u8>> = pda_seeds.iter().map(|&slice| slice.to_vec()).collect();
 

rust/sdk/src/cpi.rs

@@ -1,6 +1,6 @@
 {
   "name": "@magicblock-labs/ephemeral-rollups-sdk",
-  "version": "0.2.9",
+  "version": "0.2.10",
   "author": "MagicBlock Labs",
   "license": "MIT",
   "publishConfig": {