From dc9cccf753cce6194cc7dd6647b5dab3f13e0f28 Mon Sep 17 00:00:00 2001
From: Danilo Guanabara <danilo@sensorial.systems>
Date: Thu, 16 Oct 2025 15:02:17 -0300
Subject: [PATCH 1/8] :green_heart: Fixing ephemeral-validator startup on CI

---
 .github/workflows/run-tests.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 05227a1b..2b12cbef 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -98,5 +98,9 @@ jobs:
           cd clients/typescript
           yarn install && yarn build
           cd ../..
+          # Set limits for being able to run ephemeral-validator test process
+          sudo prlimit --pid $$ --nofile=1048576:1048576
+          sudo sysctl fs.inotify.max_user_instances=1280
+          sudo sysctl fs.inotify.max_user_watches=655360
           bolt test
 

From 465bcbc7a785cd99e3ee80a345b38d48aa31f8c8 Mon Sep 17 00:00:00 2001
From: Danilo Guanabara <danilo@sensorial.systems>
Date: Thu, 16 Oct 2025 15:38:50 -0300
Subject: [PATCH 2/8] :green_heart: Fixing silent test error

---
 crates/bolt-cli/src/commands/test.rs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/crates/bolt-cli/src/commands/test.rs b/crates/bolt-cli/src/commands/test.rs
index 726f82a5..2326a4cd 100644
--- a/crates/bolt-cli/src/commands/test.rs
+++ b/crates/bolt-cli/src/commands/test.rs
@@ -14,14 +14,17 @@ pub async fn test(
             cfg_override,
             command,
         };
-        anchor_cli::entry(opts).ok();
+        // Propagate the result of running the underlying anchor tests so failures
+        // produce a non-zero exit code for callers (e.g., CI workflows).
+        anchor_cli::entry(opts)
     });
     if !skip_local_validator {
         if let Ok(_ephemeral_validator) = EphemeralValidator::start().await {
-            anchor.await.ok();
-            return Ok(());
+            // Keep the validator alive while tests run by retaining the handle
+            // in scope, and return the actual test result.
+            return anchor.await.unwrap_or_else(|e| Err(anyhow::anyhow!("Failed to run anchor: {}", e)));
         }
     }
-    anchor.await.expect("Failed to run anchor");
-    Ok(())
+    // Return the actual result when not using the ephemeral validator or if it failed to start.
+    anchor.await.unwrap_or_else(|e| Err(anyhow::anyhow!("Failed to run anchor: {}", e)))
 }

From 80eb9d8621b56e3399bcac26d9f4491308e57348 Mon Sep 17 00:00:00 2001
From: Danilo Guanabara <danilo@sensorial.systems>
Date: Thu, 16 Oct 2025 15:43:01 -0300
Subject: [PATCH 3/8] :rotating_light: Fixing linter warnings

---
 crates/bolt-cli/src/commands/test.rs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/crates/bolt-cli/src/commands/test.rs b/crates/bolt-cli/src/commands/test.rs
index 2326a4cd..36153a70 100644
--- a/crates/bolt-cli/src/commands/test.rs
+++ b/crates/bolt-cli/src/commands/test.rs
@@ -22,9 +22,13 @@ pub async fn test(
         if let Ok(_ephemeral_validator) = EphemeralValidator::start().await {
             // Keep the validator alive while tests run by retaining the handle
             // in scope, and return the actual test result.
-            return anchor.await.unwrap_or_else(|e| Err(anyhow::anyhow!("Failed to run anchor: {}", e)));
+            return anchor
+                .await
+                .unwrap_or_else(|e| Err(anyhow::anyhow!("Failed to run anchor: {}", e)));
         }
     }
     // Return the actual result when not using the ephemeral validator or if it failed to start.
-    anchor.await.unwrap_or_else(|e| Err(anyhow::anyhow!("Failed to run anchor: {}", e)))
+    anchor
+        .await
+        .unwrap_or_else(|e| Err(anyhow::anyhow!("Failed to run anchor: {}", e)))
 }

From 7e3aa22b430f49daf7d91bd94870b90c5622cafa Mon Sep 17 00:00:00 2001
From: Danilo Guanabara <danilo@sensorial.systems>
Date: Thu, 16 Oct 2025 15:55:44 -0300
Subject: [PATCH 4/8] :white_check_mark: Fixing errors

---
 .../AccelerationTest.cs                       |  7 +--
 clients/typescript/test/framework.ts          |  3 -
 .../test/intermediate-level/acceleration.ts   | 61 +++++++++----------
 3 files changed, 33 insertions(+), 38 deletions(-)

diff --git a/clients/csharp/Solana.Unity.Bolt.Test/AccelerationTest.cs b/clients/csharp/Solana.Unity.Bolt.Test/AccelerationTest.cs
index b9a3649c..ccf3cd55 100644
--- a/clients/csharp/Solana.Unity.Bolt.Test/AccelerationTest.cs
+++ b/clients/csharp/Solana.Unity.Bolt.Test/AccelerationTest.cs
@@ -21,10 +21,9 @@ await Profiler.Run("InitializePositionComponentOnAccelerationEntity", async () =
             await Profiler.Run("DelegateComponent", async () => {
                 await DelegateComponent(framework);
             });
-            // TODO: Re-enable this test when ephemeral-validator is properly installed on the CI.
-            // await Profiler.Run("ApplySimpleMovementSystemOnAccelerator 10", async () => {
-            //     await ApplySimpleMovementSystemOnAccelerator(framework);
-            // });
+            await Profiler.Run("ApplySimpleMovementSystemOnAccelerator 10", async () => {
+                await ApplySimpleMovementSystemOnAccelerator(framework);
+            });
         }
 
         public static async Task AddAccelerationEntity(Framework framework) {
diff --git a/clients/typescript/test/framework.ts b/clients/typescript/test/framework.ts
index a3b36439..962a0c25 100644
--- a/clients/typescript/test/framework.ts
+++ b/clients/typescript/test/framework.ts
@@ -70,9 +70,6 @@ export class Framework {
     this.systemSimpleMovement = anchor.workspace.SystemSimpleMovement;
     this.systemFly = anchor.workspace.SystemFly;
     this.systemApplyVelocity = anchor.workspace.SystemApplyVelocity;
-    this.systemWithManyComponents = anchor.workspace.SystemWithManyComponents;
-    this.systemWithFewComponents = anchor.workspace.SystemWithFewComponents;
-    this.componentLarge = anchor.workspace.Large;
     this.componentSmall = anchor.workspace.Small;
     this.systemWith1Component = anchor.workspace.With1Component;
     this.systemWith2Components = anchor.workspace.With2Components;
diff --git a/clients/typescript/test/intermediate-level/acceleration.ts b/clients/typescript/test/intermediate-level/acceleration.ts
index d020aea9..9c13ddf4 100644
--- a/clients/typescript/test/intermediate-level/acceleration.ts
+++ b/clients/typescript/test/intermediate-level/acceleration.ts
@@ -64,37 +64,36 @@ export function acceleration(framework: Framework) {
       expect(acc?.owner.toBase58()).to.equal(DELEGATION_PROGRAM_ID.toBase58());
     });
 
-    // TODO: Re-enable this test when ephemeral-validator is properly installed on the CI.
-    // it("Apply Simple Movement System (Up) on Entity 1 on Accelerator 10 times", async () => {
-    //   for (let i = 0; i < 10; i++) {
-    //     let applySystem = await ApplySystem({
-    //       authority: framework.provider.wallet.publicKey,
-    //       systemId: framework.systemSimpleMovement.programId,
-    //       world: framework.worldPda,
-    //       entities: [
-    //         {
-    //           entity: framework.acceleratedEntityPda,
-    //           components: [
-    //             { componentId: framework.exampleComponentPosition.programId },
-    //           ],
-    //         },
-    //       ],
-    //       args: {
-    //         direction: Direction.Up,
-    //       },
-    //     });
+    it("Apply Simple Movement System (Up) on Entity 1 on Accelerator 10 times", async () => {
+      for (let i = 0; i < 10; i++) {
+        let applySystem = await ApplySystem({
+          authority: framework.provider.wallet.publicKey,
+          systemId: framework.systemSimpleMovement.programId,
+          world: framework.worldPda,
+          entities: [
+            {
+              entity: framework.acceleratedEntityPda,
+              components: [
+                { componentId: framework.exampleComponentPosition.programId },
+              ],
+            },
+          ],
+          args: {
+            direction: Direction.Up,
+          },
+        });
 
-    //     await framework.acceleratorProvider.sendAndConfirm(
-    //       applySystem.transaction,
-    //       [],
-    //       {
-    //         skipPreflight: true,
-    //         commitment: "processed",
-    //       },
-    //     );
-    //     // Wait for 50ms
-    //     await new Promise((resolve) => setTimeout(resolve, 50));
-    //   }
-    // });
+        await framework.acceleratorProvider.sendAndConfirm(
+          applySystem.transaction,
+          [],
+          {
+            skipPreflight: true,
+            commitment: "processed",
+          },
+        );
+        // Wait for 50ms
+        await new Promise((resolve) => setTimeout(resolve, 50));
+      }
+    });
   });
 }

From fcdff174b5f943ba08f93970a8599187f512a774 Mon Sep 17 00:00:00 2001
From: Danilo Guanabara <danilo@sensorial.systems>
Date: Thu, 16 Oct 2025 16:28:35 -0300
Subject: [PATCH 5/8] :recycle: Skipping reports profile on CI

---
 .../typescript/test/intermediate-level/ecs.ts | 136 +++++++++---------
 1 file changed, 69 insertions(+), 67 deletions(-)

diff --git a/clients/typescript/test/intermediate-level/ecs.ts b/clients/typescript/test/intermediate-level/ecs.ts
index 6659c711..7a08daf7 100644
--- a/clients/typescript/test/intermediate-level/ecs.ts
+++ b/clients/typescript/test/intermediate-level/ecs.ts
@@ -270,74 +270,76 @@ export function ecs(framework: Framework) {
       expect(position.z.toNumber()).to.equal(300);
     });
 
-    it("Reports profile", async () => {
-      let entitiesPdas: web3.PublicKey[] = [];
-      for (let i = 0; i < 10; i++) {
-        const addEntity = await AddEntity({
-          payer: framework.provider.wallet.publicKey,
-          world: framework.worldPda,
-          connection: framework.provider.connection,
-        });
-        await framework.provider.sendAndConfirm(addEntity.transaction);
-        entitiesPdas.push(addEntity.entityPda);
-      }
-
-      let componentsPdas: web3.PublicKey[] = [];
-      for (let i = 0; i < 10; i++) {
-        const initializeComponent = await InitializeComponent({
-          payer: framework.provider.wallet.publicKey,
-          entity: entitiesPdas[i],
-          componentId: framework.componentSmall.programId,
-        });
-        await framework.provider.sendAndConfirm(
-          initializeComponent.transaction,
-        );
-        componentsPdas.push(initializeComponent.componentPda);
-      }
-
-      let systems = [
-        framework.systemWith1Component.programId,
-        framework.systemWith2Components.programId,
-        framework.systemWith3Components.programId,
-        framework.systemWith4Components.programId,
-        framework.systemWith5Components.programId,
-        framework.systemWith6Components.programId,
-        framework.systemWith7Components.programId,
-        framework.systemWith8Components.programId,
-        framework.systemWith9Components.programId,
-        framework.systemWith10Components.programId,
-      ];
-
-      var reports: any[] = [];
-      for (let i = 0; i < systems.length; i++) {
-        const systemId = systems[i];
-        const applySystem = await ApplySystem({
-          authority: framework.provider.wallet.publicKey,
-          systemId: systemId,
-          world: framework.worldPda,
-          entities: entitiesPdas.slice(0, i + 1).map((entity) => ({
-            entity,
-            components: [{ componentId: framework.componentSmall.programId }],
-          })),
-        });
-
-        let signature = await framework.provider.sendAndConfirm(
-          applySystem.transaction,
-        );
+    if (process.env.GITHUB_ACTIONS !== "true") {
+      it("Reports profile", async () => {
+        let entitiesPdas: web3.PublicKey[] = [];
+        for (let i = 0; i < 10; i++) {
+          const addEntity = await AddEntity({
+            payer: framework.provider.wallet.publicKey,
+            world: framework.worldPda,
+            connection: framework.provider.connection,
+          });
+          await framework.provider.sendAndConfirm(addEntity.transaction);
+          entitiesPdas.push(addEntity.entityPda);
+        }
+
+        let componentsPdas: web3.PublicKey[] = [];
+        for (let i = 0; i < 10; i++) {
+          const initializeComponent = await InitializeComponent({
+            payer: framework.provider.wallet.publicKey,
+            entity: entitiesPdas[i],
+            componentId: framework.componentSmall.programId,
+          });
+          await framework.provider.sendAndConfirm(
+            initializeComponent.transaction,
+          );
+          componentsPdas.push(initializeComponent.componentPda);
+        }
+
+        let systems = [
+          framework.systemWith1Component.programId,
+          framework.systemWith2Components.programId,
+          framework.systemWith3Components.programId,
+          framework.systemWith4Components.programId,
+          framework.systemWith5Components.programId,
+          framework.systemWith6Components.programId,
+          framework.systemWith7Components.programId,
+          framework.systemWith8Components.programId,
+          framework.systemWith9Components.programId,
+          framework.systemWith10Components.programId,
+        ];
+
+        var reports: any[] = [];
+        for (let i = 0; i < systems.length; i++) {
+          const systemId = systems[i];
+          const applySystem = await ApplySystem({
+            authority: framework.provider.wallet.publicKey,
+            systemId: systemId,
+            world: framework.worldPda,
+            entities: entitiesPdas.slice(0, i + 1).map((entity) => ({
+              entity,
+              components: [{ componentId: framework.componentSmall.programId }],
+            })),
+          });
 
-        let transactionResponse: any;
-        do {
-          transactionResponse =
-            await framework.provider.connection.getTransaction(signature, {
-              commitment: "confirmed",
-            });
-        } while (transactionResponse?.meta?.logMessages === undefined);
-        let report = framework.report(transactionResponse?.meta?.logMessages);
-        reports.push(report);
-      }
-
-      framework.saveReport(reports);
-    });
+          let signature = await framework.provider.sendAndConfirm(
+            applySystem.transaction,
+          );
+
+          let transactionResponse: any;
+          do {
+            transactionResponse =
+              await framework.provider.connection.getTransaction(signature, {
+                commitment: "confirmed",
+              });
+          } while (transactionResponse?.meta?.logMessages === undefined);
+          let report = framework.report(transactionResponse?.meta?.logMessages);
+          reports.push(report);
+        }
+
+        framework.saveReport(reports);
+      });
+    }
 
     it("Apply Fly System on Entity 4", async () => {
       const applySystem = await ApplySystem({

From edfb486639c885fadacfc16674ce184f92d660ef Mon Sep 17 00:00:00 2001
From: Danilo Guanabara <danilo@sensorial.systems>
Date: Thu, 16 Oct 2025 17:19:57 -0300
Subject: [PATCH 6/8] :recycle: Adding verbose to bolt test

---
 crates/bolt-cli/src/commands/test.rs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/crates/bolt-cli/src/commands/test.rs b/crates/bolt-cli/src/commands/test.rs
index 36153a70..e96f32c0 100644
--- a/crates/bolt-cli/src/commands/test.rs
+++ b/crates/bolt-cli/src/commands/test.rs
@@ -1,5 +1,5 @@
 use anchor_cli::config::ConfigOverride;
-use anyhow::Result;
+use anyhow::{Context, Result};
 
 use crate::EphemeralValidator;
 
@@ -28,7 +28,14 @@ pub async fn test(
         }
     }
     // Return the actual result when not using the ephemeral validator or if it failed to start.
-    anchor
+    let result = anchor
         .await
         .unwrap_or_else(|e| Err(anyhow::anyhow!("Failed to run anchor: {}", e)))
+        .context("Bolt test failed");
+    if result.is_err() {
+        println!("Something went wrong");
+    } else {
+        println!("Bolt test completed successfully");
+    }
+    result
 }

From b8b6e63debc1846b76a4cc23a9824a58db6e0942 Mon Sep 17 00:00:00 2001
From: Danilo Guanabara <danilo@sensorial.systems>
Date: Sun, 19 Oct 2025 01:37:46 -0300
Subject: [PATCH 7/8] :white_check_mark: Updating actions/checkout to v5

---
 .github/workflows/publish-bolt-crates.yml | 6 +++---
 .github/workflows/publish-bolt-sdk.yml    | 6 +++---
 .github/workflows/publish-packages.yml    | 6 +++---
 .github/workflows/run-lint.yml            | 4 ++--
 .github/workflows/run-tests.yml           | 4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/publish-bolt-crates.yml b/.github/workflows/publish-bolt-crates.yml
index d82a49f8..15d83a6e 100644
--- a/.github/workflows/publish-bolt-crates.yml
+++ b/.github/workflows/publish-bolt-crates.yml
@@ -14,7 +14,7 @@ jobs:
   install:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - uses: actions/cache@v4
         name: cache solana cli
@@ -71,7 +71,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Cache rust
         uses: Swatinem/rust-cache@v2
       - name: Run fmt
@@ -92,7 +92,7 @@ jobs:
       - name: Cache rust
         uses: Swatinem/rust-cache@v2
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Set DRY_RUN based on trigger
         run: echo "DRY_RUN=true" >> $GITHUB_ENV
diff --git a/.github/workflows/publish-bolt-sdk.yml b/.github/workflows/publish-bolt-sdk.yml
index a6fc088d..4d58aadb 100644
--- a/.github/workflows/publish-bolt-sdk.yml
+++ b/.github/workflows/publish-bolt-sdk.yml
@@ -14,7 +14,7 @@ jobs:
   install:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - uses: actions/cache@v4
         name: cache solana cli
@@ -65,7 +65,7 @@ jobs:
     needs: install
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Use Node ${{ matrix.node }}
         uses: actions/setup-node@v4
         with:
@@ -97,7 +97,7 @@ jobs:
       - name: Cache rust
         uses: Swatinem/rust-cache@v2
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Set DRY_RUN based on trigger
         run: echo "DRY_RUN=true" >> $GITHUB_ENV
diff --git a/.github/workflows/publish-packages.yml b/.github/workflows/publish-packages.yml
index 106ae940..e54ac277 100644
--- a/.github/workflows/publish-packages.yml
+++ b/.github/workflows/publish-packages.yml
@@ -64,7 +64,7 @@ jobs:
           }
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set DRY_RUN based on trigger
         shell: bash
@@ -187,7 +187,7 @@ jobs:
     needs: publish-npm-binaries
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Set DRY_RUN based on trigger
         run: echo "DRY_RUN=true" >> $GITHUB_ENV
         if: github.event_name == 'push' && startsWith(github.ref, 'refs/heads/release/v')
@@ -214,7 +214,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set the release version
         shell: bash
diff --git a/.github/workflows/run-lint.yml b/.github/workflows/run-lint.yml
index 70a460fd..6dc8aefa 100644
--- a/.github/workflows/run-lint.yml
+++ b/.github/workflows/run-lint.yml
@@ -14,7 +14,7 @@ jobs:
   setup:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - uses: actions/setup-node@v4
         with:
@@ -54,7 +54,7 @@ jobs:
       matrix:
         task: [clippy, yarn]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Install node modules
         run: |
           yarn --frozen-lockfile --network-concurrency 2
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 2b12cbef..7f5e07f4 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -14,7 +14,7 @@ jobs:
   setup:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - uses: actions/setup-node@v4
         with:
@@ -51,7 +51,7 @@ jobs:
     needs: setup
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable

From 3cb402fe75a44995d96d09bc2387588da8f1fa55 Mon Sep 17 00:00:00 2001
From: Danilo Guanabara <danilo@sensorial.systems>
Date: Sun, 19 Oct 2025 18:52:59 -0300
Subject: [PATCH 8/8] :white_check_mark: FIxing component name to match idl
 file

---
 Cargo.lock                                    | 36 +++++++++----------
 Cargo.toml                                    |  3 +-
 examples/component-small/Cargo.toml           |  4 +--
 examples/escrow-funding/Cargo.toml            |  2 +-
 examples/escrow-funding/src/lib.rs            |  2 +-
 examples/system-with-1-component/Cargo.toml   |  2 +-
 examples/system-with-1-component/src/lib.rs   |  2 +-
 examples/system-with-10-components/Cargo.toml |  2 +-
 examples/system-with-10-components/src/lib.rs |  2 +-
 examples/system-with-2-components/Cargo.toml  |  2 +-
 examples/system-with-2-components/src/lib.rs  |  2 +-
 examples/system-with-3-components/Cargo.toml  |  2 +-
 examples/system-with-3-components/src/lib.rs  |  2 +-
 examples/system-with-4-components/Cargo.toml  |  2 +-
 examples/system-with-4-components/src/lib.rs  |  2 +-
 examples/system-with-5-components/Cargo.toml  |  2 +-
 examples/system-with-5-components/src/lib.rs  |  2 +-
 examples/system-with-6-components/Cargo.toml  |  2 +-
 examples/system-with-6-components/src/lib.rs  |  2 +-
 examples/system-with-7-components/Cargo.toml  |  2 +-
 examples/system-with-7-components/src/lib.rs  |  2 +-
 examples/system-with-8-components/Cargo.toml  |  2 +-
 examples/system-with-8-components/src/lib.rs  |  2 +-
 examples/system-with-9-components/Cargo.toml  |  2 +-
 examples/system-with-9-components/src/lib.rs  |  2 +-
 25 files changed, 43 insertions(+), 44 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 736685d3..b0151bef 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1258,13 +1258,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "component-small"
-version = "0.2.6"
-dependencies = [
- "bolt-lang",
-]
-
 [[package]]
 name = "concurrent-queue"
 version = "2.5.0"
@@ -1847,8 +1840,8 @@ name = "escrow-funding"
 version = "0.2.6"
 dependencies = [
  "bolt-lang",
- "component-small",
  "serde",
+ "small",
 ]
 
 [[package]]
@@ -4230,6 +4223,13 @@ dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "small"
+version = "0.2.6"
+dependencies = [
+ "bolt-lang",
+]
+
 [[package]]
 name = "smallvec"
 version = "1.13.2"
@@ -7079,8 +7079,8 @@ name = "with-1-component"
 version = "0.2.3"
 dependencies = [
  "bolt-lang",
- "component-small",
  "serde",
+ "small",
 ]
 
 [[package]]
@@ -7088,8 +7088,8 @@ name = "with-10-components"
 version = "0.2.3"
 dependencies = [
  "bolt-lang",
- "component-small",
  "serde",
+ "small",
 ]
 
 [[package]]
@@ -7097,8 +7097,8 @@ name = "with-2-components"
 version = "0.2.3"
 dependencies = [
  "bolt-lang",
- "component-small",
  "serde",
+ "small",
 ]
 
 [[package]]
@@ -7106,8 +7106,8 @@ name = "with-3-components"
 version = "0.2.3"
 dependencies = [
  "bolt-lang",
- "component-small",
  "serde",
+ "small",
 ]
 
 [[package]]
@@ -7115,8 +7115,8 @@ name = "with-4-components"
 version = "0.2.3"
 dependencies = [
  "bolt-lang",
- "component-small",
  "serde",
+ "small",
 ]
 
 [[package]]
@@ -7124,8 +7124,8 @@ name = "with-5-components"
 version = "0.2.3"
 dependencies = [
  "bolt-lang",
- "component-small",
  "serde",
+ "small",
 ]
 
 [[package]]
@@ -7133,8 +7133,8 @@ name = "with-6-components"
 version = "0.2.3"
 dependencies = [
  "bolt-lang",
- "component-small",
  "serde",
+ "small",
 ]
 
 [[package]]
@@ -7142,8 +7142,8 @@ name = "with-7-components"
 version = "0.2.3"
 dependencies = [
  "bolt-lang",
- "component-small",
  "serde",
+ "small",
 ]
 
 [[package]]
@@ -7151,8 +7151,8 @@ name = "with-8-components"
 version = "0.2.3"
 dependencies = [
  "bolt-lang",
- "component-small",
  "serde",
+ "small",
 ]
 
 [[package]]
@@ -7160,8 +7160,8 @@ name = "with-9-components"
 version = "0.2.3"
 dependencies = [
  "bolt-lang",
- "component-small",
  "serde",
+ "small",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 0425fd7f..fc13c77f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -34,8 +34,7 @@ bolt-utils = { path = "crates/bolt-lang/utils", version = "=0.2.6" }
 world = { path = "crates/programs/world", features = ["cpi"], version = "=0.2.6"}
 bolt-system = { path = "crates/programs/bolt-system", features = ["cpi"], version = "=0.2.6"}
 bolt-component = { path = "crates/programs/bolt-component", features = ["cpi"], version = "=0.2.6"}
-component-large = { path = "examples/component-large", features = ["cpi"], version = "=0.2.6"}
-component-small = { path = "examples/component-small", features = ["cpi"], version = "=0.2.6"}
+small = { path = "examples/component-small", features = ["cpi"], version = "=0.2.6"}
 
 ## External crates
 session-keys       = { version = "^2", features = ["no-entrypoint"] }
diff --git a/examples/component-small/Cargo.toml b/examples/component-small/Cargo.toml
index 5dfb4fdb..3b497e06 100644
--- a/examples/component-small/Cargo.toml
+++ b/examples/component-small/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
-name = "component-small"
+name = "small"
 version.workspace = true
 description = "Created with Bolt"
 edition = "2021"
 
 [lib]
 crate-type = ["cdylib", "lib"]
-name = "component_small"
+name = "small"
 
 [features]
 no-entrypoint = []
diff --git a/examples/escrow-funding/Cargo.toml b/examples/escrow-funding/Cargo.toml
index f817d213..543f6302 100644
--- a/examples/escrow-funding/Cargo.toml
+++ b/examples/escrow-funding/Cargo.toml
@@ -23,4 +23,4 @@ custom-panic = []
 [dependencies]
 bolt-lang.workspace = true
 serde = { version = "1.0", features = ["derive"] }
-component-small.workspace = true
\ No newline at end of file
+small.workspace = true
\ No newline at end of file
diff --git a/examples/escrow-funding/src/lib.rs b/examples/escrow-funding/src/lib.rs
index 135d4da5..7b8e5a4d 100644
--- a/examples/escrow-funding/src/lib.rs
+++ b/examples/escrow-funding/src/lib.rs
@@ -1,6 +1,6 @@
 use bolt_lang::anchor_lang::*;
 use bolt_lang::*;
-use component_small::Small;
+use small::Small;
 
 declare_id!("4Um2d8SvyfWyLLtfu2iJMFhM77DdjjyQusEy7K3VhPkd");
 
diff --git a/examples/system-with-1-component/Cargo.toml b/examples/system-with-1-component/Cargo.toml
index 2d435fa4..c39d7a21 100644
--- a/examples/system-with-1-component/Cargo.toml
+++ b/examples/system-with-1-component/Cargo.toml
@@ -22,5 +22,5 @@ custom-panic = []
 
 [dependencies]
 bolt-lang.workspace = true
-component-small.workspace = true
+small.workspace = true
 serde.workspace = true
diff --git a/examples/system-with-1-component/src/lib.rs b/examples/system-with-1-component/src/lib.rs
index 655831e5..37c3dfb8 100644
--- a/examples/system-with-1-component/src/lib.rs
+++ b/examples/system-with-1-component/src/lib.rs
@@ -1,5 +1,5 @@
 use bolt_lang::*;
-use component_small::Small;
+use small::Small;
 
 declare_id!("BsVKJF2H9GN1P9WrexdgEY4ztiweKvfQo6ydLWUEw6n7");
 
diff --git a/examples/system-with-10-components/Cargo.toml b/examples/system-with-10-components/Cargo.toml
index 05b396d5..20d697ed 100644
--- a/examples/system-with-10-components/Cargo.toml
+++ b/examples/system-with-10-components/Cargo.toml
@@ -22,5 +22,5 @@ custom-panic = []
 
 [dependencies]
 bolt-lang.workspace = true
-component-small.workspace = true
+small.workspace = true
 serde.workspace = true
diff --git a/examples/system-with-10-components/src/lib.rs b/examples/system-with-10-components/src/lib.rs
index 4997b52f..30e403dd 100644
--- a/examples/system-with-10-components/src/lib.rs
+++ b/examples/system-with-10-components/src/lib.rs
@@ -1,5 +1,5 @@
 use bolt_lang::*;
-use component_small::Small;
+use small::Small;
 
 declare_id!("C69UYWaXBQXUbhHQGtG8pB7DHSgh2z5Sm9ifyAnM1kkt");
 
diff --git a/examples/system-with-2-components/Cargo.toml b/examples/system-with-2-components/Cargo.toml
index 3bd58990..046072e5 100644
--- a/examples/system-with-2-components/Cargo.toml
+++ b/examples/system-with-2-components/Cargo.toml
@@ -22,5 +22,5 @@ custom-panic = []
 
 [dependencies]
 bolt-lang.workspace = true
-component-small.workspace = true
+small.workspace = true
 serde.workspace = true
diff --git a/examples/system-with-2-components/src/lib.rs b/examples/system-with-2-components/src/lib.rs
index 61102e5a..77f12673 100644
--- a/examples/system-with-2-components/src/lib.rs
+++ b/examples/system-with-2-components/src/lib.rs
@@ -1,5 +1,5 @@
 use bolt_lang::*;
-use component_small::Small;
+use small::Small;
 
 declare_id!("X5wTvz1i6ocNXzfrEB8JmhFCniojUZxqk3TXDq98fZX");
 
diff --git a/examples/system-with-3-components/Cargo.toml b/examples/system-with-3-components/Cargo.toml
index 528e5b74..ee48bead 100644
--- a/examples/system-with-3-components/Cargo.toml
+++ b/examples/system-with-3-components/Cargo.toml
@@ -22,5 +22,5 @@ custom-panic = []
 
 [dependencies]
 bolt-lang.workspace = true
-component-small.workspace = true
+small.workspace = true
 serde.workspace = true
diff --git a/examples/system-with-3-components/src/lib.rs b/examples/system-with-3-components/src/lib.rs
index fcf53c13..ae3b166c 100644
--- a/examples/system-with-3-components/src/lib.rs
+++ b/examples/system-with-3-components/src/lib.rs
@@ -1,5 +1,5 @@
 use bolt_lang::*;
-use component_small::Small;
+use small::Small;
 
 declare_id!("9R7rvEwCuZ6iow1Ch3sdUQKib4LBvftyBmyvSnPaAZkG");
 
diff --git a/examples/system-with-4-components/Cargo.toml b/examples/system-with-4-components/Cargo.toml
index 84c7721f..cef1ee05 100644
--- a/examples/system-with-4-components/Cargo.toml
+++ b/examples/system-with-4-components/Cargo.toml
@@ -22,5 +22,5 @@ custom-panic = []
 
 [dependencies]
 bolt-lang.workspace = true
-component-small.workspace = true
+small.workspace = true
 serde.workspace = true
diff --git a/examples/system-with-4-components/src/lib.rs b/examples/system-with-4-components/src/lib.rs
index b3e77e0d..a45c3d2b 100644
--- a/examples/system-with-4-components/src/lib.rs
+++ b/examples/system-with-4-components/src/lib.rs
@@ -1,5 +1,5 @@
 use bolt_lang::*;
-use component_small::Small;
+use small::Small;
 
 declare_id!("2w9pkZoCfEciHLLDhG3zrZRprcYH7nojhyBQMnD3PtUU");
 
diff --git a/examples/system-with-5-components/Cargo.toml b/examples/system-with-5-components/Cargo.toml
index dae3737d..b4580add 100644
--- a/examples/system-with-5-components/Cargo.toml
+++ b/examples/system-with-5-components/Cargo.toml
@@ -22,5 +22,5 @@ custom-panic = []
 
 [dependencies]
 bolt-lang.workspace = true
-component-small.workspace = true
+small.workspace = true
 serde.workspace = true
diff --git a/examples/system-with-5-components/src/lib.rs b/examples/system-with-5-components/src/lib.rs
index e93db98e..dcf3e023 100644
--- a/examples/system-with-5-components/src/lib.rs
+++ b/examples/system-with-5-components/src/lib.rs
@@ -1,5 +1,5 @@
 use bolt_lang::*;
-use component_small::Small;
+use small::Small;
 
 declare_id!("8KsdHMGdS4mQjpKFhc2PWBw2tyxwNbEKCnZLKp3riC5o");
 
diff --git a/examples/system-with-6-components/Cargo.toml b/examples/system-with-6-components/Cargo.toml
index ad55f34a..2e40f263 100644
--- a/examples/system-with-6-components/Cargo.toml
+++ b/examples/system-with-6-components/Cargo.toml
@@ -22,5 +22,5 @@ custom-panic = []
 
 [dependencies]
 bolt-lang.workspace = true
-component-small.workspace = true
+small.workspace = true
 serde.workspace = true
diff --git a/examples/system-with-6-components/src/lib.rs b/examples/system-with-6-components/src/lib.rs
index 81e50f16..b302158e 100644
--- a/examples/system-with-6-components/src/lib.rs
+++ b/examples/system-with-6-components/src/lib.rs
@@ -1,5 +1,5 @@
 use bolt_lang::*;
-use component_small::Small;
+use small::Small;
 
 declare_id!("3ndvNAg4moKeLhuWQtDmcN43PuvvGsigQWRBPthfWEN3");
 
diff --git a/examples/system-with-7-components/Cargo.toml b/examples/system-with-7-components/Cargo.toml
index fcaef097..47ce10a9 100644
--- a/examples/system-with-7-components/Cargo.toml
+++ b/examples/system-with-7-components/Cargo.toml
@@ -22,5 +22,5 @@ custom-panic = []
 
 [dependencies]
 bolt-lang.workspace = true
-component-small.workspace = true
+small.workspace = true
 serde.workspace = true
diff --git a/examples/system-with-7-components/src/lib.rs b/examples/system-with-7-components/src/lib.rs
index 429bcf6e..0df61cf1 100644
--- a/examples/system-with-7-components/src/lib.rs
+++ b/examples/system-with-7-components/src/lib.rs
@@ -1,5 +1,5 @@
 use bolt_lang::*;
-use component_small::Small;
+use small::Small;
 
 declare_id!("4ESiD77Gjjfuywhw8NBnryHezXtwDSA27ustL29JdX7i");
 
diff --git a/examples/system-with-8-components/Cargo.toml b/examples/system-with-8-components/Cargo.toml
index 9bdd1c7b..ba2bd1e9 100644
--- a/examples/system-with-8-components/Cargo.toml
+++ b/examples/system-with-8-components/Cargo.toml
@@ -22,5 +22,5 @@ custom-panic = []
 
 [dependencies]
 bolt-lang.workspace = true
-component-small.workspace = true
+small.workspace = true
 serde.workspace = true
diff --git a/examples/system-with-8-components/src/lib.rs b/examples/system-with-8-components/src/lib.rs
index 9d34267b..cc2dd7e6 100644
--- a/examples/system-with-8-components/src/lib.rs
+++ b/examples/system-with-8-components/src/lib.rs
@@ -1,5 +1,5 @@
 use bolt_lang::*;
-use component_small::Small;
+use small::Small;
 
 declare_id!("EbTAEnrVV4f8W7Fd4TxW3jLjfpyhr74wQf7rSHRQ8u78");
 
diff --git a/examples/system-with-9-components/Cargo.toml b/examples/system-with-9-components/Cargo.toml
index a4d4dfbc..d9c51724 100644
--- a/examples/system-with-9-components/Cargo.toml
+++ b/examples/system-with-9-components/Cargo.toml
@@ -22,5 +22,5 @@ custom-panic = []
 
 [dependencies]
 bolt-lang.workspace = true
-component-small.workspace = true
+small.workspace = true
 serde.workspace = true
diff --git a/examples/system-with-9-components/src/lib.rs b/examples/system-with-9-components/src/lib.rs
index f051597a..636e0d3e 100644
--- a/examples/system-with-9-components/src/lib.rs
+++ b/examples/system-with-9-components/src/lib.rs
@@ -1,5 +1,5 @@
 use bolt_lang::*;
-use component_small::Small;
+use small::Small;
 
 declare_id!("GKdPXW7pGhFNRdMPHWNsrmqc7haXQk4VFCAyZKsrgYQG");