test: add ts tests

Author: codewithgun

package.json

@@ -10,16 +10,17 @@
   "devDependencies": {
     "@coral-xyz/anchor-errors": "^0.31.0",
     "@solana/spl-token": "^0.4.8",
+    "@solana/spl-token-metadata": "^0.1.6",
     "@solana/web3.js": "^1.95.3",
     "@types/bn.js": "^5.1.0",
     "@types/chai": "^4.3.0",
     "@types/mocha": "^9.0.0",
     "chai": "^4.3.4",
+    "decimal.js": "^10.4.2",
     "mocha": "^9.0.3",
     "prettier": "^2.6.2",
-    "ts-mocha": "^10.0.0",
-    "typescript": "^4.3.5",
     "solana-bankrun": "^0.4.0",
-    "decimal.js": "^10.4.2"
+    "ts-mocha": "^10.0.0",
+    "typescript": "^4.3.5"
   }
-}
+}

pnpm-lock.yaml

@@ -142,7 +142,7 @@ pub fn handle_migrate_meteora_damm_lock_lp_token<'info>(
             let lp_to_lock =
                 migration_metadata.validate_and_get_self_partnered_creator_lock_amount()?;
             let lp_exclude_fee = exclude_fee_lp_amount(lp_to_lock, damm_migration_accounts)?;
-            migration_metadata.lock_as_self_partnered_creator(lp_exclude_fee);
+            migration_metadata.lock_as_self_partnered_creator(lp_exclude_fee)?;
             lp_exclude_fee
         }
         (true, false) => {

programs/dynamic-bonding-curve/src/instructions/migration/meteora_damm/meteora_damm_lock_lp_token.rs

@@ -112,11 +112,20 @@ impl MeteoraDammMigrationMetadata {
         Ok(lp_to_lock)
     }
 
-    pub fn lock_as_self_partnered_creator(&mut self, actual_lock_amount: u64) {
+    pub fn lock_as_self_partnered_creator(&mut self, actual_lock_amount: u64) -> Result<()> {
         self.set_creator_lock_status();
         self.set_partner_lock_status();
-        self.actual_creator_locked_lp = actual_lock_amount;
-        self.actual_partner_locked_lp = actual_lock_amount;
+
+        let total_lp_to_lock = self.creator_locked_lp.safe_add(self.partner_locked_lp)?;
+
+        self.actual_partner_locked_lp = actual_lock_amount
+            .safe_mul(self.partner_locked_lp)?
+            .safe_div(total_lp_to_lock)?;
+
+        self.actual_creator_locked_lp =
+            actual_lock_amount.safe_sub(self.actual_partner_locked_lp)?;
+
+        Ok(())
     }
 
     pub fn set_partner_lock_status(&mut self) {
@@ -173,6 +182,7 @@ impl MeteoraDammMigrationMetadata {
             PoolError::NotPermitToDoThisAction
         );
 
+        // Prevent existing migrated pool to claim lp fee
         require!(
             self.actual_creator_locked_lp != 0,
             PoolError::NotPermitToDoThisAction
@@ -198,6 +208,7 @@ impl MeteoraDammMigrationMetadata {
             PoolError::NotPermitToDoThisAction
         );
 
+        // Prevent existing migrated pool to claim lp fee
         require!(
             self.actual_partner_locked_lp != 0,
             PoolError::NotPermitToDoThisAction
@@ -225,14 +236,20 @@ impl MeteoraDammMigrationMetadata {
             PoolError::NotPermitToDoThisAction
         );
 
+        let total_actual_locked_lp = self
+            .actual_creator_locked_lp
+            .safe_add(self.actual_partner_locked_lp)?;
+
+        // Prevent existing migrated pool to claim lp fee
         require!(
-            self.actual_creator_locked_lp != 0,
+            total_actual_locked_lp != 0,
             PoolError::NotPermitToDoThisAction
         );
 
         let lp_to_claim = self
             .creator_locked_lp
-            .safe_sub(self.actual_creator_locked_lp)?;
+            .safe_add(self.partner_locked_lp)?
+            .safe_sub(total_actual_locked_lp)?;
 
         self.set_creator_claim_lp_fee_status();
         self.set_partner_claim_lp_fee_status();