Merge branch 'main' of github.com:blockiosaurus/blob-asset into main

clients/js/src/generated/accounts/asset.ts

@@ -131,7 +131,7 @@ export async function safeFetchAllAsset(
 
 export function getAssetGpaBuilder(context: Pick<Context, 'rpc' | 'programs'>) {
   const programId = context.programs.getPublicKey(
-    'mplCoreProgram',
+    'mplCore',
     'CoREzp6dAdLVRKf3EM5tWrsXM2jQwRFeu5uhzsAyjYXL'
   );
   return gpaBuilder(context, programId)

clients/js/src/generated/accounts/collectionData.ts

@@ -134,7 +134,7 @@ export function getCollectionDataGpaBuilder(
   context: Pick<Context, 'rpc' | 'programs'>
 ) {
   const programId = context.programs.getPublicKey(
-    'mplCoreProgram',
+    'mplCore',
     'CoREzp6dAdLVRKf3EM5tWrsXM2jQwRFeu5uhzsAyjYXL'
   );
   return gpaBuilder(context, programId)

clients/js/src/generated/accounts/hashedAsset.ts

@@ -107,7 +107,7 @@ export function getHashedAssetGpaBuilder(
   context: Pick<Context, 'rpc' | 'programs'>
 ) {
   const programId = context.programs.getPublicKey(
-    'mplCoreProgram',
+    'mplCore',
     'CoREzp6dAdLVRKf3EM5tWrsXM2jQwRFeu5uhzsAyjYXL'
   );
   return gpaBuilder(context, programId)

clients/js/src/generated/accounts/pluginHeader.ts

@@ -109,7 +109,7 @@ export function getPluginHeaderGpaBuilder(
   context: Pick<Context, 'rpc' | 'programs'>
 ) {
   const programId = context.programs.getPublicKey(
-    'mplCoreProgram',
+    'mplCore',
     'CoREzp6dAdLVRKf3EM5tWrsXM2jQwRFeu5uhzsAyjYXL'
   );
   return gpaBuilder(context, programId)

clients/js/src/generated/accounts/pluginRegistry.ts

@@ -133,7 +133,7 @@ export function getPluginRegistryGpaBuilder(
   context: Pick<Context, 'rpc' | 'programs'>
 ) {
   const programId = context.programs.getPublicKey(
-    'mplCoreProgram',
+    'mplCore',
     'CoREzp6dAdLVRKf3EM5tWrsXM2jQwRFeu5uhzsAyjYXL'
   );
   return gpaBuilder(context, programId)

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

@@ -6,4 +6,4 @@
  * @see https://github.com/metaplex-foundation/kinobi
  */
 
-export * from './mplCoreProgram';
+export * from './mplCore';

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

@@ -295,7 +295,7 @@ nameToErrorMap.set('MissingUpdateAuthority', MissingUpdateAuthorityError);
  * Attempts to resolve a custom program error from the provided error code.
  * @category Errors
  */
-export function getMplCoreProgramErrorFromCode(
+export function getMplCoreErrorFromCode(
   code: number,
   program: Program,
   cause?: Error
@@ -308,7 +308,7 @@ export function getMplCoreProgramErrorFromCode(
  * Attempts to resolve a custom program error from the provided error name, i.e. 'Unauthorized'.
  * @category Errors
  */
-export function getMplCoreProgramErrorFromName(
+export function getMplCoreErrorFromName(
   name: string,
   program: Program,
   cause?: Error

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

@@ -93,7 +93,7 @@ export function addAuthority(
 ): TransactionBuilder {
   // Program ID.
   const programId = context.programs.getPublicKey(
-    'mplCoreProgram',
+    'mplCore',
     'CoREzp6dAdLVRKf3EM5tWrsXM2jQwRFeu5uhzsAyjYXL'
   );
 

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

@@ -81,7 +81,7 @@ export function addPlugin(
 ): TransactionBuilder {
   // Program ID.
   const programId = context.programs.getPublicKey(
-    'mplCoreProgram',
+    'mplCore',
     'CoREzp6dAdLVRKf3EM5tWrsXM2jQwRFeu5uhzsAyjYXL'
   );
 

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

@@ -84,7 +84,7 @@ export function burn(
 ): TransactionBuilder {
   // Program ID.
   const programId = context.programs.getPublicKey(
-    'mplCoreProgram',
+    'mplCore',
     'CoREzp6dAdLVRKf3EM5tWrsXM2jQwRFeu5uhzsAyjYXL'
   );
 

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

@@ -68,7 +68,7 @@ export function compress(
 ): TransactionBuilder {
   // Program ID.
   const programId = context.programs.getPublicKey(
-    'mplCoreProgram',
+    'mplCore',
     'CoREzp6dAdLVRKf3EM5tWrsXM2jQwRFeu5uhzsAyjYXL'
   );
 

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

@@ -101,7 +101,7 @@ export function create(
 ): TransactionBuilder {
   // Program ID.
   const programId = context.programs.getPublicKey(
-    'mplCoreProgram',
+    'mplCore',
     'CoREzp6dAdLVRKf3EM5tWrsXM2jQwRFeu5uhzsAyjYXL'
   );
 

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

@@ -93,7 +93,7 @@ export function createCollection(
 ): TransactionBuilder {
   // Program ID.
   const programId = context.programs.getPublicKey(
-    'mplCoreProgram',
+    'mplCore',
     'CoREzp6dAdLVRKf3EM5tWrsXM2jQwRFeu5uhzsAyjYXL'
   );
 

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

@@ -85,7 +85,7 @@ export function decompress(
 ): TransactionBuilder {
   // Program ID.
   const programId = context.programs.getPublicKey(
-    'mplCoreProgram',
+    'mplCore',
     'CoREzp6dAdLVRKf3EM5tWrsXM2jQwRFeu5uhzsAyjYXL'
   );
 

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

@@ -96,7 +96,7 @@ export function removeAuthority(
 ): TransactionBuilder {
   // Program ID.
   const programId = context.programs.getPublicKey(
-    'mplCoreProgram',
+    'mplCore',
     'CoREzp6dAdLVRKf3EM5tWrsXM2jQwRFeu5uhzsAyjYXL'
   );
 

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

@@ -81,7 +81,7 @@ export function removePlugin(
 ): TransactionBuilder {
   // Program ID.
   const programId = context.programs.getPublicKey(
-    'mplCoreProgram',
+    'mplCore',
     'CoREzp6dAdLVRKf3EM5tWrsXM2jQwRFeu5uhzsAyjYXL'
   );
 

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

@@ -90,7 +90,7 @@ export function transfer(
 ): TransactionBuilder {
   // Program ID.
   const programId = context.programs.getPublicKey(
-    'mplCoreProgram',
+    'mplCore',
     'CoREzp6dAdLVRKf3EM5tWrsXM2jQwRFeu5uhzsAyjYXL'
   );
 

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

@@ -85,7 +85,7 @@ export function update(
 ): TransactionBuilder {
   // Program ID.
   const programId = context.programs.getPublicKey(
-    'mplCoreProgram',
+    'mplCore',
     'CoREzp6dAdLVRKf3EM5tWrsXM2jQwRFeu5uhzsAyjYXL'
   );
 

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

@@ -81,7 +81,7 @@ export function updatePlugin(
 ): TransactionBuilder {
   // Program ID.
   const programId = context.programs.getPublicKey(
-    'mplCoreProgram',
+    'mplCore',
     'CoREzp6dAdLVRKf3EM5tWrsXM2jQwRFeu5uhzsAyjYXL'
   );
 

clients/js/src/generated/programs/index.ts

@@ -6,4 +6,4 @@
  * @see https://github.com/metaplex-foundation/kinobi
  */
 
-export * from './mplCoreProgram';
+export * from './mplCore';

clients/js/src/generated/programs/mplCoreProgram.ts → clients/js/src/generated/programs/mplCore.ts

@@ -12,44 +12,41 @@ import {
   Program,
   PublicKey,
 } from '@metaplex-foundation/umi';
-import {
-  getMplCoreProgramErrorFromCode,
-  getMplCoreProgramErrorFromName,
-} from '../errors';
+import { getMplCoreErrorFromCode, getMplCoreErrorFromName } from '../errors';
 
-export const MPL_CORE_PROGRAM_PROGRAM_ID =
+export const MPL_CORE_PROGRAM_ID =
   'CoREzp6dAdLVRKf3EM5tWrsXM2jQwRFeu5uhzsAyjYXL' as PublicKey<'CoREzp6dAdLVRKf3EM5tWrsXM2jQwRFeu5uhzsAyjYXL'>;
 
-export function createMplCoreProgramProgram(): Program {
+export function createMplCoreProgram(): Program {
   return {
-    name: 'mplCoreProgram',
-    publicKey: MPL_CORE_PROGRAM_PROGRAM_ID,
+    name: 'mplCore',
+    publicKey: MPL_CORE_PROGRAM_ID,
     getErrorFromCode(code: number, cause?: Error) {
-      return getMplCoreProgramErrorFromCode(code, this, cause);
+      return getMplCoreErrorFromCode(code, this, cause);
     },
     getErrorFromName(name: string, cause?: Error) {
-      return getMplCoreProgramErrorFromName(name, this, cause);
+      return getMplCoreErrorFromName(name, this, cause);
     },
     isOnCluster() {
       return true;
     },
   };
 }
 
-export function getMplCoreProgramProgram<T extends Program = Program>(
+export function getMplCoreProgram<T extends Program = Program>(
   context: Pick<Context, 'programs'>,
   clusterFilter?: ClusterFilter
 ): T {
-  return context.programs.get<T>('mplCoreProgram', clusterFilter);
+  return context.programs.get<T>('mplCore', clusterFilter);
 }
 
-export function getMplCoreProgramProgramId(
+export function getMplCoreProgramId(
   context: Pick<Context, 'programs'>,
   clusterFilter?: ClusterFilter
 ): PublicKey {
   return context.programs.getPublicKey(
-    'mplCoreProgram',
-    MPL_CORE_PROGRAM_PROGRAM_ID,
+    'mplCore',
+    MPL_CORE_PROGRAM_ID,
     clusterFilter
   );
 }

clients/js/src/generated/types/hashablePluginSchema.ts

@@ -0,0 +1,48 @@
+/**
+ * This code was AUTOGENERATED using the kinobi library.
+ * Please DO NOT EDIT THIS FILE, instead use visitors
+ * to add features, then rerun kinobi to update it.
+ *
+ * @see https://github.com/metaplex-foundation/kinobi
+ */
+
+import {
+  Serializer,
+  array,
+  struct,
+  u64,
+} from '@metaplex-foundation/umi/serializers';
+import {
+  Authority,
+  AuthorityArgs,
+  Plugin,
+  PluginArgs,
+  getAuthoritySerializer,
+  getPluginSerializer,
+} from '.';
+
+export type HashablePluginSchema = {
+  index: bigint;
+  authorities: Array<Authority>;
+  plugin: Plugin;
+};
+
+export type HashablePluginSchemaArgs = {
+  index: number | bigint;
+  authorities: Array<AuthorityArgs>;
+  plugin: PluginArgs;
+};
+
+export function getHashablePluginSchemaSerializer(): Serializer<
+  HashablePluginSchemaArgs,
+  HashablePluginSchema
+> {
+  return struct<HashablePluginSchema>(
+    [
+      ['index', u64()],
+      ['authorities', array(getAuthoritySerializer())],
+      ['plugin', getPluginSerializer()],
+    ],
+    { description: 'HashablePluginSchema' }
+  ) as Serializer<HashablePluginSchemaArgs, HashablePluginSchema>;
+}

clients/js/src/generated/types/hashedAssetSchema.ts

@@ -12,17 +12,13 @@ import {
   bytes,
   struct,
 } from '@metaplex-foundation/umi/serializers';
-import { PluginHash, PluginHashArgs, getPluginHashSerializer } from '.';
 
 export type HashedAssetSchema = {
   assetHash: Uint8Array;
-  pluginHashes: Array<PluginHash>;
+  pluginHashes: Array<Uint8Array>;
 };
 
-export type HashedAssetSchemaArgs = {
-  assetHash: Uint8Array;
-  pluginHashes: Array<PluginHashArgs>;
-};
+export type HashedAssetSchemaArgs = HashedAssetSchema;
 
 export function getHashedAssetSchemaSerializer(): Serializer<
   HashedAssetSchemaArgs,
@@ -31,7 +27,7 @@ export function getHashedAssetSchemaSerializer(): Serializer<
   return struct<HashedAssetSchema>(
     [
       ['assetHash', bytes({ size: 32 })],
-      ['pluginHashes', array(getPluginHashSerializer())],
+      ['pluginHashes', array(bytes({ size: 32 }))],
     ],
     { description: 'HashedAssetSchema' }
   ) as Serializer<HashedAssetSchemaArgs, HashedAssetSchema>;

clients/js/src/generated/types/index.ts

@@ -14,10 +14,10 @@ export * from './dataState';
 export * from './externalPluginRecord';
 export * from './extraAccounts';
 export * from './freeze';
+export * from './hashablePluginSchema';
 export * from './hashedAssetSchema';
 export * from './key';
 export * from './plugin';
-export * from './pluginHash';
 export * from './pluginType';
 export * from './registryRecord';
 export * from './royalties';