wip: temp packages

metaplex-foundation · Mar 20, 2024 · d302c67 · d302c67
1 parent 61a3bb1
commit d302c67
Show file tree

Hide file tree

Showing 61 changed files with 161 additions and 132 deletions.
diff --git a/clients/js/package.json b/clients/js/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "@metaplex-foundation/mpl-candy-machine-asset",
-  "version": "0.0.1",
+  "name": "cma-preview",
+  "version": "0.0.3",
   "description": "Client library for Candy Machine related programs",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -25,10 +25,10 @@
   "author": "Metaplex Maintainers <[email protected]>",
   "license": "Apache-2.0",
   "peerDependencies": {
-    "@metaplex-foundation/umi": ">= 0.8.2 < 1"
+    "@metaplex-foundation/umi": ">= 0.8.2 < 1",
+    "core-preview": "^0.1.1"
   },
   "dependencies": {
-    "@metaplex-foundation/mpl-core": "^0.1.0",
     "@metaplex-foundation/mpl-token-metadata": "3.0.0-alpha.27",
     "@metaplex-foundation/mpl-toolbox": "^0.9.0",
     "@noble/hashes": "^1.2.0",

diff --git a/clients/js/pnpm-lock.yaml b/clients/js/pnpm-lock.yaml
diff --git a/clients/js/src/createCandyGuard.ts b/clients/js/src/createCandyGuard.ts
@@ -40,7 +40,7 @@ export function createCandyGuard<DA extends GuardSetArgs = DefaultGuardSetArgs>(
     >
 ): TransactionBuilder {
   const { guards, groups, ...rest } = input;
-  const program = context.programs.get<CandyGuardProgram>('mplCandyGuard');
+  const program = context.programs.get<CandyGuardProgram>('mplCandyGuardAsset');
   const serializer = getCandyGuardDataSerializer<
     DA extends undefined ? DefaultGuardSetArgs : DA,
     any

diff --git a/clients/js/src/createCandyMachineV2.ts b/clients/js/src/createCandyMachineV2.ts
@@ -32,7 +32,7 @@ export const createCandyMachineV2 = async (
         newAccount: input.candyMachine,
         lamports,
         space,
-        programId: context.programs.get('mplCandyMachineCore').publicKey,
+        programId: context.programs.get('mplCandyMachineCoreAsset').publicKey,
       })
     )
     .add(

diff --git a/clients/js/src/createLutForCandyMachine.ts b/clients/js/src/createLutForCandyMachine.ts
@@ -15,10 +15,10 @@ import {
   TransactionBuilder,
   uniquePublicKeys,
 } from '@metaplex-foundation/umi';
-import { getMplCoreProgramId } from '@metaplex-foundation/mpl-core';
+import { getMplCoreProgramId } from 'core-preview';
 import {
   fetchCandyMachine,
-  getMplCandyMachineCoreProgramId,
+  getMplCandyMachineCoreAssetProgramId,
 } from './generated';
 import { findCandyMachineAuthorityPda } from './hooked';
 
@@ -48,13 +48,13 @@ export const getLutAddressesForCandyMachine = async (
   collectionUpdateAuthority?: PublicKey
 ): Promise<PublicKey[]> => {
   const candyMachineAccount = await fetchCandyMachine(context, candyMachine);
-  const { mintAuthority, collection } = candyMachineAccount;
+  const { mintAuthority, collectionMint } = candyMachineAccount;
   collectionUpdateAuthority ??= context.identity.publicKey;
 
   return uniquePublicKeys([
     candyMachine,
     mintAuthority,
-    collection,
+    collectionMint,
     collectionUpdateAuthority,
     findCandyMachineAuthorityPda(context, { candyMachine })[0],
     getSysvar('instructions'),
@@ -63,6 +63,6 @@ export const getLutAddressesForCandyMachine = async (
     getSplTokenProgramId(context),
     getSplAssociatedTokenProgramId(context),
     getMplTokenMetadataProgramId(context),
-    getMplCandyMachineCoreProgramId(context),
+    getMplCandyMachineCoreAssetProgramId(context),
   ]);
 };
diff --git a/clients/js/src/defaultGuards/freezeSolPayment.ts b/clients/js/src/defaultGuards/freezeSolPayment.ts
@@ -3,7 +3,7 @@ import {
 } 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';
+import { getMplCoreProgramId } from 'core-preview';
 import { UnrecognizePathForRouteInstructionError } from '../errors';
 import {
   FreezeInstruction,

diff --git a/clients/js/src/defaultGuards/freezeTokenPayment.ts b/clients/js/src/defaultGuards/freezeTokenPayment.ts
@@ -6,7 +6,7 @@ import {
 } 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';
+import { getMplCoreProgramId } from 'core-preview';
 import { UnrecognizePathForRouteInstructionError } from '../errors';
 import {
   FreezeInstruction,

diff --git a/clients/js/src/generated/accounts/allocationTracker.ts b/clients/js/src/generated/accounts/allocationTracker.ts
@@ -118,7 +118,7 @@ export function getAllocationTrackerGpaBuilder(
   context: Pick<Context, 'rpc' | 'programs'>
 ) {
   const programId = context.programs.getPublicKey(
-    'mplCandyGuard',
+    'mplCandyGuardAsset',
     'CMAGAKJ67e9hRZgfC5SFTbZH8MgEmtqazKXjmkaJjWTJ'
   );
   return gpaBuilder(context, programId)
@@ -145,7 +145,7 @@ export function findAllocationTrackerPda(
   }
 ): Pda {
   const programId = context.programs.getPublicKey(
-    'mplCandyGuard',
+    'mplCandyGuardAsset',
     'CMAGAKJ67e9hRZgfC5SFTbZH8MgEmtqazKXjmkaJjWTJ'
   );
   return context.eddsa.findPda(programId, [

diff --git a/clients/js/src/generated/accounts/allowListProof.ts b/clients/js/src/generated/accounts/allowListProof.ts
@@ -113,7 +113,7 @@ export function getAllowListProofGpaBuilder(
   context: Pick<Context, 'rpc' | 'programs'>
 ) {
   const programId = context.programs.getPublicKey(
-    'mplCandyGuard',
+    'mplCandyGuardAsset',
     'CMAGAKJ67e9hRZgfC5SFTbZH8MgEmtqazKXjmkaJjWTJ'
   );
   return gpaBuilder(context, programId)
@@ -142,7 +142,7 @@ export function findAllowListProofPda(
   }
 ): Pda {
   const programId = context.programs.getPublicKey(
-    'mplCandyGuard',
+    'mplCandyGuardAsset',
     'CMAGAKJ67e9hRZgfC5SFTbZH8MgEmtqazKXjmkaJjWTJ'
   );
   return context.eddsa.findPda(programId, [

diff --git a/clients/js/src/generated/accounts/candyGuard.ts b/clients/js/src/generated/accounts/candyGuard.ts
@@ -127,7 +127,7 @@ export function getCandyGuardGpaBuilder(
   context: Pick<Context, 'rpc' | 'programs'>
 ) {
   const programId = context.programs.getPublicKey(
-    'mplCandyGuard',
+    'mplCandyGuardAsset',
     'CMAGAKJ67e9hRZgfC5SFTbZH8MgEmtqazKXjmkaJjWTJ'
   );
   return gpaBuilder(context, programId)
@@ -158,7 +158,7 @@ export function findCandyGuardPda(
   }
 ): Pda {
   const programId = context.programs.getPublicKey(
-    'mplCandyGuard',
+    'mplCandyGuardAsset',
     'CMAGAKJ67e9hRZgfC5SFTbZH8MgEmtqazKXjmkaJjWTJ'
   );
   return context.eddsa.findPda(programId, [

diff --git a/clients/js/src/generated/accounts/candyMachine.ts b/clients/js/src/generated/accounts/candyMachine.ts
@@ -101,7 +101,7 @@ export function getCandyMachineGpaBuilder(
   context: Pick<Context, 'rpc' | 'programs'>
 ) {
   const programId = context.programs.getPublicKey(
-    'mplCandyMachineCore',
+    'mplCandyMachineCoreAsset',
     'CMACYFENjoBMHzapRXyo1JZkVS6EtaDDzkjMrmQLvr4J'
   );
   return gpaBuilder(context, programId)
@@ -111,7 +111,7 @@ export function getCandyMachineGpaBuilder(
       features: Array<number>;
       authority: PublicKey;
       mintAuthority: PublicKey;
-      collection: PublicKey;
+      collectionMint: PublicKey;
       itemsRedeemed: number | bigint;
       data: CandyMachineDataArgs;
     }>({
@@ -120,7 +120,7 @@ export function getCandyMachineGpaBuilder(
       features: [9, array(u8(), { size: 6 })],
       authority: [15, publicKeySerializer()],
       mintAuthority: [47, publicKeySerializer()],
-      collection: [79, publicKeySerializer()],
+      collectionMint: [79, publicKeySerializer()],
       itemsRedeemed: [111, u64()],
       data: [119, getCandyMachineDataSerializer()],
     })

diff --git a/clients/js/src/generated/accounts/freezeEscrow.ts b/clients/js/src/generated/accounts/freezeEscrow.ts
@@ -183,7 +183,7 @@ export function getFreezeEscrowGpaBuilder(
   context: Pick<Context, 'rpc' | 'programs'>
 ) {
   const programId = context.programs.getPublicKey(
-    'mplCandyGuard',
+    'mplCandyGuardAsset',
     'CMAGAKJ67e9hRZgfC5SFTbZH8MgEmtqazKXjmkaJjWTJ'
   );
   return gpaBuilder(context, programId)
@@ -224,7 +224,7 @@ export function findFreezeEscrowPda(
   }
 ): Pda {
   const programId = context.programs.getPublicKey(
-    'mplCandyGuard',
+    'mplCandyGuardAsset',
     'CMAGAKJ67e9hRZgfC5SFTbZH8MgEmtqazKXjmkaJjWTJ'
   );
   return context.eddsa.findPda(programId, [

diff --git a/clients/js/src/generated/accounts/mintCounter.ts b/clients/js/src/generated/accounts/mintCounter.ts
@@ -106,7 +106,7 @@ export function getMintCounterGpaBuilder(
   context: Pick<Context, 'rpc' | 'programs'>
 ) {
   const programId = context.programs.getPublicKey(
-    'mplCandyGuard',
+    'mplCandyGuardAsset',
     'CMAGAKJ67e9hRZgfC5SFTbZH8MgEmtqazKXjmkaJjWTJ'
   );
   return gpaBuilder(context, programId)
@@ -133,7 +133,7 @@ export function findMintCounterPda(
   }
 ): Pda {
   const programId = context.programs.getPublicKey(
-    'mplCandyGuard',
+    'mplCandyGuardAsset',
     'CMAGAKJ67e9hRZgfC5SFTbZH8MgEmtqazKXjmkaJjWTJ'
   );
   return context.eddsa.findPda(programId, [

diff --git a/clients/js/src/generated/accounts/nftMintCounter.ts b/clients/js/src/generated/accounts/nftMintCounter.ts
@@ -113,7 +113,7 @@ export function getNftMintCounterGpaBuilder(
   context: Pick<Context, 'rpc' | 'programs'>
 ) {
   const programId = context.programs.getPublicKey(
-    'mplCandyGuard',
+    'mplCandyGuardAsset',
     'CMAGAKJ67e9hRZgfC5SFTbZH8MgEmtqazKXjmkaJjWTJ'
   );
   return gpaBuilder(context, programId)
@@ -142,7 +142,7 @@ export function findNftMintCounterPda(
   }
 ): Pda {
   const programId = context.programs.getPublicKey(
-    'mplCandyGuard',
+    'mplCandyGuardAsset',
     'CMAGAKJ67e9hRZgfC5SFTbZH8MgEmtqazKXjmkaJjWTJ'
   );
   return context.eddsa.findPda(programId, [

diff --git a/clients/js/src/generated/errors/index.ts b/clients/js/src/generated/errors/index.ts
@@ -6,5 +6,5 @@
  * @see https://github.com/metaplex-foundation/kinobi
  */
 
-export * from './mplCandyGuard';
-export * from './mplCandyMachineCore';
+export * from './mplCandyGuardAsset';
+export * from './mplCandyMachineCoreAsset';
diff --git a/.../js/src/generated/errors/mplCandyGuard.ts → ...rc/generated/errors/mplCandyGuardAsset.ts b/.../js/src/generated/errors/mplCandyGuard.ts → ...rc/generated/errors/mplCandyGuardAsset.ts
@@ -735,7 +735,7 @@ nameToErrorMap.set('InvalidAccountVersion', CgInvalidAccountVersionError);
  * Attempts to resolve a custom program error from the provided error code.
  * @category Errors
  */
-export function getMplCandyGuardErrorFromCode(
+export function getMplCandyGuardAssetErrorFromCode(
   code: number,
   program: Program,
   cause?: Error
@@ -748,7 +748,7 @@ export function getMplCandyGuardErrorFromCode(
  * Attempts to resolve a custom program error from the provided error name, i.e. 'Unauthorized'.
  * @category Errors
  */
-export function getMplCandyGuardErrorFromName(
+export function getMplCandyGuardAssetErrorFromName(
   name: string,
   program: Program,
   cause?: Error

diff --git a/...c/generated/errors/mplCandyMachineCore.ts → ...erated/errors/mplCandyMachineCoreAsset.ts b/...c/generated/errors/mplCandyMachineCore.ts → ...erated/errors/mplCandyMachineCoreAsset.ts
@@ -497,7 +497,7 @@ nameToErrorMap.set('IncorrectPluginAuthority', CmIncorrectPluginAuthorityError);
  * Attempts to resolve a custom program error from the provided error code.
  * @category Errors
  */
-export function getMplCandyMachineCoreErrorFromCode(
+export function getMplCandyMachineCoreAssetErrorFromCode(
   code: number,
   program: Program,
   cause?: Error
@@ -510,7 +510,7 @@ export function getMplCandyMachineCoreErrorFromCode(
  * Attempts to resolve a custom program error from the provided error name, i.e. 'Unauthorized'.
  * @category Errors
  */
-export function getMplCandyMachineCoreErrorFromName(
+export function getMplCandyMachineCoreAssetErrorFromName(
   name: string,
   program: Program,
   cause?: Error

diff --git a/clients/js/src/generated/instructions/addConfigLines.ts b/clients/js/src/generated/instructions/addConfigLines.ts
@@ -86,7 +86,7 @@ export function addConfigLines(
 ): TransactionBuilder {
   // Program ID.
   const programId = context.programs.getPublicKey(
-    'mplCandyMachineCore',
+    'mplCandyMachineCoreAsset',
     'CMACYFENjoBMHzapRXyo1JZkVS6EtaDDzkjMrmQLvr4J'
   );
 

diff --git a/clients/js/src/generated/instructions/createCandyGuard.ts b/clients/js/src/generated/instructions/createCandyGuard.ts
@@ -85,7 +85,7 @@ export function createCandyGuard(
 ): TransactionBuilder {
   // Program ID.
   const programId = context.programs.getPublicKey(
-    'mplCandyGuard',
+    'mplCandyGuardAsset',
     'CMAGAKJ67e9hRZgfC5SFTbZH8MgEmtqazKXjmkaJjWTJ'
   );
 

diff --git a/clients/js/src/generated/instructions/deleteCandyGuard.ts b/clients/js/src/generated/instructions/deleteCandyGuard.ts
@@ -68,7 +68,7 @@ export function deleteCandyGuard(
 ): TransactionBuilder {
   // Program ID.
   const programId = context.programs.getPublicKey(
-    'mplCandyGuard',
+    'mplCandyGuardAsset',
     'CMAGAKJ67e9hRZgfC5SFTbZH8MgEmtqazKXjmkaJjWTJ'
   );
 

diff --git a/clients/js/src/generated/instructions/deleteCandyMachine.ts b/clients/js/src/generated/instructions/deleteCandyMachine.ts
@@ -72,7 +72,7 @@ export function deleteCandyMachine(
 ): TransactionBuilder {
   // Program ID.
   const programId = context.programs.getPublicKey(
-    'mplCandyMachineCore',
+    'mplCandyMachineCoreAsset',
     'CMACYFENjoBMHzapRXyo1JZkVS6EtaDDzkjMrmQLvr4J'
   );
 

diff --git a/clients/js/src/generated/instructions/initializeCandyMachineV2.ts b/clients/js/src/generated/instructions/initializeCandyMachineV2.ts
@@ -192,7 +192,7 @@ export function initializeCandyMachineV2(
 ): TransactionBuilder {
   // Program ID.
   const programId = context.programs.getPublicKey(
-    'mplCandyMachineCore',
+    'mplCandyMachineCoreAsset',
     'CMACYFENjoBMHzapRXyo1JZkVS6EtaDDzkjMrmQLvr4J'
   );
 

diff --git a/clients/js/src/generated/instructions/mintAssetFromCandyMachine.ts b/clients/js/src/generated/instructions/mintAssetFromCandyMachine.ts
@@ -122,7 +122,7 @@ export function mintAssetFromCandyMachine(
 ): TransactionBuilder {
   // Program ID.
   const programId = context.programs.getPublicKey(
-    'mplCandyMachineCore',
+    'mplCandyMachineCoreAsset',
     'CMACYFENjoBMHzapRXyo1JZkVS6EtaDDzkjMrmQLvr4J'
   );
 

diff --git a/clients/js/src/generated/instructions/mintV2.ts b/clients/js/src/generated/instructions/mintV2.ts
@@ -145,7 +145,7 @@ export function mintV2(
 ): TransactionBuilder {
   // Program ID.
   const programId = context.programs.getPublicKey(
-    'mplCandyGuard',
+    'mplCandyGuardAsset',
     'CMAGAKJ67e9hRZgfC5SFTbZH8MgEmtqazKXjmkaJjWTJ'
   );
 

diff --git a/clients/js/src/generated/instructions/route.ts b/clients/js/src/generated/instructions/route.ts
@@ -92,7 +92,7 @@ export function route(
 ): TransactionBuilder {
   // Program ID.
   const programId = context.programs.getPublicKey(
-    'mplCandyGuard',
+    'mplCandyGuardAsset',
     'CMAGAKJ67e9hRZgfC5SFTbZH8MgEmtqazKXjmkaJjWTJ'
   );
 

diff --git a/clients/js/src/generated/instructions/setCandyGuardAuthority.ts b/clients/js/src/generated/instructions/setCandyGuardAuthority.ts
@@ -82,7 +82,7 @@ export function setCandyGuardAuthority(
 ): TransactionBuilder {
   // Program ID.
   const programId = context.programs.getPublicKey(
-    'mplCandyGuard',
+    'mplCandyGuardAsset',
     'CMAGAKJ67e9hRZgfC5SFTbZH8MgEmtqazKXjmkaJjWTJ'
   );
 

diff --git a/clients/js/src/generated/instructions/setCandyMachineAuthority.ts b/clients/js/src/generated/instructions/setCandyMachineAuthority.ts
@@ -84,7 +84,7 @@ export function setCandyMachineAuthority(
 ): TransactionBuilder {
   // Program ID.
   const programId = context.programs.getPublicKey(
-    'mplCandyMachineCore',
+    'mplCandyMachineCoreAsset',
     'CMACYFENjoBMHzapRXyo1JZkVS6EtaDDzkjMrmQLvr4J'
   );