compute creator hash using metadata args

Author: JeremyLi28

programs/mmm/src/instructions/cnft/sol_cnft_fulfill_buy.rs

@@ -10,9 +10,9 @@ use crate::{
     util::{
         assert_valid_fees_bp, check_allowlists_for_cnft, check_remaining_accounts_for_m2,
         get_buyside_seller_receives, get_lp_fee_bp, get_sol_fee, get_sol_lp_fee,
-        get_sol_total_price_and_next_price, hash_metadata, log_pool, pay_creator_fees_in_sol_cnft,
-        transfer_compressed_nft, try_close_escrow, try_close_pool, try_close_sell_state,
-        verify_creators, withdraw_m2,
+        get_sol_total_price_and_next_price, hash_creators_from_metadata_args, hash_metadata,
+        log_pool, pay_creator_fees_in_sol_cnft, transfer_compressed_nft, try_close_escrow,
+        try_close_pool, try_close_sell_state, withdraw_m2,
     },
     verify_referral::verify_referral,
 };
@@ -25,9 +25,6 @@ pub struct SolCnftFulfillBuyArgs {
     asset_id: Pubkey,
     // The Merkle root for the tree. Can be retrieved from off-chain data store.
     root: [u8; 32],
-    // The Keccak256 hash of the NFTs existing creators array (without the verified flag for the creator changed).
-    // The creators array is retrieved from off-chain data store.
-    creator_hash: [u8; 32],
     // A nonce ("number used once") value used to make the Merkle tree leaves unique.
     // This is the value of num_minted for the tree stored in the TreeConfig account at the time the NFT was minted.
     // The unique value for each asset can be retrieved from off-chain data store.
@@ -207,26 +204,8 @@ pub fn handler<'info>(
         remaining_accounts.split_at(creator_length)
     };
 
-    let creator_shares = args
-        .metadata_args
-        .creators
-        .iter()
-        .map(|c| c.share as u16)
-        .collect::<Vec<u16>>();
-
-    let creator_verified = args
-        .metadata_args
-        .creators
-        .iter()
-        .map(|c| c.verified)
-        .collect();
-
-    verify_creators(
-        creator_accounts.iter(),
-        creator_shares,
-        creator_verified,
-        args.creator_hash,
-    )?;
+    let creator_hash =
+        hash_creators_from_metadata_args(creator_accounts.iter(), &args.metadata_args)?;
 
     // 3. Transfer CNFT to buyer (pool or owner)
     let data_hash = hash_metadata(&args.metadata_args)?;
@@ -253,7 +232,7 @@ pub fn handler<'info>(
             ctx.accounts.bubblegum_program.key(),
             args.root,
             data_hash,
-            args.creator_hash,
+            creator_hash,
             args.nonce,
             args.index,
             None, // signer passed through from ctx
@@ -284,7 +263,7 @@ pub fn handler<'info>(
             ctx.accounts.bubblegum_program.key(),
             args.root,
             data_hash,
-            args.creator_hash,
+            creator_hash,
             args.nonce,
             args.index,
             None, // signer passed through from ctx

programs/mmm/src/util.rs

@@ -1331,12 +1331,21 @@ pub fn hash_metadata(metadata: &MetadataArgs) -> Result<[u8; 32]> {
     .to_bytes())
 }
 
-pub fn verify_creators(
+pub fn hash_creators_from_metadata_args(
     creator_accounts: Iter<AccountInfo>,
-    creator_shares: Vec<u16>,
-    creator_verified: Vec<bool>,
-    creator_hash: [u8; 32],
-) -> Result<()> {
+    metadata_args: &MetadataArgs,
+) -> Result<[u8; 32]> {
+    let creator_shares = metadata_args
+        .creators
+        .iter()
+        .map(|c| c.share as u16)
+        .collect::<Vec<u16>>();
+
+    let creator_verified = metadata_args
+        .creators
+        .iter()
+        .map(|c| c.verified)
+        .collect::<Vec<bool>>();
     // Check that all input arrays/vectors are of the same length
     if creator_accounts.len() != creator_shares.len()
         || creator_accounts.len() != creator_verified.len()
@@ -1360,17 +1369,7 @@ pub fn verify_creators(
     // Compute the hash from the Creator vector
     let computed_hash = hash_creators(&creators);
 
-    // Compare the computed hash with the provided hash
-    if computed_hash != creator_hash {
-        msg!(
-            "Computed hash does not match provided hash: {{\"computed\":{:?},\"provided\":{:?}}}",
-            computed_hash,
-            creator_hash
-        );
-        return Err(MMMErrorCode::InvalidCnftCreators.into());
-    }
-
-    Ok(())
+    Ok(computed_hash)
 }
 
 #[cfg(test)]

sdk/src/idl/mmm.ts

@@ -2688,15 +2688,6 @@ export type Mmm = {
               ]
             }
           },
-          {
-            "name": "creatorHash",
-            "type": {
-              "array": [
-                "u8",
-                32
-              ]
-            }
-          },
           {
             "name": "nonce",
             "type": "u64"
@@ -5969,15 +5960,6 @@ export const IDL: Mmm = {
               ]
             }
           },
-          {
-            "name": "creatorHash",
-            "type": {
-              "array": [
-                "u8",
-                32
-              ]
-            }
-          },
           {
             "name": "nonce",
             "type": "u64"

tests/mmm-cnft.spec.ts

@@ -225,7 +225,6 @@ describe('cnft tests', () => {
         .cnftFulfillBuy({
           assetId: new PublicKey(assetId),
           root: getByteArray(nft.tree.root),
-          creatorHash: getByteArray(nft.tree.creatorHash),
           nonce: new BN(nft.tree.nonce),
           index: nft.nft.nftIndex,
           minPaymentAmount: new BN(expectedBuyPrices.sellerReceives),
@@ -467,7 +466,6 @@ describe('cnft tests', () => {
         .cnftFulfillBuy({
           assetId: new PublicKey(assetId),
           root: getByteArray(nft.tree.root),
-          creatorHash: getByteArray(nft.tree.creatorHash),
           nonce: new BN(nft.tree.nonce),
           index: nft.nft.nftIndex,
           minPaymentAmount: new BN(expectedBuyPrices.sellerReceives),
@@ -683,7 +681,6 @@ describe('cnft tests', () => {
         .cnftFulfillBuy({
           assetId: new PublicKey(assetId),
           root: getByteArray(nft.tree.root),
-          creatorHash: getByteArray(nft.tree.creatorHash),
           nonce: new BN(nft.tree.nonce),
           index: nft.nft.nftIndex,
           minPaymentAmount: new BN(expectedBuyPrices.sellerReceives),