dep update

README.md

@@ -1,6 +1,6 @@
 # Metaplex Candy Machine
 
-# Docs/readmes inside this repo are not up to date, check the tests for usage examples
+# Docs/readmes inside this repo are not up to date, for glass chewers check the tests for usage examples
 
 The Metaplex Protocol Candy Machine is the leading minting and distribution program for fair NFT collection launches on Solana. It allows creators to bring their digital assets on-chain in a secure and customisable way.
 

clients/js/package.json

@@ -26,7 +26,7 @@
   "license": "Apache-2.0",
   "peerDependencies": {
     "@metaplex-foundation/umi": ">= 0.8.2 < 1",
-    "@metaplex-foundation/mpl-core": "^0.1.0"
+    "@metaplex-foundation/mpl-core": "^0.3.0"
   },
   "dependencies": {
     "@metaplex-foundation/mpl-token-metadata": "3.0.0-alpha.27",

clients/js/src/createCandyMachineV2.ts

@@ -23,7 +23,7 @@ export const createCandyMachineV2 = async (
 ): Promise<TransactionBuilder> => {
   const space = getCandyMachineSize(
     input.itemsAvailable,
-    input.configLineSettings ?? none(),
+    input.configLineSettings ?? none()
   );
   const lamports = await context.rpc.getRent(space);
   return transactionBuilder()

clients/js/src/createLutForCandyMachine.ts

@@ -1,6 +1,4 @@
-import {
-  getMplTokenMetadataProgramId,
-} from '@metaplex-foundation/mpl-token-metadata';
+import { getMplTokenMetadataProgramId } from '@metaplex-foundation/mpl-token-metadata';
 import {
   createLut,
   getSysvar,

clients/js/src/defaultGuards/freezeSolPayment.ts

@@ -1,6 +1,4 @@
-import {
-  getSplSystemProgramId,
-} from '@metaplex-foundation/mpl-toolbox';
+import { getSplSystemProgramId } from '@metaplex-foundation/mpl-toolbox';
 import { PublicKey, Signer } from '@metaplex-foundation/umi';
 import { tuple, u64 } from '@metaplex-foundation/umi/serializers';
 import { getMplCoreProgramId } from '@metaplex-foundation/mpl-core';
@@ -44,9 +42,7 @@ export const freezeSolPaymentGuardManifest: GuardManifest<
 
     return {
       data: new Uint8Array(),
-      remainingAccounts: [
-        { publicKey: freezeEscrow, isWritable: true },
-      ],
+      remainingAccounts: [{ publicKey: freezeEscrow, isWritable: true }],
     };
   },
   routeParser: (context, routeContext, args) => {
@@ -70,8 +66,7 @@ export const freezeSolPaymentGuardManifest: GuardManifest<
 export type FreezeSolPaymentMintArgs = Omit<
   FreezeSolPaymentArgs,
   'lamports'
-> & {
-};
+> & {};
 
 /**
  * The settings for the freezeSolPayment guard that should be provided

clients/js/src/defaultGuards/freezeTokenPayment.ts

@@ -59,7 +59,7 @@ export const freezeTokenPaymentGuardManifest: GuardManifest<
         { publicKey: freezeEscrow, isWritable: true },
         { publicKey: tokenAddress, isWritable: true },
         { publicKey: freezeAta, isWritable: true },
-        { publicKey: getSplTokenProgramId(context), isWritable: false}
+        { publicKey: getSplTokenProgramId(context), isWritable: false },
       ],
     };
   },
@@ -84,8 +84,7 @@ export const freezeTokenPaymentGuardManifest: GuardManifest<
 export type FreezeTokenPaymentMintArgs = Omit<
   FreezeTokenPaymentArgs,
   'amount'
-> & {
-};
+> & {};
 
 /**
  * The settings for the freezeTokenPayment guard that should be provided

clients/js/src/defaultGuards/nftBurn.ts

@@ -1,4 +1,7 @@
-import { findAssociatedTokenPda, getSplTokenProgramId } from '@metaplex-foundation/mpl-toolbox';
+import {
+  findAssociatedTokenPda,
+  getSplTokenProgramId,
+} from '@metaplex-foundation/mpl-toolbox';
 import {
   findMasterEditionPda,
   findMetadataPda,

clients/js/src/defaultGuards/nftPayment.ts

@@ -67,7 +67,7 @@ export const nftPaymentGuardManifest: GuardManifest<
       {
         publicKey: getMplTokenMetadataProgramId(context),
         isWritable: false,
-      }
+      },
     ];
 
     if (isProgrammable(args.tokenStandard)) {

clients/js/src/defaultGuards/tokenBurn.ts

@@ -1,4 +1,7 @@
-import { findAssociatedTokenPda, getSplTokenProgramId } from '@metaplex-foundation/mpl-toolbox';
+import {
+  findAssociatedTokenPda,
+  getSplTokenProgramId,
+} from '@metaplex-foundation/mpl-toolbox';
 import { getTokenBurnSerializer, TokenBurn, TokenBurnArgs } from '../generated';
 import { GuardManifest, noopParser } from '../guards';
 

clients/js/src/defaultGuards/tokenPayment.ts

@@ -1,4 +1,7 @@
-import { findAssociatedTokenPda, getSplTokenProgramId } from '@metaplex-foundation/mpl-toolbox';
+import {
+  findAssociatedTokenPda,
+  getSplTokenProgramId,
+} from '@metaplex-foundation/mpl-toolbox';
 import {
   getTokenPaymentSerializer,
   TokenPayment,

clients/js/src/hooked/candyMachineAccountData.ts

@@ -97,8 +97,7 @@ export function getCandyMachineAccountDataSerializer(): Serializer<
           ['itemsLeftToMint', array(u32(), { size: itemsAvailable })],
         ]);
 
-      const [hiddenSection] =
-        hiddenSectionSerializer.deserialize(slice);
+      const [hiddenSection] = hiddenSectionSerializer.deserialize(slice);
 
       const itemsLeftToMint = hiddenSection.itemsLeftToMint.slice(
         0,

clients/js/src/plugin.ts

@@ -81,7 +81,7 @@ export const mplCandyMachine = (): UmiPlugin => ({
       allocationGuardManifest,
       token2022PaymentGuardManifest,
       solFixedFeeGuardManifest,
-      nftMintLimitGuardManifest,
+      nftMintLimitGuardManifest
     );
   },
 });

clients/js/test/_setup.ts

@@ -7,11 +7,11 @@ import {
   findMetadataPda,
   verifyCollectionV1,
 } from '@metaplex-foundation/mpl-token-metadata';
-import { 
+import {
   AssetV1,
   fetchAssetV1,
   createCollectionV1 as baseCreateCollection,
-} from '@metaplex-foundation/mpl-core'
+} from '@metaplex-foundation/mpl-core';
 import {
   createAssociatedToken,
   createMint,
@@ -98,7 +98,7 @@ export const createCollection = async (
   }).sendAndConfirm(umi);
 
   return mint;
-}
+};
 
 export const createCollectionNft = async (
   umi: Umi,
@@ -246,7 +246,7 @@ export const defaultAssetData = () => ({
   name: 'My Asset',
   sellerFeeBasisPoints: percentAmount(10, 2),
   uri: 'https://example.com/my-asset.json',
-  plugins: []
+  plugins: [],
 });
 
 export const defaultCandyMachineData = (
@@ -303,21 +303,17 @@ export const assertSuccessfulMint = async (
 ) => {
   const mint = publicKey(input.mint);
   const owner = publicKey(input.owner);
-  const {
-    name,
-    uri,
-  } = input;
+  const { name, uri } = input;
 
   // Nft.
 
-  const nft = await fetchAssetV1(umi, mint)
+  const nft = await fetchAssetV1(umi, mint);
 
   t.like(nft, <AssetV1>{
     publicKey: publicKey(mint),
-    owner
+    owner,
   });
 
-
   // Name.
   if (typeof name === 'string') t.is(nft.name, name);
   else if (name !== undefined) t.regex(nft.name, name);
@@ -372,4 +368,5 @@ export const yesterday = (): DateTime => now() - 3600n * 24n;
 export const tomorrow = (): DateTime => now() + 3600n * 24n;
 
 // TODO move to mpl-core
-export const isFrozen = (asset: AssetV1): boolean => asset.freezeDelegate?.frozen || false;
+export const isFrozen = (asset: AssetV1): boolean =>
+  asset.freezeDelegate?.frozen || false;

clients/js/test/create.test.ts

@@ -17,11 +17,7 @@ import {
   GuardGroup,
   GuardSet,
 } from '../src';
-import {
-  createCollection,
-  createUmi,
-  defaultCandyMachineData,
-} from './_setup';
+import { createCollection, createUmi, defaultCandyMachineData } from './_setup';
 
 test('it can create a candy machine with an associated candy guard', async (t) => {
   // Given an existing collection NFT.

clients/js/test/createCandyMachineV2.test.ts

@@ -14,11 +14,7 @@ import {
   Creator,
   fetchCandyMachine,
 } from '../src';
-import {
-  createCollection,
-  createUmi,
-  defaultCandyMachineData,
-} from './_setup';
+import { createCollection, createUmi, defaultCandyMachineData } from './_setup';
 
 test('it can create a candy machine using config line settings', async (t) => {
   // Given an existing collection NFT.
@@ -230,4 +226,3 @@ test("it can create a candy machine that's bigger than 10Kb", async (t) => {
     data: { itemsAvailable: 20000n },
   });
 });
-

clients/js/test/createLutForCandyMachine.test.ts

@@ -1,7 +1,5 @@
 /* eslint-disable no-promise-executor-return */
-import {
-  getMplTokenMetadataProgramId,
-} from '@metaplex-foundation/mpl-token-metadata';
+import { getMplTokenMetadataProgramId } from '@metaplex-foundation/mpl-token-metadata';
 import {
   getSplAssociatedTokenProgramId,
   getSplTokenProgramId,
@@ -81,7 +79,7 @@ test('it can create a LUT for a candy machine v2', async (t) => {
 
   // And we expect the mint builder to be smaller with the LUT.
   const builderWithLut = builderWithoutLut.setAddressLookupTables([lut]);
-  
+
   // TODO actually compare real tx size
   // const transactionSizeDifference =
   //   builderWithoutLut.getTransactionSize(umi) -

clients/js/test/defaultGuards/freezeSolPayment.test.ts

@@ -93,7 +93,13 @@ test('it transfers SOL to an escrow account and freezes the NFT', async (t) => {
   t.is(isFrozen(asset), true, 'NFT is frozen');
 
   // And cannot be thawed since not all NFTs have been minted.
-  const promise = thawNft(umi, candyMachine, destination, mint.publicKey, collection);
+  const promise = thawNft(
+    umi,
+    candyMachine,
+    destination,
+    mint.publicKey,
+    collection
+  );
   await t.throwsAsync(promise, { message: /ThawNotEnabled/ });
 
   // And the treasury escrow received SOLs.
@@ -379,10 +385,9 @@ test('it can have multiple freeze escrow and reuse the same ones', async (t) =>
   // Then all NFTs except for group D have been frozen.
   const [tokenA, tokenB, tokenC, tokenD] = await Promise.all(
     [mintA, mintB, mintC, mintD].map(
-      ({ publicKey: mint }): Promise<AssetV1> => 
-        fetchAssetV1(umi, mint)
+      ({ publicKey: mint }): Promise<AssetV1> => fetchAssetV1(umi, mint)
     )
-  );  
+  );
 
   t.is(isFrozen(tokenA), true, 'NFT A is frozen');
   t.is(isFrozen(tokenB), true, 'NFT B is frozen');
@@ -628,7 +633,13 @@ test('it transfers SOL to an escrow account and locks the Programmable NFT', asy
   t.is(isFrozen(asset), true);
 
   // And cannot be thawed since not all NFTs have been minted.
-  const promise = thawNft(umi, candyMachine, destination, mint.publicKey, collection);
+  const promise = thawNft(
+    umi,
+    candyMachine,
+    destination,
+    mint.publicKey,
+    collection
+  );
   await t.throwsAsync(promise, { message: /ThawNotEnabled/ });
 
   // And the treasury escrow received SOLs.
@@ -817,20 +828,24 @@ const thawNft = async (
   destination: PublicKey,
   asset: PublicKey,
   collection: PublicKey,
-  group?: string,
-) => {
-  await route(umi, {
-    candyMachine,
-    guard: 'freezeSolPayment',
-    group: group ? some(group) : none(),
-    routeArgs: {
-      path: 'thaw',
-      asset,
-      collection,
-      destination,
-    },
-  }).sendAndConfirm(umi);
-};
+  group?: string
+) =>
+  transactionBuilder()
+    .add(setComputeUnitLimit(umi, { units: 600_000 }))
+    .add(
+      route(umi, {
+        candyMachine,
+        guard: 'freezeSolPayment',
+        group: group ? some(group) : none(),
+        routeArgs: {
+          path: 'thaw',
+          asset,
+          collection,
+          destination,
+        },
+      })
+    )
+    .sendAndConfirm(umi);
 
 const unlockFunds = async (
   umi: Umi,