diff --git a/src/DefaultEmissionManager.sol b/src/DefaultEmissionManager.sol index 8739a28..16fb351 100644 --- a/src/DefaultEmissionManager.sol +++ b/src/DefaultEmissionManager.sol @@ -76,10 +76,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 index c1267db..20081ac 100644 --- 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); } @@ -147,9 +146,7 @@ contract DefaultEmissionManagerTest is Test { assertApproxEqAbs(newSupply, polygon.totalSupply(), _MAX_PRECISION_DELTA); uint256 totalAmtMinted = polygon.totalSupply() - initialTotalSupply; uint256 totalAmtMintedTwoFifth = totalAmtMinted * 2 / 5; - assertEq(matic.balanceOf(stakeManager), totalAmtMinted - totalAmtMintedTwoFifth); - assertEq(matic.balanceOf(treasury), 0); - assertEq(polygon.balanceOf(stakeManager), 0); + assertEq(polygon.balanceOf(stakeManager), totalAmtMinted - totalAmtMintedTwoFifth); assertEq(polygon.balanceOf(treasury), totalAmtMintedTwoFifth); } @@ -169,8 +166,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 +183,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 +210,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); } }