🐛 Fixed case where the same component is used more than once in the system-input

Author: notdanilo

crates/bolt-lang/attribute/system-input/src/lib.rs

@@ -1,3 +1,5 @@
+use std::collections::HashSet;
+
 use proc_macro::TokenStream;
 
 use quote::quote;
@@ -61,8 +63,9 @@ pub fn system_input(_attr: TokenStream, item: TokenStream) -> TokenStream {
         })
         .collect();
 
-    let bolt_accounts = fields.iter().map(|f| {
-        let field_type = &f.ty;
+    let unique_fields = fields.iter().map(|f| f.ty.clone()).collect::<HashSet<_>>();
+    let bolt_accounts = unique_fields.iter().map(|f| {
+        let field_type = &f;
         quote! {
             pub type #field_type = bolt_lang::account::BoltAccount<super::#field_type, { bolt_lang::account::pubkey_p0(crate::ID) }, { bolt_lang::account::pubkey_p1(crate::ID) }>;
         }

crates/programs/world/src/lib.rs

@@ -494,27 +494,29 @@ fn apply_impl<'info>(
             data.copy_from_slice(component.try_borrow_data()?.as_ref());
         }
 
-        bolt_component::cpi::set_owner(
-            CpiContext::new_with_signer(
-                program.to_account_info(),
-                bolt_component::cpi::accounts::SetOwner {
+        if component.owner != bolt_system.key {
+            bolt_component::cpi::set_owner(
+                CpiContext::new_with_signer(
+                    program.to_account_info(),
+                    bolt_component::cpi::accounts::SetOwner {
+                        cpi_auth: cpi_auth.to_account_info(),
+                        component: component.to_account_info(),
+                    },
+                    &[World::cpi_auth_seeds().as_slice()],
+                ),
+                *bolt_system.key,
+            )?;
+
+            bolt_system::cpi::set_data(CpiContext::new_with_signer(
+                bolt_system.to_account_info(),
+                bolt_system::cpi::accounts::SetData {
                     cpi_auth: cpi_auth.to_account_info(),
+                    buffer: buffer.to_account_info(),
                     component: component.to_account_info(),
                 },
                 &[World::cpi_auth_seeds().as_slice()],
-            ),
-            *bolt_system.key,
-        )?;
-
-        bolt_system::cpi::set_data(CpiContext::new_with_signer(
-            bolt_system.to_account_info(),
-            bolt_system::cpi::accounts::SetData {
-                cpi_auth: cpi_auth.to_account_info(),
-                buffer: buffer.to_account_info(),
-                component: component.to_account_info(),
-            },
-            &[World::cpi_auth_seeds().as_slice()],
-        ))?;
+            ))?;
+        }
     }
 
     bolt_system::cpi::bolt_execute(
@@ -529,31 +531,33 @@ fn apply_impl<'info>(
             data.copy_from_slice(component.try_borrow_data()?.as_ref());
         }
 
-        bolt_system::cpi::set_owner(
-            CpiContext::new_with_signer(
-                bolt_system.to_account_info(),
-                bolt_system::cpi::accounts::SetOwner {
+        if *component.owner != program.key() {
+            bolt_system::cpi::set_owner(
+                CpiContext::new_with_signer(
+                    bolt_system.to_account_info(),
+                    bolt_system::cpi::accounts::SetOwner {
+                        cpi_auth: cpi_auth.to_account_info(),
+                        component: component.to_account_info(),
+                    },
+                    &[World::cpi_auth_seeds().as_slice()],
+                ),
+                program.key(),
+            )?;
+
+            if *component.owner != program.key() {
+                return Err(WorldError::InvalidComponentOwner.into());
+            }
+
+            bolt_component::cpi::set_data(CpiContext::new_with_signer(
+                program.to_account_info(),
+                bolt_component::cpi::accounts::SetData {
                     cpi_auth: cpi_auth.to_account_info(),
+                    buffer: buffer.to_account_info(),
                     component: component.to_account_info(),
                 },
                 &[World::cpi_auth_seeds().as_slice()],
-            ),
-            program.key(),
-        )?;
-
-        if *component.owner != program.key() {
-            return Err(WorldError::InvalidComponentOwner.into());
+            ))?;
         }
-
-        bolt_component::cpi::set_data(CpiContext::new_with_signer(
-            program.to_account_info(),
-            bolt_component::cpi::accounts::SetData {
-                cpi_auth: cpi_auth.to_account_info(),
-                buffer: buffer.to_account_info(),
-                component: component.to_account_info(),
-            },
-            &[World::cpi_auth_seeds().as_slice()],
-        ))?;
     }
 
     buffer.realloc(0, false)?;

examples/system-with-10-components/src/lib.rs

@@ -6,8 +6,8 @@ declare_id!("C69UYWaXBQXUbhHQGtG8pB7DHSgh2z5Sm9ifyAnM1kkt");
 #[system]
 pub mod with_10_components {
 
-    pub fn execute(ctx: Context<Components>, _args_p: Vec<u8>) -> Result<Components> {
-        Ok(ctx.accounts)
+    pub fn execute(_ctx: Context<Components>, _args_p: Vec<u8>) -> Result<()> {
+        Ok(())
     }
 
     #[system_input]