♻️ Authority & Session checks

Author: notdanilo

Cargo.lock

@@ -62,6 +62,7 @@ which = "^7"
 tokio = { version = "^1", features = ["full"] }
 sysinfo = "^0"
 bytemuck_derive = "^1"
+sha2 = { version = "^0.10" }
 
 [profile.release]
 overflow-checks = true

Cargo.toml

@@ -11,7 +11,8 @@ import gpl_session from "./idl/gpl_session.json";
 export * from "./accounts";
 export * from "./errors";
 export * from "./instructions";
-export * from "./types";
+// Re-export the IDL type under a distinct name to avoid name collisions with account types
+export type { World as WorldIdl } from "./types";
 
 /**
  * Program address

clients/typescript/src/generated/index.ts

@@ -27,7 +27,7 @@ import {
   Transaction,
   type TransactionInstruction,
 } from "@solana/web3.js";
-import type WorldProgram from "../generated";
+import type { World as WorldProgram } from "../generated/types/world";
 import {
   createInitializeRegistryInstruction,
   PROGRAM_ID,
@@ -155,9 +155,7 @@ export async function AddAuthority({
   instruction: TransactionInstruction;
   transaction: Transaction;
 }> {
-  const program = new Program(
-    worldIdl as Idl,
-  ) as unknown as Program<WorldProgram>;
+  const program = new Program(worldIdl as Idl) as unknown as Program;
   const worldInstance = await World.fromAccountAddress(connection, world);
   const worldId = new BN(worldInstance.id);
   const instruction = await program.methods
@@ -197,9 +195,7 @@ export async function RemoveAuthority({
   instruction: TransactionInstruction;
   transaction: Transaction;
 }> {
-  const program = new Program(
-    worldIdl as Idl,
-  ) as unknown as Program<WorldProgram>;
+  const program = new Program(worldIdl as Idl) as unknown as Program;
   const worldInstance = await World.fromAccountAddress(connection, world);
   const worldId = new BN(worldInstance.id);
   const instruction = await program.methods
@@ -236,9 +232,7 @@ export async function ApproveSystem({
   instruction: TransactionInstruction;
   transaction: Transaction;
 }> {
-  const program = new Program(
-    worldIdl as Idl,
-  ) as unknown as Program<WorldProgram>;
+  const program = new Program(worldIdl as Idl) as unknown as Program;
   const instruction = await program.methods
     .approveSystem()
     .accounts({
@@ -273,9 +267,7 @@ export async function RemoveSystem({
   instruction: TransactionInstruction;
   transaction: Transaction;
 }> {
-  const program = new Program(
-    worldIdl as Idl,
-  ) as unknown as Program<WorldProgram>;
+  const program = new Program(worldIdl as Idl) as unknown as Program;
   const instruction = await program.methods
     .removeSystem()
     .accounts({
@@ -359,9 +351,7 @@ export async function DestroyComponent({
   instruction: TransactionInstruction;
   transaction: Transaction;
 }> {
-  const program = new Program(
-    worldIdl as Idl,
-  ) as unknown as Program<WorldProgram>;
+  const program = new Program(worldIdl as Idl) as unknown as Program;
   const componentProgramData = FindComponentProgramDataPda({
     programId: componentId,
   });
@@ -450,9 +440,7 @@ async function createApplySystemInstruction({
   extraAccounts,
   args,
 }: ApplySystemInstruction): Promise<web3.TransactionInstruction> {
-  const program = new Program(
-    worldIdl as Idl,
-  ) as unknown as Program<WorldProgram>;
+  const program = new Program(worldIdl as Idl) as unknown as Program;
   let componentCount = 0;
   entities.forEach(function (entity) {
     componentCount += entity.components.length;

clients/typescript/src/world/transactions.ts

@@ -12,7 +12,7 @@ import { type Velocity } from "../../../target/types/velocity";
 import { type SystemSimpleMovement } from "../../../target/types/system_simple_movement";
 import { type SystemFly } from "../../../target/types/system_fly";
 import { type SystemApplyVelocity } from "../../../target/types/system_apply_velocity";
-import { Connection, Keypair, PublicKey } from "@solana/web3.js";
+import { Connection, Keypair, PublicKey, Transaction } from "@solana/web3.js";
 
 export class Framework {
   provider: anchor.AnchorProvider;
@@ -57,4 +57,8 @@ export class Framework {
       anchor.Wallet.local(),
     );
   }
+
+  async sendAndConfirm(transaction: Transaction) {
+    return this.provider.sendAndConfirm(transaction);
+  }
 }

clients/typescript/test/framework.ts

@@ -222,9 +222,6 @@ export function ecs(framework) {
       expect(position.z.toNumber()).to.equal(0);
     });
 
-    // FIXME: Remove this.
-    return;
-
     it("Apply Simple Movement System (Right) on Entity 1", async () => {
       const instruction = await framework.worldProgram.methods
         .apply(SerializeArgs({ direction: Direction.Right }))

clients/typescript/test/low-level/ecs.ts

@@ -8,6 +8,6 @@ describe("Low level API", () => {
   const framework: Framework = new Framework();
   world(framework);
   ecs(framework);
-  // session(framework);
-  // permissioning(framework);
+  session(framework);
+  permissioning(framework);
 });

clients/typescript/test/low-level/index.ts

@@ -5,6 +5,7 @@ import {
   FindComponentPda,
   SerializeArgs,
   CPI_AUTH_ADDRESS,
+  FindBufferPda,
 } from "../../../lib";
 import { assert, expect } from "chai";
 
@@ -65,6 +66,7 @@ export function component(framework) {
       const instruction = await framework.worldProgram.methods
         .apply(SerializeArgs())
         .accounts({
+          buffer: FindBufferPda(),
           authority: keypair.publicKey,
           boltSystem: framework.systemFly.programId,
           world: framework.worldPda,
@@ -115,6 +117,7 @@ export function component(framework) {
       const instruction = await framework.worldProgram.methods
         .apply(SerializeArgs())
         .accounts({
+          buffer: FindBufferPda(),
           authority: framework.provider.wallet.publicKey,
           boltSystem: framework.systemFly.programId,
           world: framework.worldPda,

clients/typescript/test/low-level/permissioning/component.ts

@@ -1,5 +1,10 @@
 import { expect } from "chai";
-import { anchor, CPI_AUTH_ADDRESS, SerializeArgs } from "../../../lib";
+import {
+  anchor,
+  CPI_AUTH_ADDRESS,
+  FindBufferPda,
+  SerializeArgs,
+} from "../../../lib";
 
 export function world(framework) {
   describe("World authority", () => {
@@ -118,6 +123,7 @@ export function world(framework) {
       const instruction = await framework.worldProgram.methods
         .apply(SerializeArgs())
         .accounts({
+          buffer: FindBufferPda(),
           authority: framework.provider.wallet.publicKey,
           boltSystem: framework.systemFly.programId,
           world: framework.worldPda,
@@ -166,6 +172,7 @@ export function world(framework) {
       const instruction = await framework.worldProgram.methods
         .apply(SerializeArgs())
         .accounts({
+          buffer: FindBufferPda(),
           authority: framework.provider.wallet.publicKey,
           boltSystem: framework.systemFly.programId,
           world: framework.worldPda,

clients/typescript/test/low-level/permissioning/world.ts

@@ -8,6 +8,7 @@ import {
   FindSessionTokenPda,
   BN,
   CPI_AUTH_ADDRESS,
+  FindBufferPda,
 } from "../../lib";
 import { Keypair } from "@solana/web3.js";
 
@@ -90,6 +91,7 @@ export function session(framework) {
       const instruction = await framework.worldProgram.methods
         .applyWithSession(SerializeArgs())
         .accounts({
+          buffer: FindBufferPda(),
           authority: sessionSigner.publicKey,
           boltSystem: framework.systemFly.programId,
           world: framework.worldPda,
@@ -179,6 +181,7 @@ export function session(framework) {
       const instruction = await framework.worldProgram.methods
         .applyWithSession(SerializeArgs())
         .accounts({
+          buffer: FindBufferPda(),
           authority: sessionSigner.publicKey,
           boltSystem: framework.systemFly.programId,
           world: framework.worldPda,