♻️ Removing bolt-component and bolt-system

Author: notdanilo

.github/workflows/publish-bolt-crates.yml

@@ -180,8 +180,6 @@ jobs:
             -p bolt-cli \
             -p bolt-lang \
             -p bolt-utils \
-            -p bolt-system \
-            -p bolt-component \
             -p bolt-attribute-bolt-arguments \
             -p bolt-attribute-bolt-bundle \
             -p bolt-attribute-bolt-component \

Anchor.toml

@@ -8,8 +8,6 @@ skip-lint = false
 world = "WorLD15A7CrDwLcLy4fRqtaTb9fbd8o8iqiEMUDse2n"
 
 [programs.localnet]
-bolt-component = "CmP2djJgABZ4cRokm4ndxuq6LerqpNHLBsaUv2XKEJua"
-bolt-system = "7X4EFsDJ5aYTcEjKzJ94rD8FRKgQeXC89fkpeTS4KaqP"
 component-small = "9yBADAhoTWCkNRB6hbfpwUgPpxyJiF9uEiWVPR6k7A4y"
 escrow-funding = "4Um2d8SvyfWyLLtfu2iJMFhM77DdjjyQusEy7K3VhPkd"
 example-bundle = "CgfPBUeDUL3GT6b5AUDFE56KKgU4ycWA9ERjEWsfMZCj"
@@ -37,7 +35,7 @@ cluster = "localnet"
 wallet = "./tests/fixtures/provider.json"
 
 [workspace]
-members = ["crates/programs/bolt-component", "crates/programs/bolt-system", "crates/programs/world", "examples/component-position", "examples/component-velocity", "examples/system-apply-velocity", "examples/system-fly", "examples/system-simple-movement", "examples/component-small", "examples/system-with-1-component", "examples/system-with-2-components", "examples/system-with-3-components", "examples/system-with-4-components", "examples/system-with-5-components", "examples/system-with-6-components", "examples/system-with-7-components", "examples/system-with-8-components", "examples/system-with-9-components", "examples/system-with-10-components", "examples/escrow-funding", "examples/bundle"]
+members = ["crates/programs/world", "examples/component-position", "examples/component-velocity", "examples/system-apply-velocity", "examples/system-fly", "examples/system-simple-movement", "examples/component-small", "examples/system-with-1-component", "examples/system-with-2-components", "examples/system-with-3-components", "examples/system-with-4-components", "examples/system-with-5-components", "examples/system-with-6-components", "examples/system-with-7-components", "examples/system-with-8-components", "examples/system-with-9-components", "examples/system-with-10-components", "examples/escrow-funding", "examples/bundle"]
 
 [scripts]
 test = "tests/script.sh"

Cargo.lock

@@ -3,8 +3,6 @@ resolver = "2"
 members = [
     "crates/bolt-cli",
     "crates/bolt-lang",
-    "crates/programs/bolt-component",
-    "crates/programs/bolt-system",
     "crates/programs/world",
     "crates/types",
     "examples/*",
@@ -34,8 +32,6 @@ bolt-attribute-bolt-component-deserialize = { path = "crates/bolt-lang/attribute
 bolt-attribute-bolt-component-id = { path = "crates/bolt-lang/attribute/component-id", version = "=0.2.6" }
 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"}
 

Cargo.toml

@@ -51,7 +51,7 @@ public static Solana.Unity.Rpc.Models.TransactionInstruction ApplySystem(
 
         /// <summary>
         /// Apply a bundled system and/or bundled components by name, mirroring TS client behavior.
-        /// - If systemId is a bundled System (program + name), we use "global:bolt_execute_{name}" discriminator.
+        /// - If systemId is a bundled System (program + name), we use "global:{name}_bolt_execute" discriminator.
         /// - For each component, if provided as bundled Component (program + name), we:
         ///   * use the component name as the PDA seed and
         ///   * build the component-specific update discriminator (name + _update or _update_with_session).

clients/csharp/Solana.Unity.Bolt/WorldProgram/Bolt/ApplySystem.cs

@@ -13,10 +13,6 @@ export class Component extends Identifier {
       : new Component(componentId);
   }
 
-  getMethodDiscriminator(method: string): string {
-    return "global:" + (this.name ? this.name + "_" : "") + method;
-  }
-
   pda(entity: PublicKey, seed?: string): PublicKey {
     return FindComponentPda({
       componentId: this.program,

clients/typescript/src/ecs/component.ts

@@ -8,4 +8,8 @@ export class Identifier {
     this.program = program;
     this.name = name;
   }
+
+  getMethodDiscriminator(method: string): string {
+    return "global:" + (this.name ? this.name + "_" : "") + method;
+  }
 }

clients/typescript/src/ecs/identifier.ts

@@ -2,7 +2,11 @@ import { PublicKey } from "@solana/web3.js";
 import { Identifier } from "./identifier";
 
 export class System extends Identifier {
-  constructor(program: PublicKey, name: string) {
+  constructor(program: PublicKey, name?: string) {
     super(program, name);
   }
+
+  static from(systemId: PublicKey | System): System {
+    return systemId instanceof System ? systemId : new System(systemId);
+  }
 }

clients/typescript/src/ecs/system.ts

@@ -463,6 +463,7 @@ async function createApplySystemInstruction({
   extraAccounts,
   args,
 }: ApplySystemInstruction): Promise<web3.TransactionInstruction> {
+  let system = System.from(systemId);
   const program = new Program(
     worldIdl as Idl,
   ) as unknown as Program<WorldProgram>;
@@ -516,21 +517,14 @@ async function createApplySystemInstruction({
   // Build discriminators per component in order of remaining accounts pairs
   const discriminators: Buffer[] = components.map((component) =>
     Buffer.from(
-      GetDiscriminator(
-        "global:" +
-          (component.name ? component.name + "_" : "") +
-          (session ? "update_with_session" : "update"),
+      Component.from(component.id).getMethodDiscriminator(
+        session ? "update_with_session" : "update",
       ),
     ),
   );
 
   const systemDiscriminator = Buffer.from(
-    GetDiscriminator(
-      "global:" +
-        (systemId instanceof System
-          ? `bolt_execute_${systemId.name}`
-          : "bolt_execute"),
-    ),
+    system.getMethodDiscriminator("bolt_execute"),
   );
 
   if (session)
@@ -542,7 +536,7 @@ async function createApplySystemInstruction({
       )
       .accounts({
         authority: authority ?? PROGRAM_ID,
-        boltSystem: systemId instanceof System ? systemId.program : systemId,
+        boltSystem: system.program,
         sessionToken: session.token,
         world,
         cpiAuth: CPI_AUTH_ADDRESS,
@@ -554,7 +548,7 @@ async function createApplySystemInstruction({
       .apply(systemDiscriminator, discriminators, SerializeArgs(args))
       .accounts({
         authority: authority ?? PROGRAM_ID,
-        boltSystem: systemId instanceof System ? systemId.program : systemId,
+        boltSystem: system.program,
         world,
         cpiAuth: CPI_AUTH_ADDRESS,
       })

clients/typescript/src/world/transactions.ts

@@ -161,9 +161,7 @@ export function ecs(framework: Framework) {
           direction: Direction.Up,
         },
       });
-      await framework.provider.sendAndConfirm(applySystem.transaction, [], {
-        skipPreflight: true,
-      });
+      await framework.provider.sendAndConfirm(applySystem.transaction);
 
       const position =
         await framework.exampleComponentPosition.account.position.fetch(