Merging in staging.

metaplex-foundation · Apr 25, 2024 · dada9a6 · dada9a6
2 parents 11d3215 + e939cb2
commit dada9a6
Show file tree

Hide file tree

Showing 218 changed files with 5,132 additions and 1,324 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/clients/js/package.json b/clients/js/package.json
@@ -33,8 +33,8 @@
   "devDependencies": {
     "@metaplex-foundation/mpl-toolbox": "^0.8.0",
     "@ava/typescript": "^3.0.1",
-    "@metaplex-foundation/umi": "^0.8.2",
-    "@metaplex-foundation/umi-bundle-tests": "^0.8.2",
+    "@metaplex-foundation/umi": "^0.8.10",
+    "@metaplex-foundation/umi-bundle-tests": "^0.8.10",
     "@solana/web3.js": "^1.73.0",
     "@typescript-eslint/eslint-plugin": "^5.0.0",
     "@typescript-eslint/parser": "^5.46.1",

diff --git a/clients/js/pnpm-lock.yaml b/clients/js/pnpm-lock.yaml
diff --git a/clients/js/src/authority.ts b/clients/js/src/authority.ts
@@ -1,9 +1,5 @@
 import { PublicKey } from '@metaplex-foundation/umi';
-import {
-  PluginAuthority,
-  pluginAuthority,
-} from './generated/types/pluginAuthority';
-import { BasePluginAuthority } from './types';
+import { pluginAuthority } from './plugins';
 
 // Authorities data helpers
 export function nonePluginAuthority() {
@@ -21,12 +17,3 @@ export function updatePluginAuthority() {
 export function addressPluginAuthority(address: PublicKey) {
   return pluginAuthority('Address', { address });
 }
-
-export function mapPluginAuthority(
-  authority: PluginAuthority
-): BasePluginAuthority {
-  return {
-    type: authority.__kind,
-    address: (authority as any).address,
-  };
-}
diff --git a/clients/js/src/generated/accounts/assetV1.ts b/clients/js/src/generated/accounts/assetV1.ts
@@ -31,10 +31,10 @@ import {
   getAssetV1AccountDataSerializer,
 } from '../../hooked';
 import {
+  BaseUpdateAuthorityArgs,
   KeyArgs,
-  UpdateAuthorityArgs,
+  getBaseUpdateAuthoritySerializer,
   getKeySerializer,
-  getUpdateAuthoritySerializer,
 } from '../types';
 
 export type AssetV1 = Account<AssetV1AccountData>;
@@ -108,14 +108,14 @@ export function getAssetV1GpaBuilder(
     .registerFields<{
       key: KeyArgs;
       owner: PublicKey;
-      updateAuthority: UpdateAuthorityArgs;
+      updateAuthority: BaseUpdateAuthorityArgs;
       name: string;
       uri: string;
       seq: OptionOrNullable<number | bigint>;
     }>({
       key: [0, getKeySerializer()],
       owner: [1, publicKeySerializer()],
-      updateAuthority: [33, getUpdateAuthoritySerializer()],
+      updateAuthority: [33, getBaseUpdateAuthoritySerializer()],
       name: [null, string()],
       uri: [null, string()],
       seq: [null, option(u64())],

diff --git a/clients/js/src/generated/instructions/addCollectionExternalPluginV1.ts b/clients/js/src/generated/instructions/addCollectionExternalPluginV1.ts
@@ -26,9 +26,9 @@ import {
   getAccountMetasAndSigners,
 } from '../shared';
 import {
-  ExternalPluginInitInfo,
-  ExternalPluginInitInfoArgs,
-  getExternalPluginInitInfoSerializer,
+  BaseExternalPluginInitInfo,
+  BaseExternalPluginInitInfoArgs,
+  getBaseExternalPluginInitInfoSerializer,
 } from '../types';
 
 // Accounts.
@@ -48,11 +48,11 @@ export type AddCollectionExternalPluginV1InstructionAccounts = {
 // Data.
 export type AddCollectionExternalPluginV1InstructionData = {
   discriminator: number;
-  initInfo: ExternalPluginInitInfo;
+  initInfo: BaseExternalPluginInitInfo;
 };
 
 export type AddCollectionExternalPluginV1InstructionDataArgs = {
-  initInfo: ExternalPluginInitInfoArgs;
+  initInfo: BaseExternalPluginInitInfoArgs;
 };
 
 export function getAddCollectionExternalPluginV1InstructionDataSerializer(): Serializer<
@@ -67,7 +67,7 @@ export function getAddCollectionExternalPluginV1InstructionDataSerializer(): Ser
     struct<AddCollectionExternalPluginV1InstructionData>(
       [
         ['discriminator', u8()],
-        ['initInfo', getExternalPluginInitInfoSerializer()],
+        ['initInfo', getBaseExternalPluginInitInfoSerializer()],
       ],
       { description: 'AddCollectionExternalPluginV1InstructionData' }
     ),

diff --git a/clients/js/src/generated/instructions/addCollectionPluginV1.ts b/clients/js/src/generated/instructions/addCollectionPluginV1.ts
@@ -30,11 +30,11 @@ import {
   getAccountMetasAndSigners,
 } from '../shared';
 import {
+  BasePluginAuthority,
+  BasePluginAuthorityArgs,
   Plugin,
   PluginArgs,
-  PluginAuthority,
-  PluginAuthorityArgs,
-  getPluginAuthoritySerializer,
+  getBasePluginAuthoritySerializer,
   getPluginSerializer,
 } from '../types';
 
@@ -56,12 +56,12 @@ export type AddCollectionPluginV1InstructionAccounts = {
 export type AddCollectionPluginV1InstructionData = {
   discriminator: number;
   plugin: Plugin;
-  initAuthority: Option<PluginAuthority>;
+  initAuthority: Option<BasePluginAuthority>;
 };
 
 export type AddCollectionPluginV1InstructionDataArgs = {
   plugin: PluginArgs;
-  initAuthority?: OptionOrNullable<PluginAuthorityArgs>;
+  initAuthority?: OptionOrNullable<BasePluginAuthorityArgs>;
 };
 
 export function getAddCollectionPluginV1InstructionDataSerializer(): Serializer<
@@ -77,7 +77,7 @@ export function getAddCollectionPluginV1InstructionDataSerializer(): Serializer<
       [
         ['discriminator', u8()],
         ['plugin', getPluginSerializer()],
-        ['initAuthority', option(getPluginAuthoritySerializer())],
+        ['initAuthority', option(getBasePluginAuthoritySerializer())],
       ],
       { description: 'AddCollectionPluginV1InstructionData' }
     ),

diff --git a/clients/js/src/generated/instructions/addExternalPluginV1.ts b/clients/js/src/generated/instructions/addExternalPluginV1.ts
@@ -26,9 +26,9 @@ import {
   getAccountMetasAndSigners,
 } from '../shared';
 import {
-  ExternalPluginInitInfo,
-  ExternalPluginInitInfoArgs,
-  getExternalPluginInitInfoSerializer,
+  BaseExternalPluginInitInfo,
+  BaseExternalPluginInitInfoArgs,
+  getBaseExternalPluginInitInfoSerializer,
 } from '../types';
 
 // Accounts.
@@ -50,11 +50,11 @@ export type AddExternalPluginV1InstructionAccounts = {
 // Data.
 export type AddExternalPluginV1InstructionData = {
   discriminator: number;
-  initInfo: ExternalPluginInitInfo;
+  initInfo: BaseExternalPluginInitInfo;
 };
 
 export type AddExternalPluginV1InstructionDataArgs = {
-  initInfo: ExternalPluginInitInfoArgs;
+  initInfo: BaseExternalPluginInitInfoArgs;
 };
 
 export function getAddExternalPluginV1InstructionDataSerializer(): Serializer<
@@ -69,7 +69,7 @@ export function getAddExternalPluginV1InstructionDataSerializer(): Serializer<
     struct<AddExternalPluginV1InstructionData>(
       [
         ['discriminator', u8()],
-        ['initInfo', getExternalPluginInitInfoSerializer()],
+        ['initInfo', getBaseExternalPluginInitInfoSerializer()],
       ],
       { description: 'AddExternalPluginV1InstructionData' }
     ),