✨ Bundled components are optionally delegateable

Author: notdanilo

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

@@ -185,7 +185,6 @@ jobs:
             -p bolt-attribute-bolt-component \
             -p bolt-attribute-bolt-component-deserialize \
             -p bolt-attribute-bolt-component-id \
-            -p bolt-attribute-bolt-delegate \
             -p bolt-attribute-bolt-extra-accounts \
             -p bolt-attribute-bolt-system \
             -p bolt-attribute-bolt-system-input

Cargo.lock

@@ -22,7 +22,6 @@ bolt-lang = { path = "crates/bolt-lang", version = "=0.2.6" }
 bolt-attribute = { path = "crates/bolt-lang/attribute", version = "=0.2.6" }
 bolt-attribute-bolt-bundle = { path = "crates/bolt-lang/attribute/bundle", version = "=0.2.6" }
 bolt-attribute-bolt-program = { path = "crates/bolt-lang/attribute/bolt-program", version = "=0.2.6" }
-bolt-attribute-bolt-delegate = { path = "crates/bolt-lang/attribute/delegate", version = "=0.2.6" }
 bolt-attribute-bolt-component = { path = "crates/bolt-lang/attribute/component", version = "=0.2.6" }
 bolt-attribute-bolt-system = { path = "crates/bolt-lang/attribute/system", version = "=0.2.6"}
 bolt-attribute-bolt-system-input = { path = "crates/bolt-lang/attribute/system-input", version = "=0.2.6" }
@@ -63,6 +62,7 @@ tokio = { version = "^1", features = ["full"] }
 sysinfo = "=0.36.1"
 bytemuck_derive = "^1"
 const-crypto = "0.3.0"
+sha2 = "^0.10"
 
 [profile.release]
 overflow-checks = true

Cargo.toml

@@ -33,12 +33,7 @@ public static async Task<DelegateComponentInstruction> DelegateComponent(PublicK
 			byte[] commitFrequencyBytes = BitConverter.GetBytes(commitFrequencyMs); // little-endian on most platforms
 			byte[] validatorNoneTag = new byte[] { 0 }; // COption None
 
-			// pdaSeeds = [seedBytes, entityPubkeyBytes]
-			var seedBytes = Encoding.UTF8.GetBytes(seed ?? "");
-			var entityBytes = entity.KeyBytes;
-			byte[] pdaSeeds = BuildVecOfBytes(new byte[][] { seedBytes, entityBytes });
-
-			var data = Concat(discriminator, commitFrequencyBytes, validatorNoneTag, pdaSeeds);
+			var data = Concat(discriminator, commitFrequencyBytes, validatorNoneTag);
 
 			TransactionInstruction instruction = new TransactionInstruction() {
 				ProgramId = componentId,
@@ -76,11 +71,7 @@ public static async Task<DelegateComponentInstruction> DelegateComponent(PublicK
 			byte[] commitFrequencyBytes = BitConverter.GetBytes(commitFrequencyMs);
 			byte[] validatorNoneTag = new byte[] { 0 };
 
-			var seedBytes = Encoding.UTF8.GetBytes(component.Seeds(seed));
-			var entityBytes = entity.KeyBytes;
-			byte[] pdaSeeds = BuildVecOfBytes(new byte[][] { seedBytes, entityBytes });
-
-			var data = Concat(discriminator, commitFrequencyBytes, validatorNoneTag, pdaSeeds);
+			var data = Concat(discriminator, commitFrequencyBytes, validatorNoneTag);
 
 			TransactionInstruction instruction = new TransactionInstruction() {
 				ProgramId = component.Program,

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

@@ -17,7 +17,6 @@ import {
 export interface DelegateInstructionArgs {
   commitFrequencyMs: number;
   validator: beet.COption<PublicKey>;
-  pdaSeeds: Uint8Array[];
 }
 
 export const delegateStruct = new beet.FixableBeetArgsStruct<
@@ -29,7 +28,6 @@ export const delegateStruct = new beet.FixableBeetArgsStruct<
     ["instructionDiscriminator", beet.uniformFixedSizeArray(beet.u8, 8)],
     ["commitFrequencyMs", beet.u32],
     ["validator", beet.coption(beetSolana.publicKey)],
-    ["pdaSeeds", beet.array(beet.bytes)],
   ],
   "DelegateInstructionArgs",
 );
@@ -61,7 +59,6 @@ export const delegateInstructionDiscriminator = [
 
 export function createDelegateInstruction(
   accounts: DelegateInstructionAccounts,
-  pdaSeeds: Uint8Array[],
   commitFrequencyMs: number = 0,
   validator?: PublicKey,
   programId = accounts.ownerProgram,
@@ -70,7 +67,6 @@ export function createDelegateInstruction(
     instructionDiscriminator: delegateInstructionDiscriminator,
     commitFrequencyMs,
     validator: validator ?? null,
-    pdaSeeds,
   });
 
   const delegationRecord = delegationRecordPdaFromDelegatedAccount(
@@ -182,22 +178,18 @@ export async function DelegateComponent({
 }> {
   const component = Component.from(componentId);
   let ownerProgram = component.program;
-  const pdaSeeds = component.seeds(seed);
   const componentPda = component.pda(entity, seed);
-  const delegateComponentIx = createDelegateInstruction(
-    {
-      payer,
-      entity,
-      account: componentPda,
-      ownerProgram,
-      buffer,
-      delegationRecord,
-      delegationMetadata,
-      delegationProgram,
-      systemProgram,
-    },
-    [Buffer.from(pdaSeeds), entity.toBytes()],
-  );
+  const delegateComponentIx = createDelegateInstruction({
+    payer,
+    entity,
+    account: componentPda,
+    ownerProgram,
+    buffer,
+    delegationRecord,
+    delegationMetadata,
+    delegationProgram,
+    systemProgram,
+  });
 
   return {
     instruction: delegateComponentIx,

clients/typescript/src/delegation/delegate.ts

@@ -17,7 +17,6 @@ anchor-lang = { workspace = true }
 
 # Bolt Attributes
 bolt-attribute-bolt-bundle = { workspace = true }
-bolt-attribute-bolt-delegate = { workspace = true }
 bolt-attribute-bolt-component = { workspace = true }
 bolt-attribute-bolt-system = { workspace = true }
 bolt-attribute-bolt-system-input = { workspace = true }

crates/bolt-lang/Cargo.toml

@@ -16,3 +16,4 @@ syn = { workspace = true }
 bolt-utils = { workspace = true }
 quote = { workspace = true }
 proc-macro2 = { workspace = true }
+sha2 = { workspace = true }

crates/bolt-lang/attribute/component-deserialize/Cargo.toml

@@ -1,4 +1,5 @@
 use bolt_utils::add_bolt_metadata;
+use sha2::{Digest, Sha256};
 use proc_macro::TokenStream;
 use quote::quote;
 use syn::{parse_macro_input, Attribute, DeriveInput};
@@ -38,6 +39,9 @@ pub fn component_deserialize(_attr: TokenStream, item: TokenStream) -> TokenStre
             }
         };
     }
+    let mut sha256 = Sha256::new();
+    sha256.update(name_str.as_bytes());
+    let discriminator = sha256.finalize()[0..8].to_vec();
     let expanded = quote! {
         #input
 
@@ -70,7 +74,7 @@ pub fn component_deserialize(_attr: TokenStream, item: TokenStream) -> TokenStre
 
         #[automatically_derived]
         impl anchor_lang::Discriminator for #name {
-            const DISCRIMINATOR: &'static [u8] = &[1, 1, 1, 1, 1, 1, 1, 1];
+            const DISCRIMINATOR: &'static [u8] = &[#(#discriminator),*];
         }
 
         #owner_definition