Merge pull request #42 from magicblock-labs/feat/base-layer-ix

Base layer ix

Author: taco-paco

rust/Cargo.lock

@@ -27,6 +27,10 @@ ephemeral-rollups-sdk-attribute-ephemeral = { path = "ephemeral", version = "=0.
 ephemeral-rollups-sdk-attribute-delegate = { path = "delegate", version = "=0.2.12" }
 ephemeral-rollups-sdk-attribute-commit = { path = "commit-attribute", version = "=0.2.12" }
 
+# Magicblock
+magicblock-delegation-program = { version = "1.1.1", features = ["no-entrypoint"] }
+magicblock-magic-program-api = "0.1.7"
+
 ## External crates
 anchor-lang = { version = ">=0.28.0" }
 proc-macro2 = "1.0"

rust/Cargo.toml

@@ -64,7 +64,7 @@ pub fn delegate(_attr: TokenStream, item: TokenStream) -> TokenStream {
             new_fields.push(quote! {
                 /// CHECK: The buffer account
                 #[account(
-                    mut, seeds = [ephemeral_rollups_sdk::consts::BUFFER, #field_name.key().as_ref()],
+                    mut, seeds = [ephemeral_rollups_sdk::pda::DELEGATE_BUFFER_TAG, #field_name.key().as_ref()],
                     bump, seeds::program = crate::id()
                 )]
                 pub #buffer_field: AccountInfo<'info>,
@@ -73,7 +73,7 @@ pub fn delegate(_attr: TokenStream, item: TokenStream) -> TokenStream {
             new_fields.push(quote! {
                 /// CHECK: The delegation record account
                 #[account(
-                    mut, seeds = [ephemeral_rollups_sdk::consts::DELEGATION_RECORD, #field_name.key().as_ref()],
+                    mut, seeds = [ephemeral_rollups_sdk::pda::DELEGATION_RECORD_TAG, #field_name.key().as_ref()],
                     bump, seeds::program = delegation_program.key()
                 )]
                 pub #delegation_record_field: AccountInfo<'info>,
@@ -82,7 +82,7 @@ pub fn delegate(_attr: TokenStream, item: TokenStream) -> TokenStream {
             new_fields.push(quote! {
                 /// CHECK: The delegation metadata account
                 #[account(
-                    mut, seeds = [ephemeral_rollups_sdk::consts::DELEGATION_METADATA, #field_name.key().as_ref()],
+                    mut, seeds = [ephemeral_rollups_sdk::pda::DELEGATION_METADATA_TAG, #field_name.key().as_ref()],
                     bump, seeds::program = delegation_program.key()
                 )]
                 pub #delegation_metadata_field: AccountInfo<'info>,

rust/delegate/src/lib.rs

@@ -17,7 +17,7 @@ pub struct DelegateAccountArgs<'a> {
     pub validator: Option<Pubkey>,
 }
 
-impl<'a> Default for DelegateAccountArgs<'a> {
+impl Default for DelegateAccountArgs<'_> {
     fn default() -> Self {
         DelegateAccountArgs {
             commit_frequency_ms: u32::MAX,
@@ -27,7 +27,7 @@ impl<'a> Default for DelegateAccountArgs<'a> {
     }
 }
 
-impl<'a> DelegateAccountArgs<'a> {
+impl DelegateAccountArgs<'_> {
     pub fn try_to_slice<'b>(&self, data: &'b mut [u8]) -> Result<&'b [u8], ProgramError> {
         if self.seeds.len() >= MAX_SEEDS {
             return Err(ProgramError::InvalidArgument);

rust/pinocchio/src/types.rs

@@ -22,3 +22,8 @@ ephemeral-rollups-sdk-attribute-delegate = { workspace = true }
 ephemeral-rollups-sdk-attribute-ephemeral = { workspace = true }
 ephemeral-rollups-sdk-attribute-commit = { workspace = true }
 solana-program = { workspace = true }
+magicblock-magic-program-api = { workspace = true }
+magicblock-delegation-program  = { workspace = true, features = ["no-entrypoint"] }
+
+[dev-dependencies]
+bincode = "1.3.3"

rust/sdk/Cargo.toml

@@ -1,31 +1,11 @@
 // NOTE: this should go into a core package that both the sdk + the program can depend on
-use solana_program::pubkey;
 use solana_program::pubkey::Pubkey;
 
-/// The delegation program ID.
-pub const DELEGATION_PROGRAM_ID: Pubkey = pubkey!("DELeGGvXpWV2fqJUhqcF5ZSYMS4JTLjteaAMARRSaeSh");
+pub use dlp::consts::*;
+use magicblock_magic_program_api::MAGIC_CONTEXT_PUBKEY;
 
 /// The magic program ID.
-pub const MAGIC_PROGRAM_ID: Pubkey = pubkey!("Magic11111111111111111111111111111111111111");
+pub const MAGIC_PROGRAM_ID: Pubkey = magicblock_magic_program_api::ID;
 
 /// The magic context ID.
-pub const MAGIC_CONTEXT_ID: Pubkey = pubkey!("MagicContext1111111111111111111111111111111");
-
-///
-/// The seed of the authority account PDA.
-pub const DELEGATION_RECORD: &[u8] = b"delegation";
-
-/// The account to store the delegated account seeds.
-pub const DELEGATION_METADATA: &[u8] = b"delegation-metadata";
-
-/// The seed of the buffer account PDA.
-pub const BUFFER: &[u8] = b"buffer";
-
-/// The seed of the committed state PDA.
-pub const COMMIT_STATE: &[u8] = b"state-diff";
-
-/// The seed of a commit state record PDA.
-pub const COMMIT_RECORD: &[u8] = b"commit-state-record";
-
-/// The discriminator for the external undelegate instruction.
-pub const EXTERNAL_UNDELEGATE_DISCRIMINATOR: [u8; 8] = [196, 28, 41, 206, 48, 37, 51, 167];
+pub const MAGIC_CONTEXT_ID: Pubkey = MAGIC_CONTEXT_PUBKEY;

rust/sdk/src/consts.rs

@@ -1,7 +1,8 @@
-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 dlp::consts::DELEGATION_PROGRAM_ID;
+use dlp::delegate_buffer_seeds_from_delegated_account;
 use solana_program::account_info::AccountInfo;
 use solana_program::entrypoint::ProgramResult;
 use solana_program::instruction::{AccountMeta, Instruction};
@@ -42,7 +43,7 @@ pub fn delegate_account<'a, 'info>(
     pda_seeds: &[&[u8]],
     config: DelegateConfig,
 ) -> ProgramResult {
-    let buffer_seeds: &[&[u8]] = &[BUFFER, accounts.pda.key.as_ref()];
+    let buffer_seeds: &[&[u8]] = delegate_buffer_seeds_from_delegated_account!(accounts.pda.key);
 
     let (_, delegate_account_bump) =
         Pubkey::find_program_address(pda_seeds, accounts.owner_program.key);
@@ -138,6 +139,9 @@ pub fn undelegate_account<'a, 'info>(
     if !buffer.is_signer {
         return Err(ProgramError::MissingRequiredSignature);
     }
+    if buffer.owner != &DELEGATION_PROGRAM_ID {
+        return Err(ProgramError::InvalidAccountOwner);
+    }
 
     let account_seeds: Vec<&[u8]> = account_signer_seeds.iter().map(|v| v.as_slice()).collect();
 

rust/sdk/src/cpi.rs

@@ -1,13 +1,10 @@
+use dlp::pda::{
+    delegate_buffer_pda_from_delegated_account_and_owner_program,
+    delegation_metadata_pda_from_delegated_account, delegation_record_pda_from_delegated_account,
+};
 use solana_program::{instruction::AccountMeta, pubkey::Pubkey, system_program};
 
-use crate::{
-    consts::DELEGATION_PROGRAM_ID,
-    pda::{
-        delegate_buffer_pda_from_delegated_account_and_owner_program,
-        delegation_metadata_pda_from_delegated_account,
-        delegation_record_pda_from_delegated_account,
-    },
-};
+use crate::consts::DELEGATION_PROGRAM_ID;
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct DelegateAccounts {