Fix for token entangler royalties (metaplex-foundation#1272)

Author: bhgames

js/packages/cli/src/token-entangler-cli.ts

@@ -281,7 +281,7 @@ programCommand('swap')
     const tokenBEscrow = result[2];
     const transferAuthority = web3.Keypair.generate();
     const paymentTransferAuthority = web3.Keypair.generate();
-    const tokenMetadata = await getMetadata(tokenMint);
+    const replacementTokenMetadata = await getMetadata(replacementTokenMint);
     const signers = [transferAuthority];
 
     //@ts-ignore
@@ -297,7 +297,7 @@ programCommand('swap')
     const remainingAccounts = [];
 
     const metadataObj = await anchorProgram.provider.connection.getAccountInfo(
-      tokenMetadata,
+      replacementTokenMetadata,
     );
     const metadataDecoded: Metadata = decodeMetadata(
       Buffer.from(metadataObj.data),
@@ -332,7 +332,7 @@ programCommand('swap')
         transferAuthority: transferAuthority.publicKey,
         paymentTransferAuthority: paymentTransferAuthority.publicKey,
         token,
-        tokenMetadata,
+        replacementTokenMetadata,
         replacementToken,
         replacementTokenMint,
         tokenAEscrow,

js/packages/token-entangler/src/utils/entangler.ts

@@ -335,7 +335,7 @@ export const swapEntanglement = async (
   const tokenBEscrow = result[2];
   const transferAuthority = Keypair.generate();
   const paymentTransferAuthority = Keypair.generate();
-  const tokenMetadata = await getMetadata(tokenMint);
+  const replacementTokenMetadata = await getMetadata(replacementTokenMint);
   const signers = [transferAuthority];
 
   //@ts-ignore
@@ -345,13 +345,13 @@ export const swapEntanglement = async (
   const paymentAccount = isNative
     ? anchorWallet.publicKey
     : //@ts-ignore
-    (await getAtaForMint(epObj.treasuryMint, anchorWallet.publicKey))[0];
+      (await getAtaForMint(epObj.treasuryMint, anchorWallet.publicKey))[0];
 
   if (!isNative) signers.push(paymentTransferAuthority);
   const remainingAccounts = [];
 
   const metadataObj = await anchorProgram.provider.connection.getAccountInfo(
-    tokenMetadata,
+    replacementTokenMetadata,
   );
   const metadataDecoded: Metadata = decodeMetadata(
     //@ts-ignore
@@ -394,7 +394,7 @@ export const swapEntanglement = async (
       transferAuthority: transferAuthority.publicKey,
       paymentTransferAuthority: paymentTransferAuthority.publicKey,
       token,
-      tokenMetadata,
+      replacementTokenMetadata,
       replacementToken,
       replacementTokenMint,
       tokenAEscrow,
@@ -425,16 +425,16 @@ export const swapEntanglement = async (
     ),
     ...(!isNative
       ? [
-        Token.createApproveInstruction(
-          TOKEN_PROGRAM_ID,
-          paymentAccount,
-          paymentTransferAuthority.publicKey,
-          anchorWallet.publicKey,
-          [],
-          //@ts-ignore
-          epObj.price.toNumber(),
-        ),
-      ]
+          Token.createApproveInstruction(
+            TOKEN_PROGRAM_ID,
+            paymentAccount,
+            paymentTransferAuthority.publicKey,
+            anchorWallet.publicKey,
+            [],
+            //@ts-ignore
+            epObj.price.toNumber(),
+          ),
+        ]
       : []),
     instruction,
     Token.createRevokeInstruction(
@@ -445,13 +445,13 @@ export const swapEntanglement = async (
     ),
     ...(!isNative
       ? [
-        Token.createRevokeInstruction(
-          TOKEN_PROGRAM_ID,
-          paymentAccount,
-          anchorWallet.publicKey,
-          [],
-        ),
-      ]
+          Token.createRevokeInstruction(
+            TOKEN_PROGRAM_ID,
+            paymentAccount,
+            anchorWallet.publicKey,
+            [],
+          ),
+        ]
       : []),
   ];
   const txnResult = await ContextConnection.sendTransactionWithRetry(
@@ -487,7 +487,6 @@ export const searchEntanglements = async (
   const searchMint = new PublicKey(mint);
   const searchAuthority = new PublicKey(authority);
 
-
   const searchMintAAccounts =
     await anchorProgram.provider.connection.getProgramAccounts(
       TOKEN_ENTANGLEMENT_PROGRAM_ID,
@@ -505,7 +504,7 @@ export const searchEntanglements = async (
               offset: 8 + 160,
               bytes: searchAuthority.toString(),
             },
-          }
+          },
         ],
       },
     );
@@ -526,7 +525,7 @@ export const searchEntanglements = async (
               offset: 8 + 160,
               bytes: searchAuthority.toString(),
             },
-          }
+          },
         ],
       },
     );
@@ -535,10 +534,8 @@ export const searchEntanglements = async (
     ...searchMintAAccounts,
     ...searchMintBAccounts,
   ];
-  const entanglements = entanglementsAccounts.map(
-    account =>
-      anchorProgram.account.entangledPair
-        .fetch(account.pubkey)
+  const entanglements = entanglementsAccounts.map(account =>
+    anchorProgram.account.entangledPair.fetch(account.pubkey),
   );
   // console.log('Found', mint, entanglements.length, 'entanglements');
   return Promise.all(entanglements);
@@ -558,7 +555,12 @@ export const getOwnedNFTMints = async (
       anchorWallet.publicKey,
       { programId: TOKEN_PROGRAM_ID },
     );
-  const NFTMints = TokenAccounts.value.map(val => val.account.data.parsed).filter(val => val.info.tokenAmount.amount != 0 && val.info.tokenAmount.decimals === 0);
+  const NFTMints = TokenAccounts.value
+    .map(val => val.account.data.parsed)
+    .filter(
+      val =>
+        val.info.tokenAmount.amount != 0 && val.info.tokenAmount.decimals === 0,
+    );
 
   return NFTMints;
 };

rust/token-entangler/src/lib.rs

@@ -19,6 +19,7 @@ const PREFIX: &str = "token_entangler";
 const ESCROW: &str = "escrow";
 const A_NAME: &str = "A";
 const B_NAME: &str = "B";
+#[program]
 pub mod token_entangler {
     use super::*;
 
@@ -153,7 +154,7 @@ pub mod token_entangler {
         let payment_account = &ctx.accounts.payment_account;
         let payment_transfer_authority = &ctx.accounts.payment_transfer_authority;
         let token = &ctx.accounts.token;
-        let token_metadata = &ctx.accounts.token_metadata;
+        let replacement_token_metadata = &ctx.accounts.replacement_token_metadata;
         let replacement_token = &ctx.accounts.replacement_token;
         let replacement_token_mint = &ctx.accounts.replacement_token_mint;
         let transfer_authority = &ctx.accounts.transfer_authority;
@@ -201,11 +202,11 @@ pub mod token_entangler {
         if token.mint == entangled_pair.mint_a {
             swap_from_escrow = token_a_escrow;
             swap_to_escrow = token_b_escrow;
-            assert_metadata_valid(token_metadata, None, &entangled_pair.mint_a)?;
+            assert_metadata_valid(replacement_token_metadata, None, &entangled_pair.mint_b)?;
         } else if token.mint == entangled_pair.mint_b {
             swap_from_escrow = token_b_escrow;
             swap_to_escrow = token_a_escrow;
-            assert_metadata_valid(token_metadata, None, &entangled_pair.mint_b)?;
+            assert_metadata_valid(replacement_token_metadata, None, &entangled_pair.mint_a)?;
         } else {
             return Err(ErrorCode::InvalidMint.into());
         }
@@ -256,7 +257,7 @@ pub mod token_entangler {
         if !entangled_pair.paid || entangled_pair.pays_every_time {
             pay_creator_fees(
                 &mut ctx.remaining_accounts.iter(),
-                &token_metadata,
+                &replacement_token_metadata,
                 &payment_account,
                 &payment_transfer_authority,
                 &payer,
@@ -323,7 +324,7 @@ pub struct Swap<'info> {
     payment_transfer_authority: UncheckedAccount<'info>,
     #[account(mut)]
     token: Account<'info, TokenAccount>,
-    token_metadata: UncheckedAccount<'info>,
+    replacement_token_metadata: UncheckedAccount<'info>,
     /// Set to unchecked to avoid stack size limits
     replacement_token_mint: UncheckedAccount<'info>,
     #[account(mut)]