chore: refactor & improvements

magicblock-labs · Jan 4, 2025 · f78db3d · f78db3d
1 parent 27120ef
commit f78db3d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/rust/commit-attribute/src/lib.rs b/rust/commit-attribute/src/lib.rs
@@ -30,7 +30,7 @@ pub fn commit(_attr: TokenStream, item: TokenStream) -> TokenStream {
             new_fields.push(
                     Field::parse_named
                         .parse2(quote! {
-                            pub magic_program: Program<'info, ::ephemeral_rollups_sdk_v2::anchor::MagicProgram>
+                            pub magic_program: Program<'info, ::ephemeral_rollups_sdk::anchor::MagicProgram>
                         })
                         .unwrap(),
                 );
@@ -40,7 +40,7 @@ pub fn commit(_attr: TokenStream, item: TokenStream) -> TokenStream {
             new_fields.push(
                 Field::parse_named
                     .parse2(quote! {
-                        #[account(mut, address = ::ephemeral_rollups_sdk_v2::consts::MAGIC_CONTEXT_ID)]
+                        #[account(mut, address = ::ephemeral_rollups_sdk::consts::MAGIC_CONTEXT_ID)]
                         /// CHECK:`
                         pub magic_context: AccountInfo<'info>
                     })
@@ -49,6 +49,7 @@ pub fn commit(_attr: TokenStream, item: TokenStream) -> TokenStream {
         }
 
         quote! {
+            use ::ephemeral_rollups_sdk::anchor::MagicProgram;
             #(#attrs)*
             pub struct #name<'info> {
                 #new_fields

diff --git a/rust/delegate/src/lib.rs b/rust/delegate/src/lib.rs
@@ -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_v2::consts::BUFFER, #field_name.key().as_ref()],
+                    mut, seeds = [ephemeral_rollups_sdk::consts::BUFFER, #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_v2::consts::DELEGATION_RECORD, #field_name.key().as_ref()],
+                    mut, seeds = [ephemeral_rollups_sdk::consts::DELEGATION_RECORD, #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_v2::consts::DELEGATION_METADATA, #field_name.key().as_ref()],
+                    mut, seeds = [ephemeral_rollups_sdk::consts::DELEGATION_METADATA, #field_name.key().as_ref()],
                     bump, seeds::program = delegation_program.key()
                 )]
                 pub #delegation_metadata_field: AccountInfo<'info>,
@@ -96,9 +96,9 @@ pub fn delegate(_attr: TokenStream, item: TokenStream) -> TokenStream {
                     &'a self,
                     payer: &'a Signer<'info>,
                     seeds: &[&[u8]],
-                    config: ::ephemeral_rollups_sdk_v2::cpi::DelegateConfig,
+                    config: ::ephemeral_rollups_sdk::cpi::DelegateConfig,
                 ) -> anchor_lang::solana_program::entrypoint::ProgramResult {
-                    let del_accounts = ::ephemeral_rollups_sdk_v2::cpi::DelegateAccounts {
+                    let del_accounts = ::ephemeral_rollups_sdk::cpi::DelegateAccounts {
                         payer,
                         pda: &self.#field_name.to_account_info(),
                         owner_program: &self.owner_program,
@@ -108,7 +108,7 @@ pub fn delegate(_attr: TokenStream, item: TokenStream) -> TokenStream {
                         delegation_program: &self.delegation_program,
                         system_program: &self.system_program,
                     };
-                    ::ephemeral_rollups_sdk_v2::cpi::delegate_account(del_accounts, seeds, config)
+                    ::ephemeral_rollups_sdk::cpi::delegate_account(del_accounts, seeds, config)
                 }
             });
         }
@@ -143,7 +143,7 @@ pub fn delegate(_attr: TokenStream, item: TokenStream) -> TokenStream {
     if !has_delegation_program {
         new_fields.push(quote! {
             /// CHECK: The delegation program
-            #[account(address = ::ephemeral_rollups_sdk_v2::id())]
+            #[account(address = ::ephemeral_rollups_sdk::id())]
             pub delegation_program: AccountInfo<'info>,
         });
     }

diff --git a/rust/ephemeral/src/lib.rs b/rust/ephemeral/src/lib.rs
@@ -96,7 +96,7 @@ fn modify_component_module(mut module: ItemMod) -> ItemMod {
 fn generate_undelegate() -> (TokenStream2, TokenStream2, TokenStream2) {
     (
         quote! {
-            use ephemeral_rollups_sdk_v2::cpi::undelegate_account;
+            use ephemeral_rollups_sdk::cpi::undelegate_account;
         },
         quote! {
             #[automatically_derived]

diff --git a/rust/sdk/src/anchor.rs b/rust/sdk/src/anchor.rs
@@ -1,11 +1,11 @@
 #[cfg(feature = "anchor")]
-pub use ephemeral_rollups_sdk_attribute_ephemeral_v2::ephemeral;
+pub use ephemeral_rollups_sdk_attribute_ephemeral::ephemeral;
 
 #[cfg(feature = "anchor")]
-pub use ephemeral_rollups_sdk_attribute_commit_v2::commit;
+pub use ephemeral_rollups_sdk_attribute_commit::commit;
 
 #[cfg(feature = "anchor")]
-pub use ephemeral_rollups_sdk_attribute_delegate_v2::delegate;
+pub use ephemeral_rollups_sdk_attribute_delegate::delegate;
 
 #[cfg(feature = "anchor")]
 use solana_program::pubkey::Pubkey;