Derive multisigTokenAuthority from token mint info

Author: nvsriram

solana/tests/anchor.test.ts

@@ -504,7 +504,7 @@ describe("example-native-token-transfers", () => {
       const published = emitter.publishMessage(0, serialized, 200);
       const rawVaa = guardians.addSignatures(published, [0]);
       const vaa = deserialize("Ntt:WormholeTransfer", serialize(rawVaa));
-      const redeemTxs = ntt.redeem([vaa], sender, multisigTokenAuthority);
+      const redeemTxs = ntt.redeem([vaa], sender);
       await signSendWait(ctx, redeemTxs, signer);
 
       assert.bn(await testDummyTransferHook.counter.value()).equal(2);

solana/ts/lib/ntt.ts

@@ -549,14 +549,24 @@ export namespace NTT {
       nttMessage: Ntt.Message;
       revertOnDelay: boolean;
       recipient?: PublicKey;
-      multisigTokenAuthority?: PublicKey;
     },
     pdas?: Pdas
   ): Promise<TransactionInstruction> {
     const [major, , ,] = parseVersion(program.idl.version);
 
     pdas = pdas ?? NTT.pdas(program.programId);
 
+    const mintInfo = await splToken.getMint(
+      program.provider.connection,
+      config.mint,
+      undefined,
+      config.tokenProgram
+    );
+    let multisigTokenAuthority: PublicKey | null = null;
+    if (!mintInfo.mintAuthority?.equals(pdas.tokenAuthority())) {
+      multisigTokenAuthority = mintInfo.mintAuthority;
+    }
+
     const recipientAddress =
       args.recipient ??
       (await getInboxItem(program, args.chain, args.nttMessage))
@@ -584,19 +594,12 @@ export namespace NTT {
         },
         // NOTE: SPL Multisig token authority is only support for versions >= 3.x.x
         ...(major >= 3 && {
-          multisigTokenAuthority: args.multisigTokenAuthority ?? null,
+          multisigTokenAuthority,
         }),
       })
       .instruction();
 
-    const mintInfo = await splToken.getMint(
-      program.provider.connection,
-      config.mint,
-      undefined,
-      config.tokenProgram
-    );
     const transferHook = splToken.getTransferHook(mintInfo);
-
     if (transferHook) {
       const source = await custodyAccountAddress(pdas, config);
       const mint = config.mint;

solana/ts/sdk/ntt.ts

@@ -954,11 +954,7 @@ export class SolanaNtt<N extends Network, C extends SolanaChains>
     }
   }
 
-  async *redeem(
-    attestations: Ntt.Attestation[],
-    payer: AccountAddress<C>,
-    multisigTokenAuthority?: PublicKey
-  ) {
+  async *redeem(attestations: Ntt.Attestation[], payer: AccountAddress<C>) {
     const config = await this.getConfig();
     if (config.paused) throw new Error("Contract is paused");
 
@@ -1022,7 +1018,6 @@ export class SolanaNtt<N extends Network, C extends SolanaChains>
               })
             : NTT.createReleaseInboundMintInstruction(this.program, config, {
                 ...releaseArgs,
-                multisigTokenAuthority,
               });
 
         const tx = new Transaction();