fix: validate new mint decimals and supply on migration

Author: Oighty

programs/earn/src/instructions/admin/initialize.rs

@@ -27,6 +27,8 @@ cfg_if::cfg_if!(
     if #[cfg(feature = "migrate")] {
         declare_program!(old_earn);
         use old_earn::{accounts::Global as OldGlobal, ID as OLD_EARN_PROGRAM_ID};
+
+        use crate::utils::conversion::{get_scaled_ui_config, principal_to_amount_up};
     }
 );
 
@@ -61,6 +63,13 @@ pub struct Initialize<'info> {
     )]
     pub m_mint: InterfaceAccount<'info, Mint>,
 
+    #[cfg(feature = "migrate")]
+    #[account(
+        address = old_global_account.mint @ EarnError::InvalidMint,
+        mint::decimals = m_mint.decimals 
+    )]
+    pub old_m_mint: InterfaceAccount<'info, Mint>,
+
     /// CHECK: This account is validated by its seeds
     #[account(
         seeds = [TOKEN_AUTHORITY_SEED],
@@ -184,6 +193,14 @@ impl Initialize<'_> {
                     ctx.accounts.old_global_account.index,            // index
                     ctx.accounts.old_global_account.timestamp as i64, // timestamp
                 )?;
+
+                // Check that the supply of the new mint (adjusted for the multiplier) is not greater than the supply of the old m mint
+                let scaled_ui_config = get_scaled_ui_config(&ctx.accounts.m_mint)?;
+                let new_supply_amount = principal_to_amount_up(ctx.accounts.m_mint.supply, scaled_ui_config.new_multiplier.into())?; 
+
+                if new_supply_amount > ctx.accounts.old_m_mint.supply {
+                    return err!(EarnError::InvalidMint);
+                }
             } else {
                 update_multiplier(
                     &mut ctx.accounts.m_mint,                       // mint

tests/unit/earn.test.ts

@@ -849,7 +849,7 @@ class EarnTest<V extends Variant = Variant.New> {
       case Variant.New:
         await this.earn.methods
           .initialize(initialIndex!)
-          .accounts({
+          .accountsPartial({
             admin: this.admin.publicKey,
             mMint: this.mMint.publicKey,
           })
@@ -862,6 +862,7 @@ class EarnTest<V extends Variant = Variant.New> {
           .accounts({
             admin: this.admin.publicKey,
             mMint: this.mMint.publicKey,
+            oldMMint: this.oldMMint!.publicKey,
           })
           .signers([this.admin])
           .rpc();
@@ -979,6 +980,7 @@ for (const variant of VARIANTS) {
               .accounts({
                 admin: $.admin.publicKey,
                 mMint: $.mMint.publicKey,
+                oldMMint: $.oldMMint!.publicKey,
               })
               .signers([$.admin])
               .rpc(),
@@ -987,7 +989,7 @@ for (const variant of VARIANTS) {
           await $.expectSystemError(
             $.earn.methods
               .initialize(initialIndex)
-              .accounts({
+              .accountsPartial({
                 admin: $.admin.publicKey,
                 mMint: $.mMint.publicKey,
               })
@@ -1013,6 +1015,7 @@ for (const variant of VARIANTS) {
                 admin: $.admin.publicKey,
                 mMint: $.mMint.publicKey,
                 globalAccount: wrongGlobalAccount,
+                oldMMint: $.oldMMint!.publicKey,
               })
               .signers([$.admin])
               .rpc(),
@@ -1046,6 +1049,7 @@ for (const variant of VARIANTS) {
               .accountsPartial({
                 admin: $.admin.publicKey,
                 mMint: wrongMint.publicKey,
+                oldMMint: $.oldMMint!.publicKey,
                 tokenProgram: TOKEN_PROGRAM_ID,
               })
               .signers([$.admin])
@@ -1083,6 +1087,7 @@ for (const variant of VARIANTS) {
               .accountsPartial({
                 admin: $.admin.publicKey,
                 mMint: $.mMint.publicKey,
+                oldMMint: $.oldMMint!.publicKey,
                 portalTokenAuthority: wrongPortalAuthority,
               })
               .signers([$.admin])
@@ -1119,6 +1124,7 @@ for (const variant of VARIANTS) {
               .accountsPartial({
                 admin: $.admin.publicKey,
                 mMint: $.mMint.publicKey,
+                oldMMint: $.oldMMint!.publicKey,
                 extSwapGlobal: wrongExtSwapGlobal,
               })
               .signers([$.admin])
@@ -1153,6 +1159,7 @@ for (const variant of VARIANTS) {
               .accountsPartial({
                 admin: $.admin.publicKey,
                 mMint: wrongMint.publicKey,
+                oldMMint: $.oldMMint!.publicKey,
               })
               .signers([$.admin])
               .rpc(),
@@ -1187,6 +1194,7 @@ for (const variant of VARIANTS) {
               .accountsPartial({
                 admin: $.admin.publicKey,
                 mMint: wrongMint.publicKey,
+                oldMMint: $.oldMMint!.publicKey,
               })
               .signers([$.admin])
               .rpc(),
@@ -1220,6 +1228,7 @@ for (const variant of VARIANTS) {
               .accountsPartial({
                 admin: $.admin.publicKey,
                 mMint: mint.publicKey,
+                oldMMint: $.oldMMint!.publicKey,
               })
               .signers([$.admin])
               .rpc(),
@@ -1258,6 +1267,10 @@ for (const variant of VARIANTS) {
       // migrate test cases
       // [X] given the old global account does not match the seed + program ID
       //   [X] it reverts with a constraint seed error
+      // [ ] given the new m mint doesn't have the same decimals as the old one
+      //   [ ] it reverts with a mint decimals error
+      // [ ] given the effective supply of the new mint is greater than than the supply of the old mint
+      //   [ ] it reverts with an invalid mint error
       // [X] given all the accounts are correct
       //   [X] the global account is created
       //     [X] the admin is set to the signer
@@ -1289,6 +1302,7 @@ for (const variant of VARIANTS) {
               .accountsPartial({
                 admin: $.admin.publicKey,
                 mMint: $.mMint.publicKey,
+                oldMMint: $.oldMMint!.publicKey,
                 oldGlobalAccount: wrongGlobalAccount,
               })
               .signers([$.admin])
@@ -1310,14 +1324,15 @@ for (const variant of VARIANTS) {
             .accounts({
               admin: $.admin.publicKey,
               mMint: $.mMint.publicKey,
+              oldMMint: $.oldMMint!.publicKey,
             })
             .signers([$.admin])
             .rpc();
         } else {
           // Create and send the transaction
           await $.earn.methods
             .initialize(initialIndex)
-            .accounts({
+            .accountsPartial({
               admin: $.admin.publicKey,
               mMint: $.mMint.publicKey,
             })