fix: merge conflict

Author: jim4067

.gitignore

@@ -22,5 +22,5 @@ node_modules/
 
 /target
 deploy
-.claude
 .claire
+.claude

basics/account-data/quasar/src/instructions/create.rs

@@ -15,21 +15,20 @@ pub struct CreateAddressInfo {
     pub system_program: Program<System>,
 }
 
-impl CreateAddressInfo {
-    #[inline(always)]
-    pub fn create_address_info(
-        &mut self, name: &str,
-        house_number: u8,
-        street: &str,
-        city: &str,
-    ) -> Result<(), ProgramError> {
-        self.address_info.set_inner(
-            house_number,
-            name,
-            street,
-            city,
-            self.payer.to_account_view(),
-            None,
-        )
-    }
+#[inline(always)]
+pub fn handle_create_address_info(
+    accounts: &mut CreateAddressInfo,
+    name: &str,
+    house_number: u8,
+    street: &str,
+    city: &str,
+) -> Result<(), ProgramError> {
+    accounts.address_info.set_inner(
+        house_number,
+        name,
+        street,
+        city,
+        accounts.payer.to_account_view(),
+        None,
+    )
 }

basics/checking-accounts/quasar/src/instructions/check_accounts.rs

@@ -21,11 +21,9 @@ pub struct CheckAccounts {
     pub system_program: Program<System>,
 }
 
-impl CheckAccounts {
-    #[inline(always)]
-    pub fn check_accounts(&mut self) -> Result<(), ProgramError> {
-        // All validation happens declaratively via the account types above.
-        // If any check fails, the runtime rejects the transaction before this runs.
-        Ok(())
-    }
+#[inline(always)]
+pub fn handle_check_accounts(_accounts: &mut CheckAccounts) -> Result<(), ProgramError> {
+    // All validation happens declaratively via the account types above.
+    // If any check fails, the runtime rejects the transaction before this runs.
+    Ok(())
 }

basics/close-account/quasar/src/instructions/close_user.rs

@@ -15,9 +15,7 @@ pub struct CloseUser {
     pub user_account: Account<UserState<'_>>,
 }
 
-impl CloseUser {
-    #[inline(always)]
-    pub fn close_user(&mut self) -> Result<(), ProgramError> {
-        self.user_account.close(self.user.to_account_view())
-    }
+#[inline(always)]
+pub fn handle_close_user(accounts: &mut CloseUser) -> Result<(), ProgramError> {
+    accounts.user_account.close(accounts.user.to_account_view())
 }

basics/close-account/quasar/src/instructions/create_user.rs

@@ -13,16 +13,14 @@ pub struct CreateUser {
     pub system_program: Program<System>,
 }
 
-impl CreateUser {
-    #[inline(always)]
-    pub fn create_user(&mut self, name: &str, bump: u8) -> Result<(), ProgramError> {
-        let user_address = *self.user.to_account_view().address();
-        self.user_account.set_inner(
-            bump,
-            user_address,
-            name,
-            self.user.to_account_view(),
-            None,
-        )
-    }
+#[inline(always)]
+pub fn handle_create_user(accounts: &mut CreateUser, name: &str, bump: u8) -> Result<(), ProgramError> {
+    let user_address = *accounts.user.to_account_view().address();
+    accounts.user_account.set_inner(
+        bump,
+        user_address,
+        name,
+        accounts.user.to_account_view(),
+        None,
+    )
 }

basics/counter/quasar/src/instructions/increment.rs

@@ -10,11 +10,9 @@ pub struct Increment {
     pub counter: Account<Counter>,
 }
 
-impl Increment {
-    #[inline(always)]
-    pub fn increment(&mut self) -> Result<(), ProgramError> {
-        let current: u64 = self.counter.count.into();
-        self.counter.count = PodU64::from(current.checked_add(1).unwrap());
-        Ok(())
-    }
+#[inline(always)]
+pub fn handle_increment(accounts: &mut Increment) -> Result<(), ProgramError> {
+    let current: u64 = accounts.counter.count.into();
+    accounts.counter.count = PodU64::from(current.checked_add(1).unwrap());
+    Ok(())
 }

basics/counter/quasar/src/instructions/initialize_counter.rs

@@ -14,10 +14,8 @@ pub struct InitializeCounter {
     pub system_program: Program<System>,
 }
 
-impl InitializeCounter {
-    #[inline(always)]
-    pub fn initialize_counter(&mut self) -> Result<(), ProgramError> {
-        self.counter.set_inner(0u64);
-        Ok(())
-    }
+#[inline(always)]
+pub fn handle_initialize_counter(accounts: &mut InitializeCounter) -> Result<(), ProgramError> {
+    accounts.counter.set_inner(0u64);
+    Ok(())
 }

basics/create-account/quasar/src/instructions/create_system_account.rs

@@ -11,20 +11,18 @@ pub struct CreateSystemAccount {
     pub system_program: Program<System>,
 }
 
-impl CreateSystemAccount {
-    #[inline(always)]
-    pub fn create_system_account(&mut self) -> Result<(), ProgramError> {
-        // Create a zero-data account owned by the system program,
-        // funded with the minimum rent-exempt balance.
-        let system_program_address = Address::default();
-        self.system_program
-            .create_account_with_minimum_balance(
-                &self.payer,
-                &self.new_account,
-                0, // space: zero bytes of data
-                &system_program_address,
-                None, // fetch Rent sysvar automatically
-            )?
-            .invoke()
-    }
+#[inline(always)]
+pub fn handle_create_system_account(accounts: &mut CreateSystemAccount) -> Result<(), ProgramError> {
+    // Create a zero-data account owned by the system program,
+    // funded with the minimum rent-exempt balance.
+    let system_program_address = Address::default();
+    accounts.system_program
+        .create_account_with_minimum_balance(
+            &accounts.payer,
+            &accounts.new_account,
+            0, // space: zero bytes of data
+            &system_program_address,
+            None, // fetch Rent sysvar automatically
+        )?
+        .invoke()
 }

basics/favorites/quasar/src/instructions/set_favorites.rs

@@ -14,14 +14,12 @@ pub struct SetFavorites {
     pub system_program: Program<System>,
 }
 
-impl SetFavorites {
-    #[inline(always)]
-    pub fn set_favorites(&mut self, number: u64, color: &str) -> Result<(), ProgramError> {
-        self.favorites.set_inner(
-            number,
-            color,
-            self.user.to_account_view(),
-            None,
-        )
-    }
+#[inline(always)]
+pub fn handle_set_favorites(accounts: &mut SetFavorites, number: u64, color: &str) -> Result<(), ProgramError> {
+    accounts.favorites.set_inner(
+        number,
+        color,
+        accounts.user.to_account_view(),
+        None,
+    )
 }

basics/hello-solana/quasar/src/instructions/hello.rs

@@ -9,11 +9,9 @@ pub struct Hello {
     pub payer: Signer,
 }
 
-impl Hello {
-    #[inline(always)]
-    pub fn hello(&mut self) -> Result<(), ProgramError> {
-        log("Hello, Solana!");
-        log("Our program's Program ID: FLUH9c5oAfXb1eYbkZvdGK9r9SLQJBUi2DZQaBVj7Tzr");
-        Ok(())
-    }
+#[inline(always)]
+pub fn handle_hello(_accounts: &mut Hello) -> Result<(), ProgramError> {
+    log("Hello, Solana!");
+    log("Our program's Program ID: FLUH9c5oAfXb1eYbkZvdGK9r9SLQJBUi2DZQaBVj7Tzr");
+    Ok(())
 }