fix: solana CCTPv2 redeem support (#3797)

Author: evan-gray

package-lock.json

@@ -74,7 +74,7 @@
     "@wormhole-foundation/sdk-sui": "3.5.0",
     "@wormhole-foundation/sdk-sui-core": "3.5.0",
     "@wormhole-foundation/sdk-sui-ntt": "2.0.5",
-    "@wormhole-labs/cctp-executor-route": "0.15.0",
+    "@wormhole-labs/cctp-executor-route": "0.16.0",
     "@wormhole-labs/wallet-aggregator-aptos": "1.3.0",
     "@wormhole-labs/wallet-aggregator-core": "0.0.1",
     "@wormhole-labs/wallet-aggregator-evm": "0.9.0",

package.json

@@ -506,7 +506,25 @@ const parseCCTPv2Receipt = async (
   // NOTE: the sender is the shim contract, not the user's wallet
   // so don't set that here
 
-  txData.recipient = messageBody.mintRecipient.toNative(receipt.to).toString();
+  if (receipt.to === 'Solana') {
+    if (!config.rpcs.Solana) {
+      throw new Error('Missing Solana RPC');
+    }
+    // the recipient on the VAA is the ATA
+    const ata = messageBody.mintRecipient.toNative(receipt.to).toString();
+    const connection = new Connection(config.rpcs.Solana);
+    try {
+      const account = await splToken.getAccount(connection, new PublicKey(ata));
+      txData.recipient = account.owner.toBase58();
+    } catch (e) {
+      console.error(e);
+      txData.recipient = ata;
+    }
+  } else {
+    txData.recipient = messageBody.mintRecipient
+      .toNative(receipt.to)
+      .toString();
+  }
 
   // The attestation doesn't have the destination token address, but we can deduce which it is
   // just based off the destination chain

src/utils/sdkv2.ts

@@ -608,7 +608,12 @@ function Redeem() {
       receivingWallet.address !== recipient &&
       routeName &&
       // These routes set the recipient address to the associated token address
-      ['ManualTokenBridge', 'ManualCCTP'].includes(routeName)
+      [
+        'ManualTokenBridge',
+        'ManualCCTP',
+        'CCTPv2FastExecutorRoute',
+        'CCTPv2StandardExecutorRoute',
+      ].includes(routeName)
     ) {
       const { address: receiveTokenAddress } = tokenIdFromTuple(receivedToken);