Merge branch 'main' of github.com:metaplex-foundation/mpl-core

Author: blockiosaurus

.github/.env

@@ -1,5 +1,5 @@
 CARGO_TERM_COLOR=always
-NODE_VERSION=16.x
+NODE_VERSION=20.x
 PROGRAMS=["mpl-core"]
 RUST_VERSION=1.75.0
 SOLANA_VERSION=1.17.25

.github/workflows/test-js-client.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: ["16.x", "18.x"]
+        node: ["20.x", "22.x"]
     steps:
       - name: Git checkout
         uses: actions/checkout@v4

Cargo.lock

@@ -11,15 +11,14 @@ version = "0.8.1-beta.1"
 crate-type = ["cdylib", "lib"]
 
 [features]
-anchor = ["dep:anchor-lang"]
+anchor = ["dep:anchor-lang", "kaigan/anchor"]
 serde = ["dep:serde", "dep:serde_with"]
 test-sbf = []
 
 [dependencies]
 anchor-lang = { version = "0.30.0", optional = true }
 base64 = "0.22.0"
 borsh = "^0.10"
-kaigan = { version = "0.2.5", features = ["serde"] }
 modular-bitfield = "0.11.2"
 num-derive = "^0.3"
 num-traits = "^0.2"
@@ -30,6 +29,8 @@ serde_with = { version = "^3.0", optional = true }
 solana-program = "> 1.14"
 thiserror = "^1.0"
 
+kaigan = { version = "0.2.6", features = ["serde"], optional = false }
+
 [dev-dependencies]
 assert_matches = "1.5.0"
 solana-program-test = "> 1.14"

clients/rust/Cargo.toml

@@ -201,26 +201,33 @@ fn update<'a>(
                         return Err(MplCoreError::PermanentDelegatesPreventMove.into());
                     }
 
+                    // Create a default update delegate to be updated with the fetched plugin.
+                    let mut plugin: UpdateDelegate = UpdateDelegate::default();
+
                     // Make sure the authority has authority to add the asset to the new collection.
                     if plugin_set.contains(&PluginType::UpdateDelegate) {
                         // Fetch the update delegate on the new collection.
-                        let (plugin_authority, _, _) = fetch_plugin::<CollectionV1, UpdateDelegate>(
+                        // Do not ignore the return plugin as we need to check the additional delegates.
+                        let (plugin_authority, fetched_plugin, _) = fetch_plugin::<CollectionV1, UpdateDelegate>(
                             new_collection_account,
                             PluginType::UpdateDelegate,
                         )?;
 
-                        if assert_collection_authority(
+                        plugin = fetched_plugin;
+
+                        if (assert_collection_authority(
                             &new_collection,
                             authority,
                             &plugin_authority,
                         )
                         .is_err()
-                            && authority.key != &new_collection.update_authority
+                            && authority.key != &new_collection.update_authority)
+                            && !plugin.additional_delegates.contains(&authority.key)
                         {
                             solana_program::msg!("UA: Rejected");
                             return Err(MplCoreError::InvalidAuthority.into());
                         }
-                    } else if authority.key != &new_collection.update_authority {
+                    } else if authority.key != &new_collection.update_authority && !plugin.additional_delegates.contains(&authority.key) {
                         solana_program::msg!("UA: Rejected");
                         return Err(MplCoreError::InvalidAuthority.into());
                     }