Merge branch 'send-pol' into dev

0xPolygon · Jun 16, 2024 · bcc1ce0 · bcc1ce0
2 parents c0d3062 + 8b0a0b6
commit bcc1ce0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/src/DefaultEmissionManager.sol b/src/DefaultEmissionManager.sol
@@ -77,10 +77,12 @@ contract DefaultEmissionManager is Ownable2StepUpgradeable, IDefaultEmissionMana
         emit TokenMint(amountToMint, msg.sender);
 
         IPolygonEcosystemToken _token = token;
+
         _token.mint(address(this), amountToMint);
+
         _token.safeTransfer(treasury, treasuryAmt);
-        // backconvert POL to MATIC before sending to StakeManager
-        migration.unmigrateTo(stakeManager, stakeManagerAmt);
+
+        _token.safeTransfer(stakeManager, stakeManagerAmt);
     }
 
     /// @inheritdoc IDefaultEmissionManager

diff --git a/test/DefaultEmissionManager.t.sol b/test/DefaultEmissionManager.t.sol
@@ -127,7 +127,6 @@ contract DefaultEmissionManagerTest is Test {
         emissionManager.mint();
         // timeElapsed is zero, so no minting
         assertEq(polygon.balanceOf(stakeManager), 0);
-        assertEq(matic.balanceOf(stakeManager), 0);
         assertEq(polygon.balanceOf(treasury), 0);
     }
 
@@ -169,8 +168,7 @@ contract DefaultEmissionManagerTest is Test {
         assertApproxEqAbs(newSupply, polygon.totalSupply(), _MAX_PRECISION_DELTA);
         uint256 balance = (polygon.totalSupply() - initialTotalSupply) * 2 / 5;
         uint256 stakeManagerBalance = (polygon.totalSupply() - initialTotalSupply) - balance;
-        assertEq(matic.balanceOf(stakeManager), stakeManagerBalance);
-        assertEq(polygon.balanceOf(stakeManager), 0);
+        assertEq(polygon.balanceOf(stakeManager), stakeManagerBalance);
         assertEq(polygon.balanceOf(treasury), balance);
 
         skip(delay);
@@ -187,8 +185,7 @@ contract DefaultEmissionManagerTest is Test {
         balance = totalAmtMintedTwoFifth;
         stakeManagerBalance = totalAmtMinted - totalAmtMintedTwoFifth;
 
-        assertEq(matic.balanceOf(stakeManager), stakeManagerBalance);
-        assertEq(polygon.balanceOf(stakeManager), 0);
+        assertEq(polygon.balanceOf(stakeManager), stakeManagerBalance);
         assertEq(polygon.balanceOf(treasury), balance);
     }
 
@@ -215,8 +212,7 @@ contract DefaultEmissionManagerTest is Test {
             balance = totalAmtMintedTwoFifth;
             stakeManagerBalance = totalAmtMinted - totalAmtMintedTwoFifth;
 
-            assertEq(matic.balanceOf(stakeManager), stakeManagerBalance);
-            assertEq(polygon.balanceOf(stakeManager), 0);
+            assertEq(polygon.balanceOf(stakeManager), stakeManagerBalance);
             assertEq(polygon.balanceOf(treasury), balance);
         }
     }