Merge pull request #153 from m0-foundation/kurtis/fix-m-mint-create

update CLI cmds & fix transfer in portal

Author: Oighty

pnpm-lock.yaml

@@ -135,7 +135,7 @@ pub struct TransferBurn<'info> {
 impl<'info> TransferBurn<'info> {
     // Manually validate accounts instead of using anchor constraints
     // so that the context can be shared (nested contexts do not support instruction args)
-    pub fn validate_accounts(&self, args: &TransferArgs) -> Result<(Pubkey, u8)> {
+    pub fn validate_accounts(&self, args: &TransferArgs) -> Result<u8> {
         let inbox_rate_limit = Pubkey::create_program_address(
             &[
                 InboxRateLimit::SEED_PREFIX,
@@ -181,31 +181,41 @@ impl<'info> TransferBurn<'info> {
             return err!(ErrorCode::ConstraintAddress);
         }
 
-        Ok((session_owner_seed, session_authority_bump))
+        Ok(session_authority_bump)
     }
 }
 
 pub fn transfer_burn<'info>(
     ctx: Context<'_, '_, '_, 'info, TransferBurn<'info>>,
     args: TransferArgs,
 ) -> Result<()> {
-    let (session_owner_seed, session_authority_bump) = ctx.accounts.validate_accounts(&args)?;
+    let amount = args.amount;
+    transfer_burn_common(ctx, args, amount)
+}
+
+pub fn transfer_burn_common<'info>(
+    ctx: Context<'_, '_, '_, 'info, TransferBurn<'info>>,
+    args: TransferArgs,
+    principal_amount_m: u64,
+) -> Result<()> {
+    let session_authority_bump = ctx.accounts.validate_accounts(&args)?;
 
     let accs = ctx.accounts;
 
     let TransferArgs {
-        amount: principal,
         recipient_chain,
         recipient_address,
         should_queue,
+        ..
     } = args;
 
     // The provided "amount" is the principal amount of M to bridge.
     // We scale this up to M units using the scaled UI config multiplier.
     let scaled_ui_config = earn::utils::conversion::get_scaled_ui_config(&accs.common.mint)?;
+
     // Get the amount of M tokens to transfer using the multiplier
     let mut m_amount = earn::utils::conversion::principal_to_amount_down(
-        principal,
+        principal_amount_m,
         scaled_ui_config.new_multiplier.into(),
     )?;
 
@@ -241,11 +251,11 @@ pub fn transfer_burn<'info>(
         accs.common.custody.to_account_info(),
         accs.session_authority.to_account_info(),
         ctx.remaining_accounts,
-        principal,
+        principal_amount_m,
         accs.common.mint.decimals,
         &[&[
             crate::SESSION_AUTHORITY_SEED,
-            session_owner_seed.as_ref(),
+            accs.common.payer.key.as_ref(),
             args.keccak256().as_ref(),
             &[session_authority_bump],
         ]],
@@ -262,7 +272,7 @@ pub fn transfer_burn<'info>(
             },
             &[&[crate::TOKEN_AUTHORITY_SEED, &[ctx.bumps.token_authority]]],
         ),
-        principal,
+        principal_amount_m,
     )?;
 
     accs.common.custody.reload()?;

programs/portal/src/instructions/transfer.rs

@@ -5,8 +5,7 @@ use ext_swap::{accounts::SwapGlobal, program::ExtSwap};
 
 use crate::{
     TransferBurnBumps, __client_accounts_transfer_burn, __cpi_client_accounts_transfer_burn,
-    instructions::{ext_swap, transfer_burn, TransferArgs, TransferBurn},
-    ntt_messages::ChainId,
+    instructions::{ext_swap, transfer_burn_common, TransferArgs, TransferBurn},
 };
 
 #[derive(Accounts)]
@@ -76,12 +75,21 @@ pub struct TransferExtensionBurn<'info> {
 
 pub fn transfer_extension_burn<'info>(
     ctx: Context<'_, '_, '_, 'info, TransferExtensionBurn<'info>>,
-    ext_principal: u64,
-    recipient_chain: ChainId,
-    recipient_address: [u8; 32],
+    args: TransferArgs,
     destination_token: [u8; 32],
-    should_queue: bool,
 ) -> Result<()> {
+    // $M token account should be owned by token authority
+    if !ctx
+        .accounts
+        .common
+        .common
+        .from
+        .owner
+        .eq(ctx.accounts.common.token_authority.key)
+    {
+        return err!(ErrorCode::ConstraintTokenOwner);
+    }
+
     let m_pre_balance = ctx.accounts.common.common.from.amount;
     let token_auth_bump = ctx.bumps.common.token_authority;
 
@@ -108,7 +116,7 @@ pub fn transfer_extension_burn<'info>(
             },
             &[&[crate::TOKEN_AUTHORITY_SEED, &[token_auth_bump]]],
         ),
-        ext_principal,
+        args.amount,
     )?;
 
     // Amount of $M we got from unwrap
@@ -140,15 +148,7 @@ pub fn transfer_extension_burn<'info>(
     );
 
     // TransferBurn $M from unwrap
-    transfer_burn(
-        sub_ctx,
-        TransferArgs {
-            amount: m_amount,
-            recipient_chain: recipient_chain,
-            recipient_address: recipient_address,
-            should_queue: should_queue,
-        },
-    )?;
+    transfer_burn_common(sub_ctx, args, m_amount)?;
 
     // Overwrite default destination token
     ctx.accounts.common.common.outbox_item.destination_token = destination_token;

programs/portal/src/instructions/transfer_extension.rs

@@ -17,10 +17,8 @@ pub mod queue;
 pub mod registered_transceiver;
 pub mod transceivers;
 
-use crate::ntt_messages::ChainId;
-use transceivers::wormhole::instructions::*;
-
 use instructions::*;
+use transceivers::wormhole::instructions::*;
 
 #[cfg(not(feature = "no-entrypoint"))]
 solana_security_txt::security_txt! {
@@ -90,20 +88,10 @@ pub mod portal {
 
     pub fn transfer_extension_burn<'info>(
         ctx: Context<'_, '_, '_, 'info, TransferExtensionBurn<'info>>,
-        ext_principal: u64,
-        recipient_chain: ChainId,
-        recipient_address: [u8; 32],
+        args: TransferArgs,
         destination_token: [u8; 32],
-        should_queue: bool,
     ) -> Result<()> {
-        instructions::transfer_extension_burn(
-            ctx,
-            ext_principal,
-            recipient_chain,
-            recipient_address,
-            destination_token,
-            should_queue,
-        )
+        instructions::transfer_extension_burn(ctx, args, destination_token)
     }
 
     pub fn redeem(ctx: Context<Redeem>, args: RedeemArgs) -> Result<()> {