✨ Adding low and intermediate api-levels

Anchor.toml

@@ -36,7 +36,14 @@ members = [
 ]
 
 [scripts]
-test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/bolt.ts"
+test = """
+echo "Waiting for 2 seconds..."
+sleep 2
+echo "Running low level API tests..."
+yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/bolt.low-level.api.ts
+echo "Running intermediate level API tests..."
+yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/bolt.intermediate-level.api.ts
+"""
 
 [test]
 startup_wait = 5000

clients/bolt-sdk/src/generated/idl/world.json

@@ -2,7 +2,7 @@
   "address": "WorLD15A7CrDwLcLy4fRqtaTb9fbd8o8iqiEMUDse2n",
   "metadata": {
     "name": "world",
-    "version": "0.1.12",
+    "version": "0.2.0",
     "spec": "0.1.0",
     "description": "Bolt World program",
     "repository": "https://github.com/magicblock-labs/bolt"

clients/bolt-sdk/src/generated/types/index.ts

@@ -0,0 +1 @@
+export * from "./world";

clients/bolt-sdk/src/generated/types/world.ts

@@ -8,7 +8,7 @@ export type World = {
   address: "WorLD15A7CrDwLcLy4fRqtaTb9fbd8o8iqiEMUDse2n";
   metadata: {
     name: "world";
-    version: "0.1.12";
+    version: "0.2.0";
     spec: "0.1.0";
     description: "Bolt World program";
     repository: "https://github.com/magicblock-labs/bolt";

clients/bolt-sdk/src/index.ts

@@ -1,6 +1,7 @@
 import { PublicKey } from "@solana/web3.js";
 import type BN from "bn.js";
-import { PROGRAM_ID } from "./generated";
+import { PROGRAM_ID as WORLD_PROGRAM_ID } from "./generated";
+import { World as WORLD_PROGRAM_IDL } from "./generated/types";
 export * from "./generated/accounts";
 export * from "./generated/instructions";
 export * from "./world/transactions";
@@ -12,6 +13,7 @@ export { DELEGATION_PROGRAM_ID } from "@magicblock-labs/ephemeral-rollups-sdk";
 import * as anchor from "@coral-xyz/anchor";
 export { anchor };
 export { Provider, Program, Wallet, web3, workspace } from "@coral-xyz/anchor";
+export { WORLD_PROGRAM_ID, WORLD_PROGRAM_IDL };
 
 export const SYSVAR_INSTRUCTIONS_PUBKEY = new PublicKey(
   "Sysvar1nstructions1111111111111111111111111",
@@ -20,7 +22,7 @@ export const SYSVAR_INSTRUCTIONS_PUBKEY = new PublicKey(
 export function FindRegistryPda({ programId }: { programId?: PublicKey }) {
   return PublicKey.findProgramAddressSync(
     [Buffer.from("registry")],
-    programId ?? PROGRAM_ID,
+    programId ?? WORLD_PROGRAM_ID,
   )[0];
 }
 
@@ -34,7 +36,7 @@ export function FindWorldPda({
   const idBuffer = Buffer.from(worldId.toArrayLike(Buffer, "be", 8));
   return PublicKey.findProgramAddressSync(
     [Buffer.from("world"), idBuffer],
-    programId ?? PROGRAM_ID,
+    programId ?? WORLD_PROGRAM_ID,
   )[0];
 }
 
@@ -60,9 +62,13 @@ export function FindEntityPda({
   } else {
     throw new Error("An entity must have either an Id or a Seed");
   }
-  return PublicKey.findProgramAddressSync(seeds, programId ?? PROGRAM_ID)[0];
+  return PublicKey.findProgramAddressSync(
+    seeds,
+    programId ?? WORLD_PROGRAM_ID,
+  )[0];
 }
 
+// TODO: seed must be Uint8Array like the other FindPda functions
 export function FindComponentPda({
   componentId,
   entity,

clients/bolt-sdk/src/world/transactions.ts

@@ -21,11 +21,34 @@ import {
   type TransactionInstruction,
 } from "@solana/web3.js";
 import type WorldProgram from "../generated";
-import { PROGRAM_ID, worldIdl } from "../generated";
+import {
+  createInitializeRegistryInstruction,
+  PROGRAM_ID,
+  worldIdl,
+} from "../generated";
 import { type Idl, Program } from "@coral-xyz/anchor";
 
 const MAX_COMPONENTS = 5;
 
+export async function InitializeRegistry({
+  payer,
+  connection,
+}: {
+  payer: PublicKey;
+  connection: Connection;
+}): Promise<{
+  instruction: TransactionInstruction;
+  transaction: Transaction;
+}> {
+  const registry = FindRegistryPda({});
+  const instruction = createInitializeRegistryInstruction({ registry, payer });
+  const transaction = new Transaction().add(instruction);
+  return {
+    instruction,
+    transaction,
+  };
+}
+
 /**
  * Create the transaction to Initialize a new world
  * @param payer
@@ -311,47 +334,6 @@ export async function InitializeComponent({
   };
 }
 
-export async function Apply({
-  authority,
-  boltSystem,
-  boltComponent,
-  componentProgram,
-  anchorRemainingAccounts,
-  world,
-  args,
-}: {
-  authority: PublicKey;
-  boltSystem: PublicKey;
-  boltComponent: PublicKey;
-  componentProgram: PublicKey;
-  world: PublicKey;
-  anchorRemainingAccounts?: web3.AccountMeta[];
-  args: Uint8Array;
-}): Promise<{
-  instruction: TransactionInstruction;
-  transaction: Transaction;
-}> {
-  const instruction = createApplyInstruction(
-    {
-      authority,
-      boltSystem,
-      boltComponent,
-      componentProgram,
-      instructionSysvarAccount: SYSVAR_INSTRUCTIONS_PUBKEY,
-      anchorRemainingAccounts,
-      world,
-    },
-    {
-      args,
-    },
-  );
-  const transaction = new Transaction().add(instruction);
-  return {
-    instruction,
-    transaction,
-  };
-}
-
 interface ApplySystemInstruction {
   authority: PublicKey;
   systemId: PublicKey;
@@ -398,7 +380,6 @@ async function createApplySystemInstruction({
   const applyAccounts = {
     authority: authority ?? PROGRAM_ID,
     boltSystem: systemId,
-    instructionSysvarAccount: SYSVAR_INSTRUCTIONS_PUBKEY,
     world,
   };
 

crates/programs/bolt-component/Cargo.toml

@@ -24,5 +24,5 @@ custom-heap = []
 custom-panic = []
 
 [dependencies]
-anchor-lang = { workspace = true }
-bolt-system = { workspace = true, cpi = true }
+anchor-lang.workspace = true
+bolt-system.workspace = true

crates/programs/bolt-system/Cargo.toml

@@ -24,5 +24,5 @@ custom-heap = []
 custom-panic = []
 
 [dependencies]
-anchor-lang = { workspace = true }
-bolt-helpers-system-template = { workspace = true, cpi = true }
+anchor-lang.workspace = true
+bolt-helpers-system-template.workspace = true

crates/programs/world/Cargo.toml

@@ -24,10 +24,10 @@ custom-heap = []
 custom-panic = []
 
 [dependencies]
-anchor-lang = { workspace = true }
-bolt-component = { workspace = true, cpi = true }
-bolt-helpers-world-apply = { workspace = true }
-bolt-system = { workspace = true, cpi = true }
-solana-security-txt = { workspace = true }
-tuple-conv = { workspace = true }
+anchor-lang.workspace = true
+bolt-component.workspace = true
+bolt-helpers-world-apply.workspace = true
+bolt-system.workspace = true
+solana-security-txt.workspace = true
+tuple-conv.workspace = true
 

tests/bolt.ts → tests/bolt.intermediate-level.api.ts

@@ -3,16 +3,14 @@ import { type Position } from "../target/types/position";
 import { type Velocity } from "../target/types/velocity";
 import { type BoltComponent } from "../target/types/bolt_component";
 import { type SystemSimpleMovement } from "../target/types/system_simple_movement";
-import { type World } from "../target/types/world";
 import { type SystemFly } from "../target/types/system_fly";
 import { type SystemApplyVelocity } from "../target/types/system_apply_velocity";
 import { expect } from "chai";
 import type BN from "bn.js";
 import {
   AddEntity,
-  createInitializeRegistryInstruction,
   DELEGATION_PROGRAM_ID,
-  FindRegistryPda,
+  InitializeRegistry,
   InitializeComponent,
   InitializeNewWorld,
   ApplySystem,
@@ -24,6 +22,7 @@ import {
   type Program,
   anchor,
   web3,
+  WORLD_PROGRAM_IDL as World,
 } from "../clients/bolt-sdk";
 
 enum Direction {
@@ -106,13 +105,15 @@ describe("bolt", () => {
   const secondAuthority = Keypair.generate().publicKey;
 
   it("InitializeRegistry", async () => {
-    const registryPda = FindRegistryPda({});
-    const initializeRegistryIx = createInitializeRegistryInstruction({
-      registry: registryPda,
+    const initializeRegistry = await InitializeRegistry({
       payer: provider.wallet.publicKey,
+      connection: provider.connection,
     });
-    const tx = new anchor.web3.Transaction().add(initializeRegistryIx);
-    await provider.sendAndConfirm(tx);
+    try {
+      await provider.sendAndConfirm(initializeRegistry.transaction);
+    } catch (error) {
+      // This is expected to fail because the registry already exists if another api level test ran before
+    }
   });
 
   it("InitializeNewWorld", async () => {
@@ -216,7 +217,7 @@ describe("bolt", () => {
     const addEntity = await AddEntity({
       payer: provider.wallet.publicKey,
       world: worldPda,
-      seed: Buffer.from("extra-seed"),
+      seed: Buffer.from("custom-seed"),
       connection: provider.connection,
     });
     await provider.sendAndConfirm(addEntity.transaction);
@@ -325,9 +326,7 @@ describe("bolt", () => {
         },
       ],
       world: worldPda,
-      args: {
-        direction: Direction.Up,
-      },
+      args: { direction: Direction.Up },
     });
 
     await provider.sendAndConfirm(apply.transaction);