From b19182ad2069c921dce4e437525785cc5b586722 Mon Sep 17 00:00:00 2001 From: Ricardo Guilherme Schmidt <3esmit@gmail.com> Date: Wed, 11 Sep 2024 09:31:41 -0300 Subject: [PATCH] chore(StakeManager): remove unnecessary `finalizeEpoch` modifier from `migrateTo` Fixes #109 --- .gas-report | 32 ++++++++++++++++---------------- .gas-snapshot | 4 ++-- contracts/StakeManager.sol | 1 - 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/.gas-report b/.gas-report index 2534e03..97b1dc4 100644 --- a/.gas-report +++ b/.gas-report @@ -1,21 +1,21 @@ | contracts/StakeManager.sol:StakeManager contract | | | | | | |--------------------------------------------------|-----------------|--------|--------|--------|---------| | Deployment Cost | Deployment Size | | | | | -| 3033738 | 15430 | | | | | +| 2914993 | 14877 | | | | | | Function Name | min | avg | median | max | # calls | | EPOCH_SIZE | 307 | 307 | 307 | 307 | 816 | | MAX_BOOST | 285 | 285 | 285 | 285 | 1 | | MAX_LOCKUP_PERIOD | 361 | 361 | 361 | 361 | 4 | | MIN_LOCKUP_PERIOD | 287 | 287 | 287 | 287 | 11 | | YEAR | 263 | 263 | 263 | 263 | 1 | -| accounts | 1597 | 1597 | 1597 | 1597 | 24037 | +| accounts | 1597 | 1597 | 1597 | 1597 | 25030 | | calculateMPToMint | 740 | 740 | 740 | 740 | 3 | | currentEpoch | 406 | 1691 | 2406 | 2406 | 28 | | epochEnd | 627 | 639 | 627 | 4627 | 635 | | epochReward | 1403 | 2903 | 1403 | 5903 | 3 | -| executeAccount | 28897 | 95318 | 95073 | 169064 | 21601 | +| executeAccount | 28897 | 95308 | 95073 | 169064 | 22594 | | executeEpoch | 23436 | 169158 | 164483 | 204283 | 574 | -| isVault | 540 | 569 | 540 | 2540 | 19096 | +| isVault | 540 | 567 | 540 | 2540 | 20089 | | lock | 23840 | 23840 | 23840 | 23840 | 1 | | migrateTo | 23869 | 23875 | 23875 | 23881 | 2 | | migration | 439 | 1439 | 1439 | 2439 | 4 | @@ -27,7 +27,7 @@ | setVault | 46239 | 46239 | 46239 | 46239 | 279 | | stake | 23983 | 23983 | 23983 | 23983 | 1 | | stakeRewardEstimate | 436 | 2269 | 2436 | 2436 | 12 | -| stakedToken | 273 | 273 | 273 | 273 | 19112 | +| stakedToken | 273 | 273 | 273 | 273 | 20105 | | startMigration | 108037 | 108045 | 108049 | 108049 | 3 | | totalSupply | 740 | 1921 | 2740 | 2740 | 22 | | totalSupplyBalance | 385 | 1785 | 2385 | 2385 | 20 | @@ -52,8 +52,8 @@ | acceptMigration | 35258 | 35258 | 35258 | 35258 | 2 | | leave | 35244 | 35244 | 35244 | 35244 | 1 | | lock | 45387 | 74829 | 66590 | 155519 | 6 | -| owner | 362 | 362 | 362 | 362 | 19095 | -| stake | 27265 | 268793 | 267622 | 353853 | 19100 | +| owner | 362 | 362 | 362 | 362 | 20088 | +| stake | 27265 | 268735 | 267622 | 353853 | 20093 | | stakedToken | 212 | 212 | 212 | 212 | 2 | | unstake | 42163 | 92145 | 80441 | 204532 | 11 | @@ -63,7 +63,7 @@ | Deployment Cost | Deployment Size | | | | | | 0 | 0 | | | | | | Function Name | min | avg | median | max | # calls | -| createVault | 696531 | 696531 | 696531 | 696531 | 19099 | +| createVault | 696531 | 696531 | 696531 | 696531 | 20092 | | setStakeManager | 23710 | 26669 | 26076 | 30222 | 3 | | stakeManager | 368 | 1868 | 2368 | 2368 | 4 | @@ -73,24 +73,24 @@ | Deployment Cost | Deployment Size | | | | | | 0 | 0 | | | | | | Function Name | min | avg | median | max | # calls | -| approve | 46175 | 46198 | 46199 | 46211 | 19095 | -| balanceOf | 561 | 602 | 561 | 2561 | 44724 | +| approve | 46175 | 46198 | 46199 | 46211 | 20088 | +| balanceOf | 561 | 600 | 561 | 2561 | 46710 | | script/Deploy.s.sol:Deploy contract | | | | | | |-------------------------------------|-----------------|---------|---------|---------|---------| | Deployment Cost | Deployment Size | | | | | -| 6634758 | 31927 | | | | | +| 6515986 | 31374 | | | | | | Function Name | min | avg | median | max | # calls | -| run | 5848270 | 5848270 | 5848270 | 5848270 | 55 | +| run | 5737391 | 5737391 | 5737391 | 5737391 | 55 | | script/DeployMigrationStakeManager.s.sol:DeployMigrationStakeManager contract | | | | | | |-------------------------------------------------------------------------------|-----------------|---------|---------|---------|---------| | Deployment Cost | Deployment Size | | | | | -| 3798175 | 18695 | | | | | +| 3679431 | 18142 | | | | | | Function Name | min | avg | median | max | # calls | -| run | 2833940 | 2833940 | 2833940 | 2833940 | 9 | +| run | 2723061 | 2723061 | 2723061 | 2723061 | 9 | | script/DeploymentConfig.s.sol:DeploymentConfig contract | | | | | | @@ -113,9 +113,9 @@ | test/script/DeployBroken.s.sol:DeployBroken contract | | | | | | |------------------------------------------------------|-----------------|---------|---------|---------|---------| | Deployment Cost | Deployment Size | | | | | -| 5319464 | 25725 | | | | | +| 5200705 | 25172 | | | | | | Function Name | min | avg | median | max | # calls | -| run | 4688091 | 4688091 | 4688091 | 4688091 | 1 | +| run | 4577212 | 4577212 | 4577212 | 4577212 | 1 | diff --git a/.gas-snapshot b/.gas-snapshot index bd9ff96..e2a09fd 100644 --- a/.gas-snapshot +++ b/.gas-snapshot @@ -25,7 +25,7 @@ MigrateTest:testDeployment() (gas: 28720) MigrateTest:test_RevertWhen_NoPendingMigration() (gas: 1152269) MigrateTest:test_RevertWhen_SenderIsNotVault() (gas: 10750) MigrationInitializeTest:testDeployment() (gas: 28720) -MigrationInitializeTest:test_RevertWhen_MigrationPending() (gas: 5698143) +MigrationInitializeTest:test_RevertWhen_MigrationPending() (gas: 5476473) MigrationStakeManagerTest:testDeployment() (gas: 28720) MigrationStakeManagerTest:testNewDeployment() (gas: 30859) MigrationStakeManagerTest:test_ExecuteEpochShouldNotIncreaseEpochInMigration() (gas: 105686) @@ -50,7 +50,7 @@ UnstakeTest:test_UnstakeShouldBurnMultiplierPoints() (gas: 5497028) UnstakeTest:test_UnstakeShouldReturnFund_NoLockUp() (gas: 1026491) UnstakeTest:test_UnstakeShouldReturnFund_WithLockUp() (gas: 1115090) UserFlowsTest:testDeployment() (gas: 28720) -UserFlowsTest:test_PendingMPToBeMintedCannotBeGreaterThanTotalSupplyMP(uint8) (runs: 1001, μ: 69063471, ~: 30145773) +UserFlowsTest:test_PendingMPToBeMintedCannotBeGreaterThanTotalSupplyMP(uint8) (runs: 1001, μ: 71037060, ~: 31077253) UserFlowsTest:test_StakeWithLockUpTimeLocksStake() (gas: 1115978) UserFlowsTest:test_StakedSupplyShouldIncreaseAndDecreaseAgain() (gas: 1950739) VaultFactoryTest:testDeployment() (gas: 9774) \ No newline at end of file diff --git a/contracts/StakeManager.sol b/contracts/StakeManager.sol index 72e3bc4..4149141 100644 --- a/contracts/StakeManager.sol +++ b/contracts/StakeManager.sol @@ -392,7 +392,6 @@ contract StakeManager is Ownable { onlyVault onlyAccountInitialized(msg.sender) onlyPendingMigration - finalizeEpoch returns (StakeManager newManager) { _processAccount(accounts[msg.sender], currentEpoch);