Merge pull request #12 from metaplex-foundation/danenbm/compress-vali…

…dation

Use validate_asset_permissions in compress/decompress

clients/js/src/generated/errors/mplCore.ts

@@ -304,6 +304,32 @@ export class MissingNewOwnerError extends ProgramError {
 codeToErrorMap.set(0x15, MissingNewOwnerError);
 nameToErrorMap.set('MissingNewOwner', MissingNewOwnerError);
 
+/** MissingSystemProgram: Missing system program */
+export class MissingSystemProgramError extends ProgramError {
+  override readonly name: string = 'MissingSystemProgram';
+
+  readonly code: number = 0x16; // 22
+
+  constructor(program: Program, cause?: Error) {
+    super('Missing system program', program, cause);
+  }
+}
+codeToErrorMap.set(0x16, MissingSystemProgramError);
+nameToErrorMap.set('MissingSystemProgram', MissingSystemProgramError);
+
+/** NotImplemented: Not implemented */
+export class NotImplementedError extends ProgramError {
+  override readonly name: string = 'NotImplemented';
+
+  readonly code: number = 0x17; // 23
+
+  constructor(program: Program, cause?: Error) {
+    super('Not implemented', program, cause);
+  }
+}
+codeToErrorMap.set(0x17, NotImplementedError);
+nameToErrorMap.set('NotImplemented', NotImplementedError);
+
 /**
  * Attempts to resolve a custom program error from the provided error code.
  * @category Errors

clients/js/src/generated/instructions/burn.ts

@@ -44,6 +44,8 @@ export type BurnInstructionAccounts = {
   authority?: Signer;
   /** The account paying for the storage fees */
   payer?: Signer;
+  /** The system program */
+  systemProgram?: PublicKey | Pda;
   /** The SPL Noop Program */
   logWrapper?: PublicKey | Pda;
 };
@@ -110,9 +112,14 @@ export function burn(
       isWritable: true as boolean,
       value: input.payer ?? null,
     },
-    logWrapper: {
+    systemProgram: {
       index: 4,
       isWritable: false as boolean,
+      value: input.systemProgram ?? null,
+    },
+    logWrapper: {
+      index: 5,
+      isWritable: false as boolean,
       value: input.logWrapper ?? null,
     },
   } satisfies ResolvedAccountsWithIndices;

clients/js/src/generated/instructions/compress.ts

@@ -33,7 +33,7 @@ export type CompressInstructionAccounts = {
   /** The collection to which the asset belongs */
   collection?: PublicKey | Pda;
   /** The owner or delegate of the asset */
-  owner: Signer;
+  authority?: Signer;
   /** The account receiving the storage fees */
   payer?: Signer;
   /** The system program */
@@ -65,7 +65,7 @@ export function getCompressInstructionDataSerializer(): Serializer<
 
 // Instruction.
 export function compress(
-  context: Pick<Context, 'programs'>,
+  context: Pick<Context, 'identity' | 'programs'>,
   input: CompressInstructionAccounts
 ): TransactionBuilder {
   // Program ID.
@@ -86,10 +86,10 @@ export function compress(
       isWritable: false as boolean,
       value: input.collection ?? null,
     },
-    owner: {
+    authority: {
       index: 2,
       isWritable: false as boolean,
-      value: input.owner ?? null,
+      value: input.authority ?? null,
     },
     payer: {
       index: 3,
@@ -109,6 +109,9 @@ export function compress(
   } satisfies ResolvedAccountsWithIndices;
 
   // Default values.
+  if (!resolvedAccounts.authority.value) {
+    resolvedAccounts.authority.value = context.identity;
+  }
   if (!resolvedAccounts.systemProgram.value) {
     resolvedAccounts.systemProgram.value = context.programs.getPublicKey(
       'splSystem',

clients/js/src/generated/instructions/decompress.ts

@@ -38,7 +38,7 @@ export type DecompressInstructionAccounts = {
   /** The collection to which the asset belongs */
   collection?: PublicKey | Pda;
   /** The owner or delegate of the asset */
-  owner: Signer;
+  authority?: Signer;
   /** The account paying for the storage fees */
   payer?: Signer;
   /** The system program */
@@ -82,7 +82,7 @@ export type DecompressInstructionArgs = DecompressInstructionDataArgs;
 
 // Instruction.
 export function decompress(
-  context: Pick<Context, 'programs'>,
+  context: Pick<Context, 'identity' | 'programs'>,
   input: DecompressInstructionAccounts & DecompressInstructionArgs
 ): TransactionBuilder {
   // Program ID.
@@ -103,10 +103,10 @@ export function decompress(
       isWritable: false as boolean,
       value: input.collection ?? null,
     },
-    owner: {
+    authority: {
       index: 2,
       isWritable: false as boolean,
-      value: input.owner ?? null,
+      value: input.authority ?? null,
     },
     payer: {
       index: 3,
@@ -129,6 +129,9 @@ export function decompress(
   const resolvedArgs: DecompressInstructionArgs = { ...input };
 
   // Default values.
+  if (!resolvedAccounts.authority.value) {
+    resolvedAccounts.authority.value = context.identity;
+  }
   if (!resolvedAccounts.systemProgram.value) {
     resolvedAccounts.systemProgram.value = context.programs.getPublicKey(
       'splSystem',

clients/js/src/generated/instructions/transfer.ts

@@ -46,6 +46,8 @@ export type TransferInstructionAccounts = {
   payer?: Signer;
   /** The new owner to which to transfer the asset */
   newOwner: PublicKey | Pda;
+  /** The system program */
+  systemProgram?: PublicKey | Pda;
   /** The SPL Noop Program */
   logWrapper?: PublicKey | Pda;
 };
@@ -121,9 +123,14 @@ export function transfer(
       isWritable: false as boolean,
       value: input.newOwner ?? null,
     },
-    logWrapper: {
+    systemProgram: {
       index: 5,
       isWritable: false as boolean,
+      value: input.systemProgram ?? null,
+    },
+    logWrapper: {
+      index: 6,
+      isWritable: false as boolean,
       value: input.logWrapper ?? null,
     },
   } satisfies ResolvedAccountsWithIndices;

clients/js/test/compress.test.ts

@@ -1,4 +1,4 @@
-import { generateSigner } from '@metaplex-foundation/umi';
+import { generateSigner, publicKey } from '@metaplex-foundation/umi';
 import test from 'ava';
 import {
   Asset,
@@ -44,7 +44,8 @@ test('it can compress an asset without any plugins as the owner', async (t) => {
   // And when we compress the asset.
   await compress(umi, {
     asset: assetAddress.publicKey,
-    owner: umi.identity,
+    authority: umi.identity,
+    logWrapper: publicKey('noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV'),
   }).sendAndConfirm(umi);
   // console.log('Compress signature: ', bs58.encode(tx.signature));
 
@@ -92,7 +93,7 @@ test('it cannot compress an asset if not the owner', async (t) => {
 
   const result = compress(umi, {
     asset: assetAddress.publicKey,
-    owner: attacker,
+    authority: attacker,
   }).sendAndConfirm(umi);
 
   await t.throwsAsync(result, { name: 'InvalidAuthority' });

clients/js/test/create.test.ts

@@ -9,8 +9,6 @@ import {
   create,
   fetchAsset,
   fetchAssetWithPlugins,
-  fetchHashedAsset,
-  getAssetAccountDataSerializer,
   updateAuthority,
 } from '../src';
 import { DEFAULT_ASSET, assertAsset, createAsset, createUmi } from './_setup';
@@ -67,7 +65,7 @@ test('it can create a new asset in ledger state', async (t) => {
   const assetAddress = generateSigner(umi);
 
   // When we create a new account.
-  const txResult = await create(umi, {
+  const result = create(umi, {
     dataState: DataState.LedgerState,
     asset: assetAddress,
     name: 'Test Bread',
@@ -76,27 +74,29 @@ test('it can create a new asset in ledger state', async (t) => {
     plugins: [],
   }).sendAndConfirm(umi);
 
+  await t.throwsAsync(result, { name: 'NotImplemented' });
+
   // Then an account was created with the correct data.
-  const asset = await fetchHashedAsset(umi, assetAddress.publicKey);
+  //const asset = await fetchHashedAsset(umi, assetAddress.publicKey);
   // console.log(asset);
-  t.like(asset, <Asset>{
-    publicKey: assetAddress.publicKey,
-  });
-
-  const tx = await umi.rpc.getTransaction(txResult.signature);
-  if (tx && tx.meta.innerInstructions) {
-    // console.log(tx.meta.innerInstructions[0].instructions);
-    const { data } = tx.meta.innerInstructions[0].instructions[0];
-    // console.log(base58.deserialize(data));
-    const parsed = getAssetAccountDataSerializer().deserialize(data)[0];
-    // console.log("Ledger State:", parsed);
-    t.like(parsed, <Asset>{
-      updateAuthority: updateAuthority('Address', [umi.identity.publicKey]),
-      owner: umi.identity.publicKey,
-      name: 'Test Bread',
-      uri: 'https://example.com/bread',
-    });
-  }
+  // t.like(asset, <Asset>{
+  //   publicKey: assetAddress.publicKey,
+  // });
+
+  // const tx = await umi.rpc.getTransaction(txResult.signature);
+  // if (tx && tx.meta.innerInstructions) {
+  //   // console.log(tx.meta.innerInstructions[0].instructions);
+  //   const { data } = tx.meta.innerInstructions[0].instructions[0];
+  //   // console.log(base58.deserialize(data));
+  //   const parsed = getAssetAccountDataSerializer().deserialize(data)[0];
+  //   // console.log("Ledger State:", parsed);
+  //   t.like(parsed, <Asset>{
+  //     updateAuthority: updateAuthority('Address', [umi.identity.publicKey]),
+  //     owner: umi.identity.publicKey,
+  //     name: 'Test Bread',
+  //     uri: 'https://example.com/bread',
+  //   });
+  // }
 });
 
 test('it can create a new asset in account state with plugins', async (t) => {

clients/js/test/decompress.test.ts

@@ -1,4 +1,4 @@
-import { generateSigner } from '@metaplex-foundation/umi';
+import { generateSigner, publicKey } from '@metaplex-foundation/umi';
 import test from 'ava';
 import {
   Asset,
@@ -44,7 +44,8 @@ test('it can decompress a previously compressed asset as the owner', async (t) =
   // And when we compress the asset.
   await compress(umi, {
     asset: assetAddress.publicKey,
-    owner: umi.identity,
+    authority: umi.identity,
+    logWrapper: publicKey('noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV'),
   }).sendAndConfirm(umi);
 
   // And the asset is now compressed as a hashed asset.
@@ -67,7 +68,7 @@ test('it can decompress a previously compressed asset as the owner', async (t) =
   // And when we decompress the asset.
   await decompress(umi, {
     asset: assetAddress.publicKey,
-    owner: umi.identity,
+    authority: umi.identity,
     compressionProof: {
       updateAuthority: updateAuthority('Address', [umi.identity.publicKey]),
       owner: umi.identity.publicKey,

clients/js/test/info.test.ts

@@ -1,6 +1,6 @@
 import { generateSigner, publicKey } from '@metaplex-foundation/umi';
 import test from 'ava';
-import { DataState, create /* fetchAsset, fetchHashedAsset */ } from '../src';
+import { DataState, create, compress /* fetchAsset, fetchHashedAsset */ } from '../src';
 import { createUmi } from './_setup';
 
 test('fetch account info for account state', async (t) => {
@@ -30,21 +30,27 @@ test('fetch account info for account state', async (t) => {
   t.pass();
 });
 
-test('fetch account info for ledger state', async (t) => {
+test('HELLO EHLO  HLEOOO  fetch account info for ledger state', async (t) => {
   // Given a Umi instance and a new signer.
   const umi = await createUmi();
   const assetAddress = generateSigner(umi);
 
   // When we create a new account.
   await create(umi, {
-    dataState: DataState.LedgerState,
+    dataState: DataState.AccountState,
     asset: assetAddress,
     name: 'Test Bread',
     uri: 'https://example.com/bread',
     logWrapper: publicKey('noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV'),
     plugins: [],
   }).sendAndConfirm(umi);
 
+  // And when we compress the asset.
+  await compress(umi, {
+    asset: assetAddress.publicKey,
+    logWrapper: publicKey('noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV'),
+  }).sendAndConfirm(umi);
+
   // Print the size of the account.
   const account = await umi.rpc.getAccount(assetAddress.publicKey);
   if (account.exists) {

clients/rust/src/generated/errors/mpl_core.rs

@@ -76,6 +76,12 @@ pub enum MplCoreError {
     /// 21 (0x15) - Missing new owner
     #[error("Missing new owner")]
     MissingNewOwner,
+    /// 22 (0x16) - Missing system program
+    #[error("Missing system program")]
+    MissingSystemProgram,
+    /// 23 (0x17) - Not implemented
+    #[error("Not implemented")]
+    NotImplemented,
 }
 
 impl solana_program::program_error::PrintProgramError for MplCoreError {