feat: Add undelegation trough CPI (#1)

Cargo.toml

@@ -6,7 +6,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = "0.0.1"
+version = "0.0.2"
 authors = ["Magicblock Labs <[email protected]>"]
 edition = "2021"
 license = "MIT"
@@ -17,7 +17,7 @@ readme = "./README.md"
 keywords = ["solana", "crypto", "delegation", "ephemeral-rollups", "magicblock"]
 
 [workspace.dependencies]
-ephemeral-rollups-sdk-attribute-delegate = { path = "sdk/delegate", version = "=0.0.1" }
+ephemeral-rollups-sdk-attribute-delegate = { path = "sdk/delegate", version = "=0.0.2" }
 
 ## External crates
 borsh = "0.10.3"

sdk/src/er.rs → sdk/src/ephem.rs

@@ -12,15 +12,33 @@ pub fn commit_accounts<'a, 'info>(
 ) -> ProgramResult {
  let mut accounts = vec![payer];
  accounts.extend(account_infos.iter());
- let ix = create_schedule_commit_ix(magic_program, &accounts);
+ let ix = create_schedule_commit_ix(magic_program, &accounts, false);
+ invoke(&ix, &accounts.into_iter().cloned().collect::<Vec<_>>())
+}
+
+/// CPI to trigger a commit and undelegate one or more accounts in the ER
+#[inline(always)]
+pub fn commit_and_undelegate_accounts<'a, 'info>(
+ payer: &'a AccountInfo<'info>,
+ account_infos: Vec<&'a AccountInfo<'info>>,
+ magic_program: &'a AccountInfo<'info>,
+) -> ProgramResult {
+ let mut accounts = vec![payer];
+ accounts.extend(account_infos.iter());
+ let ix = create_schedule_commit_ix(magic_program, &accounts, true);
  invoke(&ix, &accounts.into_iter().cloned().collect::<Vec<_>>())
 }
 
 pub fn create_schedule_commit_ix<'a, 'info>(
  magic_program: &'a AccountInfo<'info>,
  account_infos: &[&'a AccountInfo<'info>],
+ allow_undelegation: bool,
 ) -> Instruction {
- let instruction_data = vec![1, 0, 0, 0];
+ let instruction_data = if allow_undelegation {
+ vec![2, 0, 0, 0]
+ } else {
+ vec![1, 0, 0, 0]
+ };
  let account_metas = account_infos
  .iter()
  .map(|x| AccountMeta {
@@ -30,4 +48,4 @@ pub fn create_schedule_commit_ix<'a, 'info>(
  })
  .collect::<Vec<AccountMeta>>();
  Instruction::new_with_bytes(*magic_program.key, &instruction_data, account_metas)
-}
+}

sdk/src/lib.rs

@@ -6,7 +6,7 @@ pub mod anchor;
 pub mod consts;
 pub mod cpi;
 pub mod delegate_args;
-pub mod er;
+pub mod ephem;
 pub mod pda;
 pub mod types;
 pub mod utils;

sdk/ts/package.json

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