fix release ix

Author: SC4RECOIN

programs/portal/src/instructions/release_inbound.rs

@@ -58,6 +58,7 @@ pub struct ReleaseInboundMint<'info> {
     pub earn_program: Program<'info, Earn>,
 
     #[account(
+        mut,
         seeds = [GLOBAL_SEED],
         seeds::program = earn::ID,
         bump = m_global.bump,

programs/portal/src/instructions/resolve_execute.rs

@@ -30,6 +30,7 @@ use crate::{
     messages::ValidatedTransceiverMessage,
     ntt_messages::{ChainId, TransceiverMessage, TransceiverMessageData, WormholeTransceiver},
     payloads::Payload,
+    peer::NttManagerPeer,
     queue::{
         inbox::{InboxItem, InboxRateLimit},
         outbox::OutboxRateLimit,
@@ -190,7 +191,7 @@ pub fn resolve_execute_vaa_v1<'a>(
         .untrim(mint_data.decimals)
         .map_err(NTTError::from)?;
 
-    let peer = pda(&[TransceiverPeer::SEED_PREFIX, emitter_chain]);
+    let transceiver_peer = pda(&[TransceiverPeer::SEED_PREFIX, emitter_chain]);
     let transceiver_message = pda(&[
         ValidatedTransceiverMessage::<TransceiverMessageData<Payload>>::SEED_PREFIX,
         emitter_chain,
@@ -218,7 +219,7 @@ pub fn resolve_execute_vaa_v1<'a>(
                 is_signer: false,
             },
             SerializableAccountMeta {
-                pubkey: peer,
+                pubkey: transceiver_peer,
                 is_writable: false,
                 is_signer: false,
             },
@@ -241,6 +242,7 @@ pub fn resolve_execute_vaa_v1<'a>(
     };
 
     let redeem = {
+        let peer = pda(&[NttManagerPeer::SEED_PREFIX, emitter_chain]);
         let transceiver = pda(&[RegisteredTransceiver::SEED_PREFIX, &crate::ID.to_bytes()]);
         let inbox_rate_limit = pda(&[InboxRateLimit::SEED_PREFIX, emitter_chain]);
         let outbox_rate_limit = pda(&[OutboxRateLimit::SEED_PREFIX]);
@@ -373,7 +375,7 @@ pub fn resolve_execute_vaa_v1<'a>(
             },
             SerializableAccountMeta {
                 pubkey: m_global,
-                is_writable: false,
+                is_writable: true,
                 is_signer: false,
             },
         ]
@@ -437,7 +439,7 @@ pub fn resolve_execute_vaa_v1<'a>(
         token_program,
     );
     let ext_token_account = get_associated_token_address_with_program_id(
-        &recipient,
+        &ntt_recipient,
         &destination_mint,
         &ext_token_program,
     );
@@ -451,7 +453,7 @@ pub fn resolve_execute_vaa_v1<'a>(
         },
         SerializableAccountMeta {
             pubkey: swap_global,
-            is_writable: true,
+            is_writable: false,
             is_signer: false,
         },
         SerializableAccountMeta {
@@ -489,6 +491,11 @@ pub fn resolve_execute_vaa_v1<'a>(
             is_writable: false,
             is_signer: false,
         },
+        SerializableAccountMeta {
+            pubkey: ext_token_program,
+            is_writable: false,
+            is_signer: false,
+        },
         SerializableAccountMeta {
             pubkey: System::id(),
             is_writable: false,

tests/unit/portal.test.ts

@@ -1072,7 +1072,7 @@ describe('Portal unit tests', () => {
       expect(accountData).toBeDefined();
       const resolveResult = encoder.decode('ExecutorAccountResolverResult', Buffer.from(accountData!.data));
 
-      const { instructions, address_lookup_tables } = resolveResult[0].Resolved[0][0][0];
+      const { instructions } = resolveResult[0].Resolved[0][0][0];
 
       const resolveKey = (key: PublicKey) => {
         const vaaPlaceholder = new PublicKey(Buffer.from('posted_vaa_000000000000000000000'));
@@ -1082,7 +1082,7 @@ describe('Portal unit tests', () => {
       };
 
       const redeemTx = new Transaction().add(
-        ...[instructions[0]].map(
+        ...instructions.map(
           (ix: any) =>
             new TransactionInstruction({
               programId: ix.program_id,
@@ -1096,14 +1096,22 @@ describe('Portal unit tests', () => {
         ),
       );
 
+      // check ext balance
+      let extTokenAccountInfo = await connection.getAccountInfo(extAta);
+      let extParsedTokenAccount = spl.unpackAccount(extAta, extTokenAccountInfo, TOKEN_PROGRAM);
+      expect(extParsedTokenAccount.amount).toBe(9099n);
+
+      // send transactions
       redeemTx.feePayer = payer.publicKey;
       redeemTx.recentBlockhash = svm.latestBlockhash();
       redeemTx.sign(payer);
       const redeemResult = svm.sendTransaction!(redeemTx);
+      expect((redeemResult as any).logs?.()).toBeDefined();
 
-      console.log('Redeem tx', JSON.stringify(redeemTx, null, 2));
-
-      console.log('Redeem result:', redeemResult.toString());
+      // check updated ext balance
+      extTokenAccountInfo = await connection.getAccountInfo(extAta);
+      extParsedTokenAccount = spl.unpackAccount(extAta, extTokenAccountInfo, TOKEN_PROGRAM);
+      expect(extParsedTokenAccount.amount).toBe(9198n);
     });
 
     it('tokens with merkle roots', async () => {