From 8b0a0b6a7c9a41e0a4ed8fc7961c10d6a5b9cefb Mon Sep 17 00:00:00 2001 From: Simon Dosch Date: Wed, 8 May 2024 11:50:51 +0200 Subject: [PATCH] send POL to StakeManager --- src/DefaultEmissionManager.sol | 6 ++++-- test/DefaultEmissionManager.t.sol | 14 ++++---------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/DefaultEmissionManager.sol b/src/DefaultEmissionManager.sol index 1c3884a..d1f4c27 100644 --- a/src/DefaultEmissionManager.sol +++ b/src/DefaultEmissionManager.sol @@ -68,10 +68,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 7e07ee7..3bbe168 100644 --- a/test/DefaultEmissionManager.t.sol +++ b/test/DefaultEmissionManager.t.sol @@ -125,7 +125,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); } @@ -145,9 +144,7 @@ contract DefaultEmissionManagerTest is Test { assertApproxEqAbs(newSupply, polygon.totalSupply(), _MAX_PRECISION_DELTA); uint256 totalAmtMinted = polygon.totalSupply() - initialTotalSupply; uint256 totalAmtMintedOneThird = totalAmtMinted / 3; - assertEq(matic.balanceOf(stakeManager), totalAmtMinted - totalAmtMintedOneThird); - assertEq(matic.balanceOf(treasury), 0); - assertEq(polygon.balanceOf(stakeManager), 0); + assertEq(polygon.balanceOf(stakeManager), totalAmtMinted - totalAmtMintedOneThird); assertEq(polygon.balanceOf(treasury), totalAmtMintedOneThird); } @@ -166,8 +163,7 @@ contract DefaultEmissionManagerTest is Test { assertApproxEqAbs(newSupply, polygon.totalSupply(), _MAX_PRECISION_DELTA); uint256 balance = (polygon.totalSupply() - initialTotalSupply) / 3; 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); initialTotalSupply = polygon.totalSupply(); // for the new run @@ -185,8 +181,7 @@ contract DefaultEmissionManagerTest is Test { balance += totalAmtMintedOneThird; stakeManagerBalance += totalAmtMinted - totalAmtMintedOneThird; - assertEq(matic.balanceOf(stakeManager), stakeManagerBalance); - assertEq(polygon.balanceOf(stakeManager), 0); + assertEq(polygon.balanceOf(stakeManager), stakeManagerBalance); assertEq(polygon.balanceOf(treasury), balance); } @@ -213,8 +208,7 @@ contract DefaultEmissionManagerTest is Test { balance += totalAmtMintedOneThird; stakeManagerBalance += totalAmtMinted - totalAmtMintedOneThird; - assertEq(matic.balanceOf(stakeManager), stakeManagerBalance); - assertEq(polygon.balanceOf(stakeManager), 0); + assertEq(polygon.balanceOf(stakeManager), stakeManagerBalance); assertEq(polygon.balanceOf(treasury), balance); } }