chore: merge conflicts

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

@@ -160,13 +160,10 @@ export function writeGroupExternalPluginAdapterDataV1(
     resolvedAccounts
   ).sort((a, b) => a.index - b.index);
 
-  // Use the `omitted` strategy so that optional accounts like `buffer` are
-  // not replaced by a dummy Program ID when undefined. This prevents sending
-  // a placeholder account that would otherwise be interpreted on-chain as an
-  // actual data buffer and cause the "TwoDataSources" error.
+  // Keys and Signers.
   const [keys, signers] = getAccountMetasAndSigners(
     orderedAccounts,
-    'omitted',
+    'programId',
     programId
   );
 

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

@@ -54,6 +54,7 @@ export * from './externalPluginAdapterType';
 export * from './externalRegistryRecord';
 export * from './externalValidationResult';
 export * from './freezeDelegate';
+export * from './freezeExecute';
 export * from './groups';
 export * from './hashablePluginSchema';
 export * from './hashedAssetSchema';

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

@@ -33,6 +33,8 @@ import {
   EditionArgs,
   FreezeDelegate,
   FreezeDelegateArgs,
+  FreezeExecute,
+  FreezeExecuteArgs,
   Groups,
   GroupsArgs,
   ImmutableMetadata,
@@ -58,6 +60,7 @@ import {
   getBurnDelegateSerializer,
   getEditionSerializer,
   getFreezeDelegateSerializer,
+  getFreezeExecuteSerializer,
   getGroupsSerializer,
   getImmutableMetadataSerializer,
   getPermanentBurnDelegateSerializer,
@@ -85,7 +88,8 @@ export type Plugin =
   | { __kind: 'VerifiedCreators'; fields: [VerifiedCreators] }
   | { __kind: 'Autograph'; fields: [Autograph] }
   | { __kind: 'BubblegumV2'; fields: [BubblegumV2] }
-  | { __kind: 'Groups'; fields: [Groups] };
+  | { __kind: 'Groups'; fields: [Groups] }
+  | { __kind: 'FreezeExecute'; fields: [FreezeExecute] };
 
 export type PluginArgs =
   | { __kind: 'Royalties'; fields: [BaseRoyaltiesArgs] }
@@ -107,7 +111,8 @@ export type PluginArgs =
   | { __kind: 'VerifiedCreators'; fields: [VerifiedCreatorsArgs] }
   | { __kind: 'Autograph'; fields: [AutographArgs] }
   | { __kind: 'BubblegumV2'; fields: [BubblegumV2Args] }
-  | { __kind: 'Groups'; fields: [GroupsArgs] };
+  | { __kind: 'Groups'; fields: [GroupsArgs] }
+  | { __kind: 'FreezeExecute'; fields: [FreezeExecuteArgs] };
 
 export function getPluginSerializer(): Serializer<PluginArgs, Plugin> {
   return dataEnum<Plugin>(
@@ -214,6 +219,12 @@ export function getPluginSerializer(): Serializer<PluginArgs, Plugin> {
           ['fields', tuple([getGroupsSerializer()])],
         ]),
       ],
+      [
+        'FreezeExecute',
+        struct<GetDataEnumKindContent<Plugin, 'FreezeExecute'>>([
+          ['fields', tuple([getFreezeExecuteSerializer()])],
+        ]),
+      ],
     ],
     { description: 'Plugin' }
   ) as Serializer<PluginArgs, Plugin>;
@@ -291,6 +302,10 @@ export function plugin(
   kind: 'Groups',
   data: GetDataEnumKindContent<PluginArgs, 'Groups'>['fields']
 ): GetDataEnumKind<PluginArgs, 'Groups'>;
+export function plugin(
+  kind: 'FreezeExecute',
+  data: GetDataEnumKindContent<PluginArgs, 'FreezeExecute'>['fields']
+): GetDataEnumKind<PluginArgs, 'FreezeExecute'>;
 export function plugin<K extends PluginArgs['__kind']>(
   kind: K,
   data?: any

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

@@ -26,6 +26,7 @@ export enum PluginType {
   Autograph,
   BubblegumV2,
   Groups,
+  FreezeExecute,
 }
 
 export type PluginTypeArgs = PluginType;

clients/js/src/plugins/types.ts

@@ -13,6 +13,8 @@ import {
   EditionArgs,
   FreezeDelegate,
   FreezeDelegateArgs,
+  FreezeExecute,
+  FreezeExecuteArgs,
   ImmutableMetadata,
   PermanentBurnDelegate,
   PermanentFreezeDelegate,

clients/rust/src/generated/types/mod.rs

@@ -33,6 +33,7 @@ pub(crate) mod r#external_registry_record;
 pub(crate) mod r#external_validation_result;
 pub(crate) mod r#extra_account;
 pub(crate) mod r#freeze_delegate;
+pub(crate) mod r#freeze_execute;
 pub(crate) mod r#groups;
 pub(crate) mod r#hashable_plugin_schema;
 pub(crate) mod r#hashed_asset_schema;
@@ -104,6 +105,7 @@ pub use self::r#external_registry_record::*;
 pub use self::r#external_validation_result::*;
 pub use self::r#extra_account::*;
 pub use self::r#freeze_delegate::*;
+pub use self::r#freeze_execute::*;
 pub use self::r#groups::*;
 pub use self::r#hashable_plugin_schema::*;
 pub use self::r#hashed_asset_schema::*;

clients/rust/src/generated/types/plugin.rs

@@ -12,6 +12,7 @@ use crate::generated::types::BubblegumV2;
 use crate::generated::types::BurnDelegate;
 use crate::generated::types::Edition;
 use crate::generated::types::FreezeDelegate;
+use crate::generated::types::FreezeExecute;
 use crate::generated::types::Groups;
 use crate::generated::types::ImmutableMetadata;
 use crate::generated::types::MasterEdition;
@@ -49,4 +50,5 @@ pub enum Plugin {
     Autograph(Autograph),
     BubblegumV2(BubblegumV2),
     Groups(Groups),
+    FreezeExecute(FreezeExecute),
 }

clients/rust/src/generated/types/plugin_type.rs

@@ -33,4 +33,5 @@ pub enum PluginType {
     Autograph,
     BubblegumV2,
     Groups,
+    FreezeExecute,
 }

clients/rust/src/hooked/mod.rs

@@ -51,6 +51,7 @@ impl From<&Plugin> for PluginType {
             Plugin::Autograph(_) => PluginType::Autograph,
             Plugin::BubblegumV2(_) => PluginType::BubblegumV2,
             Plugin::Groups(_) => PluginType::Groups,
+            Plugin::FreezeExecute(_) => PluginType::FreezeExecute,
         }
     }
 }

clients/rust/src/hooked/plugin.rs

@@ -349,6 +349,12 @@ pub(crate) fn registry_records_to_plugin_list(
                         acc.bubblegum_v2 = Some(BubblegumV2Plugin { base, bubblegum_v2 })
                     }
                     Plugin::Groups(_) => {}
+                    Plugin::FreezeExecute(freeze_execute) => {
+                        acc.freeze_execute = Some(FreezeExecutePlugin {
+                            base,
+                            freeze_execute,
+                        })
+                    }
                 }
             }
             Ok(acc)

idls/mpl_core.json

@@ -5337,6 +5337,14 @@
                 "defined": "Groups"
               }
             ]
+          },
+          {
+            "name": "FreezeExecute",
+            "fields": [
+              {
+                "defined": "FreezeExecute"
+              }
+            ]
           }
         ]
       }
@@ -5396,6 +5404,9 @@
           },
           {
             "name": "Groups"
+          },
+          {
+            "name": "FreezeExecute"
           }
         ]
       }

package.json

@@ -1,30 +1,31 @@
 {
-    "private": true,
-    "scripts": {
-        "programs:build": "./configs/scripts/program/build.sh",
-        "programs:test": "RUST_LOG=error ./configs/scripts/program/test.sh",
-        "programs:debug": "./configs/scripts/program/test.sh",
-        "programs:clean": "./configs/scripts/program/clean.sh",
-        "clients:rust:test": "./configs/scripts/client/test-rust.sh",
-        "clients:js:test": "./configs/scripts/client/test-js.sh",
-        "generate": "pnpm generate:idls && pnpm generate:clients",
-        "generate:idls": "node ./configs/shank.cjs",
-        "generate:clients": "node ./configs/kinobi.cjs",
-        "validator": "CI=1 amman start --config ./configs/validator.cjs",
-        "validator:debug": "amman start --config ./configs/validator.cjs",
-        "validator:logs": "CI=1 amman logs",
-        "validator:stop": "amman stop",
-        "lint:fix": "./configs/scripts/client/format-js.sh && ./configs/scripts/program/format.sh",
-        "format:fix": "pnpm lint:fix",
-        "lint": "./configs/scripts/client/lint-js.sh && ./configs/scripts/program/lint.sh",
-        "prepare": "husky"
-    },
-    "devDependencies": {
-        "@metaplex-foundation/amman": "^0.12.1",
-        "@metaplex-foundation/kinobi": "0.18.8-alpha.0",
-        "@metaplex-foundation/shank-js": "^0.1.7",
-        "husky": "^9.0.11",
-        "typescript": "^4.9.4"
-    },
-    "packageManager": "[email protected]"
+  "private": true,
+  "scripts": {
+    "programs:build": "./configs/scripts/program/build.sh",
+    "programs:test": "RUST_LOG=error ./configs/scripts/program/test.sh",
+    "programs:debug": "./configs/scripts/program/test.sh",
+    "programs:clean": "./configs/scripts/program/clean.sh",
+    "clients:rust:test": "./configs/scripts/client/test-rust.sh",
+    "clients:js:test": "./configs/scripts/client/test-js.sh",
+    "generate": "pnpm generate:idls && pnpm generate:clients",
+    "generate:idls": "node ./configs/shank.cjs",
+    "generate:clients": "node ./configs/kinobi.cjs",
+    "validator": "CI=1 amman start --config ./configs/validator.cjs",
+    "validator:debug": "amman start --config ./configs/validator.cjs",
+    "validator:logs": "CI=1 amman logs",
+    "validator:stop": "amman stop",
+    "lint:fix": "./configs/scripts/client/format-js.sh && ./configs/scripts/program/format.sh",
+    "format:fix": "pnpm lint:fix",
+    "lint": "./configs/scripts/client/lint-js.sh && ./configs/scripts/program/lint.sh",
+    "prepare": "husky"
+  },
+  "devDependencies": {
+    "@metaplex-foundation/amman": "^0.12.1",
+    "@metaplex-foundation/kinobi": "0.18.8-alpha.0",
+    "@metaplex-foundation/shank-js": "^0.1.7",
+    "@types/node": "^24.0.3",
+    "husky": "^9.0.11",
+    "typescript": "^4.9.4"
+  },
+  "packageManager": "[email protected]"
 }

programs/mpl-core/src/plugins/mod.rs

@@ -64,6 +64,8 @@ pub enum Plugin {
     BubblegumV2(BubblegumV2),
     /// Groups plugin stores parent group memberships of a collection for taxonomy purposes
     Groups(Groups),
+    /// Freeze Execute plugin.
+    FreezeExecute(FreezeExecute),
 }
 
 impl Plugin {
@@ -109,6 +111,7 @@ impl Plugin {
             Plugin::Autograph(inner) => inner,
             Plugin::BubblegumV2(inner) => inner,
             Plugin::Groups(inner) => inner,
+            Plugin::FreezeExecute(inner) => inner,
         }
     }
 }
@@ -142,6 +145,7 @@ impl DataBlob for Plugin {
                 Plugin::Autograph(autograph) => autograph.len(),
                 Plugin::BubblegumV2(bubblegum_v2) => bubblegum_v2.len(),
                 Plugin::Groups(groups) => groups.len(),
+                Plugin::FreezeExecute(freeze_execute) => freeze_execute.len(),
             }
     }
 }
@@ -198,6 +202,8 @@ pub enum PluginType {
     BubblegumV2,
     /// Groups plugin.
     Groups,
+    /// Freeze Execute plugin.
+    FreezeExecute,
 }
 
 impl PluginType {
@@ -238,6 +244,7 @@ impl From<&Plugin> for PluginType {
             Plugin::Autograph(_) => PluginType::Autograph,
             Plugin::BubblegumV2(_) => PluginType::BubblegumV2,
             Plugin::Groups(_) => PluginType::Groups,
+            Plugin::FreezeExecute(_) => PluginType::FreezeExecute,
         }
     }
 }
@@ -265,6 +272,7 @@ impl PluginType {
                 address: mpl_bubblegum::ID,
             },
             PluginType::Groups => Authority::UpdateAuthority,
+            PluginType::FreezeExecute => Authority::Owner,
         }
     }
 }
@@ -317,6 +325,7 @@ mod test {
             Plugin::Autograph(Autograph { signatures: vec![] }),
             Plugin::BubblegumV2(BubblegumV2 {}),
             Plugin::Groups(Groups { groups: vec![] }),
+            Plugin::FreezeExecute(FreezeExecute { frozen: false }),
         ];
 
         assert_eq!(
@@ -436,6 +445,7 @@ mod test {
             vec![Plugin::Groups(Groups {
                 groups: vec![Pubkey::default()],
             })],
+            vec![Plugin::FreezeExecute(FreezeExecute { frozen: true })],
         ];
 
         assert_eq!(