merge-conflicts

magicblock-labs · Jun 14, 2024 · 57727de · 57727de
2 parents cbdcd22 + 03a585c
commit 57727de
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 7 deletions.
diff --git a/clients/bolt-sdk/.crates/.crates.toml b/clients/bolt-sdk/.crates/.crates.toml
diff --git a/clients/bolt-sdk/.crates/.crates2.json b/clients/bolt-sdk/.crates/.crates2.json
diff --git a/clients/bolt-sdk/.crates/bin/anchor b/clients/bolt-sdk/.crates/bin/anchor
diff --git a/clients/bolt-sdk/.gitignore b/clients/bolt-sdk/.gitignore
@@ -1 +1,2 @@
 lib
+.crates
diff --git a/clients/bolt-sdk/src/index.ts b/clients/bolt-sdk/src/index.ts
@@ -41,13 +41,12 @@ export function FindEntityPda(
   worldId = CastToBN(worldId);
   entityId = CastToBN(entityId);
   const worldIdBuffer = Buffer.from(worldId.toArrayLike(Buffer, "be", 8));
-  const entityIdBuffer = Buffer.from(entityId.toArrayLike(Buffer, "be", 8));
   const seeds = [Buffer.from("entity"), worldIdBuffer];
   if (extraSeed != null) {
     seeds.push(Buffer.from(new Uint8Array(8)));
     seeds.push(Buffer.from(extraSeed));
   } else {
-    seeds.push(entityIdBuffer);
+    seeds.push(Buffer.from(entityId.toArrayLike(Buffer, "be", 8)));
   }
   return PublicKey.findProgramAddressSync(seeds, programId)[0];
 }

diff --git a/clients/bolt-sdk/src/world/transactions.ts b/clients/bolt-sdk/src/world/transactions.ts
@@ -71,7 +71,8 @@ export async function AddEntity({
   const worldInstance = await World.fromAccountAddress(connection, world);
   const entityPda = FindEntityPda(
     new BN(worldInstance.id),
-    new BN(worldInstance.entities)
+    new BN(worldInstance.entities),
+    seed
   );
   const createEntityIx = createAddEntityInstruction(
     {
@@ -121,6 +122,7 @@ export async function InitializeComponent({
     authority: authority ?? PROGRAM_ID,
     instructionSysvarAccount: SYSVAR_INSTRUCTIONS_PUBKEY,
     anchorRemainingAccounts,
+    instructionSysvarAccount: SYSVAR_INSTRUCTIONS_PUBKEY,
   });
 
   return {
@@ -170,7 +172,7 @@ function createApplySystemInstruction({
   }
 
   const instructionArgs = {
-    authority,
+    authority: authority ?? PROGRAM_ID,
     boltSystem: systemId,
     instructionSysvarAccount: SYSVAR_INSTRUCTIONS_PUBKEY,
     anchorRemainingAccounts: extraAccounts,