Feature - grouping delegate

clients/js/asset/src/extensions/grouping.ts

@@ -1,10 +1,13 @@
+import { PublicKey, defaultPublicKey } from '@metaplex-foundation/umi';
 import { TypedExtension } from '.';
 import { ExtensionType, Grouping } from '../generated';
 
 export const grouping = (
-  maxSize: Grouping['size'] | number = 0n
+  maxSize: Grouping['size'] | number = 0n,
+  delegate: Grouping['delegate'] | PublicKey = defaultPublicKey()
 ): TypedExtension => ({
   type: ExtensionType.Grouping,
   size: BigInt(0),
   maxSize: BigInt(maxSize),
+  delegate,
 });

clients/js/asset/src/generated/instructions/create.ts

@@ -51,6 +51,8 @@ export type CreateInstructionAccounts = {
   owner?: PublicKey | Pda;
   /** Asset account of the group */
   group?: PublicKey | Pda;
+  /** Optional authority for minting assets into a group */
+  groupAuthority?: Signer;
   /** The account paying for the storage fees */
   payer?: Signer;
   /** The system program */
@@ -134,13 +136,18 @@ export function create(
       isWritable: true as boolean,
       value: input.group ?? null,
     },
-    payer: {
+    groupAuthority: {
       index: 4,
+      isWritable: false as boolean,
+      value: input.groupAuthority ?? null,
+    },
+    payer: {
+      index: 5,
       isWritable: true as boolean,
       value: input.payer ?? null,
     },
     systemProgram: {
-      index: 5,
+      index: 6,
       isWritable: false as boolean,
       value: input.systemProgram ?? null,
     },

clients/js/asset/src/generated/types/grouping.ts

@@ -7,16 +7,30 @@
  */
 
 import { Serializer, struct, u64 } from '@metaplex-foundation/umi/serializers';
+import {
+  NullablePublicKey,
+  NullablePublicKeyArgs,
+  getNullablePublicKeySerializer,
+} from '../../hooked';
 
-export type Grouping = { size: bigint; maxSize: bigint };
+export type Grouping = {
+  size: bigint;
+  maxSize: bigint;
+  delegate: NullablePublicKey;
+};
 
-export type GroupingArgs = { size: number | bigint; maxSize: number | bigint };
+export type GroupingArgs = {
+  size: number | bigint;
+  maxSize: number | bigint;
+  delegate: NullablePublicKeyArgs;
+};
 
 export function getGroupingSerializer(): Serializer<GroupingArgs, Grouping> {
   return struct<Grouping>(
     [
       ['size', u64()],
       ['maxSize', u64()],
+      ['delegate', getNullablePublicKeySerializer()],
     ],
     { description: 'Grouping' }
   ) as Serializer<GroupingArgs, Grouping>;

clients/js/asset/test/create.test.ts

@@ -320,6 +320,56 @@ test('it cannot set a group on create with authority not a signer', async (t) =>
   await t.throwsAsync(promise, { message: /missing required signature/ });
 });
 
+test('it set a group on create with authority as a delegate', async (t) => {
+  // Given a Umi instance and an authority signer.
+  const umi = await createUmi();
+  const authority = generateSigner(umi);
+  const delegate = generateSigner(umi);
+
+  // And we create a group asset.
+  const groupAsset = generateSigner(umi);
+  await initialize(umi, {
+    asset: groupAsset,
+    payer: umi.identity,
+    extension: grouping(10, delegate.publicKey),
+  }).sendAndConfirm(umi);
+
+  await create(umi, {
+    asset: groupAsset,
+    authority: authority.publicKey,
+    name: 'Group',
+    payer: umi.identity,
+  }).sendAndConfirm(umi);
+
+  t.like(await fetchAsset(umi, groupAsset.publicKey), <Asset>{
+    extensions: [
+      {
+        type: ExtensionType.Grouping,
+        size: 0n,
+        maxSize: 10n,
+        delegate: delegate.publicKey,
+      },
+    ],
+  });
+
+  // When we create an asset with a group with the delegate as a authority.
+  const asset = generateSigner(umi);
+  await create(umi, {
+    asset,
+    authority: authority.publicKey,
+    name: 'Asset',
+    group: groupAsset.publicKey,
+    groupAuthority: delegate,
+    payer: umi.identity,
+  }).sendAndConfirm(umi);
+
+  // Then we expect the item to be minted into the collection retaining original authority.
+  t.like(await fetchAsset(umi, asset.publicKey), <Asset>{
+    group: groupAsset.publicKey,
+    authority: authority.publicKey,
+  });
+});
+
 test('it can create an asset with a collection', async (t) => {
   // Given a Umi instance and a new signer.
   const umi = await createUmi();

clients/js/asset/test/extensions/grouping.test.ts

@@ -375,3 +375,71 @@ test('it can increase the size of a group', async (t) => {
     ],
   });
 });
+
+test('it can add a delegate to the grouping on init', async (t) => {
+  // Given a Umi instance.
+  const umi = await createUmi();
+
+  const delegate = generateSigner(umi);
+
+  // And we create a group asset.
+  const groupAsset = generateSigner(umi);
+  await mint(umi, {
+    asset: groupAsset,
+    payer: umi.identity,
+    name: 'Group',
+    extensions: [grouping(10, delegate.publicKey)],
+  }).sendAndConfirm(umi);
+
+  t.like(await fetchAsset(umi, groupAsset.publicKey), <Asset>{
+    group: null,
+    extensions: [
+      {
+        type: ExtensionType.Grouping,
+        size: 0n,
+        maxSize: 10n,
+        delegate: delegate.publicKey,
+      },
+    ],
+  });
+
+  // When we update the maximum size of the group.
+  await update(umi, {
+    asset: groupAsset.publicKey,
+    payer: umi.identity,
+    extension: grouping(100, delegate.publicKey),
+  }).sendAndConfirm(umi);
+
+  // Then the group maximum size has been updated, and the delegate is unchanged
+  t.like(await fetchAsset(umi, groupAsset.publicKey), <Asset>{
+    group: null,
+    extensions: [
+      {
+        type: ExtensionType.Grouping,
+        size: 0n,
+        maxSize: 100n,
+        delegate: delegate.publicKey,
+      },
+    ],
+  });
+
+  // When we remove the delegate.
+  await update(umi, {
+    asset: groupAsset.publicKey,
+    payer: umi.identity,
+    extension: grouping(100),
+  }).sendAndConfirm(umi);
+
+  // Then the delegate is removed
+  t.like(await fetchAsset(umi, groupAsset.publicKey), <Asset>{
+    group: null,
+    extensions: [
+      {
+        type: ExtensionType.Grouping,
+        size: 0n,
+        maxSize: 100n,
+        delegate: null,
+      },
+    ],
+  });
+});

clients/js/asset/test/group.test.ts

@@ -242,3 +242,41 @@ test('it cannot replace the group of an asset', async (t) => {
     group: groupAsset.publicKey,
   });
 });
+
+test('it can be grouped using a group delegate', async (t) => {
+  // Given a Umi instance.
+  const umi = await createUmi();
+
+  const delegate = generateSigner(umi);
+  const authority = generateSigner(umi).publicKey;
+
+  // And we create a group asset.
+  const groupAsset = generateSigner(umi);
+  await mint(umi, {
+    asset: groupAsset,
+    payer: umi.identity,
+    name: 'Group',
+    authority,
+    extensions: [grouping(10, delegate.publicKey)],
+  }).sendAndConfirm(umi);
+
+  // And a "normal" asset.
+  const asset = generateSigner(umi);
+  await mint(umi, {
+    asset,
+    payer: umi.identity,
+    authority,
+    name: 'Asset',
+  }).sendAndConfirm(umi);
+
+  // Then we can group the assets using a delegate signer
+  await group(umi, {
+    asset: asset.publicKey,
+    authority: delegate,
+    group: groupAsset.publicKey,
+  }).sendAndConfirm(umi);
+
+  t.like(await fetchAsset(umi, asset.publicKey), <Asset>{
+    group: groupAsset.publicKey,
+  });
+});

clients/js/asset/test/ungroup.test.ts

@@ -81,3 +81,86 @@ test('it can ungroup an asset', async (t) => {
     ],
   });
 });
+
+test('It can ungroup an asset as a group delegate', async (t) => {
+  // Given a Umi instance.
+  const umi = await createUmi();
+
+  const delegate = generateSigner(umi);
+  const authority = generateSigner(umi);
+
+  // And we create a group asset.
+  const groupAsset = generateSigner(umi);
+  await mint(umi, {
+    asset: groupAsset,
+    payer: umi.identity,
+    name: 'Group',
+    authority,
+    extensions: [grouping(10, delegate.publicKey)],
+  }).sendAndConfirm(umi);
+
+  t.like(await fetchAsset(umi, groupAsset.publicKey), <Asset>{
+    group: null,
+    authority: authority.publicKey,
+    extensions: [
+      {
+        type: ExtensionType.Grouping,
+        size: 0n,
+        maxSize: 10n,
+        delegate: delegate.publicKey,
+      },
+    ],
+  });
+
+  // And a "normal" asset.
+  const asset = generateSigner(umi);
+  await mint(umi, {
+    asset,
+    payer: umi.identity,
+    name: 'Asset',
+    authority,
+    group: groupAsset.publicKey,
+  }).sendAndConfirm(umi);
+
+  t.like(await fetchAsset(umi, asset.publicKey), <Asset>{
+    group: groupAsset.publicKey,
+  });
+
+  t.like(await fetchAsset(umi, groupAsset.publicKey), <Asset>{
+    group: null,
+    authority: authority.publicKey,
+    extensions: [
+      {
+        type: ExtensionType.Grouping,
+        size: 1n,
+        maxSize: 10n,
+        delegate: delegate.publicKey,
+      },
+    ],
+  });
+
+  // When we ungroup the asset as the delegate.
+  await ungroup(umi, {
+    asset: asset.publicKey,
+    group: groupAsset.publicKey,
+    authority: delegate,
+  }).sendAndConfirm(umi);
+
+  // Then the group is removed from the asset.
+  t.like(await fetchAsset(umi, asset.publicKey), <Asset>{
+    group: null,
+  });
+
+  // And the group size has decreased.
+  t.like(await fetchAsset(umi, groupAsset.publicKey), <Asset>{
+    group: null,
+    extensions: [
+      {
+        type: ExtensionType.Grouping,
+        size: 0n,
+        maxSize: 10n,
+        delegate: delegate.publicKey,
+      },
+    ],
+  });
+});