Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove irrelevant code from _mintBonusMP function #113

Merged
merged 1 commit into from
Sep 11, 2024
Merged

Remove irrelevant code from _mintBonusMP function #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions .gas-report
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
| contracts/StakeManager.sol:StakeManager contract | | | | | |
|--------------------------------------------------|-----------------|--------|--------|--------|---------|
| Deployment Cost | Deployment Size | | | | |
| 3043249 | 15474 | | | | |
| 3033738 | 15430 | | | | |
| 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 | 21401 |
| accounts | 1597 | 1597 | 1597 | 1597 | 24037 |
| 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 | 95353 | 95073 | 169064 | 18965 |
| executeAccount | 28897 | 95318 | 95073 | 169064 | 21601 |
| executeEpoch | 23436 | 169158 | 164483 | 204283 | 574 |
| isVault | 540 | 573 | 540 | 2540 | 16460 |
| isVault | 540 | 569 | 540 | 2540 | 19096 |
| lock | 23840 | 23840 | 23840 | 23840 | 1 |
| migrateTo | 23869 | 23875 | 23875 | 23881 | 2 |
| migration | 439 | 1439 | 1439 | 2439 | 4 |
Expand All @@ -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 | 16476 |
| stakedToken | 273 | 273 | 273 | 273 | 19112 |
| startMigration | 108037 | 108045 | 108049 | 108049 | 3 |
| totalSupply | 740 | 1921 | 2740 | 2740 | 22 |
| totalSupplyBalance | 385 | 1785 | 2385 | 2385 | 20 |
Expand All @@ -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 | 16459 |
| stake | 27265 | 269110 | 267752 | 354575 | 16464 |
| owner | 362 | 362 | 362 | 362 | 19095 |
| stake | 27265 | 268793 | 267622 | 353853 | 19100 |
| stakedToken | 212 | 212 | 212 | 212 | 2 |
| unstake | 42163 | 92145 | 80441 | 204532 | 11 |

Expand All @@ -63,7 +63,7 @@
| Deployment Cost | Deployment Size | | | | |
| 0 | 0 | | | | |
| Function Name | min | avg | median | max | # calls |
| createVault | 696531 | 696531 | 696531 | 696531 | 16463 |
| createVault | 696531 | 696531 | 696531 | 696531 | 19099 |
| setStakeManager | 23710 | 26669 | 26076 | 30222 | 3 |
| stakeManager | 368 | 1868 | 2368 | 2368 | 4 |

Expand All @@ -73,24 +73,24 @@
| Deployment Cost | Deployment Size | | | | |
| 0 | 0 | | | | |
| Function Name | min | avg | median | max | # calls |
| approve | 46175 | 46198 | 46199 | 46211 | 16459 |
| balanceOf | 561 | 607 | 561 | 2561 | 39452 |
| approve | 46175 | 46198 | 46199 | 46211 | 19095 |
| balanceOf | 561 | 602 | 561 | 2561 | 44724 |


| script/Deploy.s.sol:Deploy contract | | | | | |
|-------------------------------------|-----------------|---------|---------|---------|---------|
| Deployment Cost | Deployment Size | | | | |
| 6644281 | 31971 | | | | |
| 6634758 | 31927 | | | | |
| Function Name | min | avg | median | max | # calls |
| run | 5857084 | 5857084 | 5857084 | 5857084 | 55 |
| run | 5848270 | 5848270 | 5848270 | 5848270 | 55 |


| script/DeployMigrationStakeManager.s.sol:DeployMigrationStakeManager contract | | | | | |
|-------------------------------------------------------------------------------|-----------------|---------|---------|---------|---------|
| Deployment Cost | Deployment Size | | | | |
| 3807695 | 18739 | | | | |
| 3798175 | 18695 | | | | |
| Function Name | min | avg | median | max | # calls |
| run | 2842754 | 2842754 | 2842754 | 2842754 | 9 |
| run | 2833940 | 2833940 | 2833940 | 2833940 | 9 |


| script/DeploymentConfig.s.sol:DeploymentConfig contract | | | | | |
Expand All @@ -113,9 +113,9 @@
| test/script/DeployBroken.s.sol:DeployBroken contract | | | | | |
|------------------------------------------------------|-----------------|---------|---------|---------|---------|
| Deployment Cost | Deployment Size | | | | |
| 5328977 | 25769 | | | | |
| 5319464 | 25725 | | | | |
| Function Name | min | avg | median | max | # calls |
| run | 4696906 | 4696906 | 4696906 | 4696906 | 1 |
| run | 4688091 | 4688091 | 4688091 | 4688091 | 1 |



Expand Down
46 changes: 23 additions & 23 deletions .gas-snapshot
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
CreateVaultTest:testDeployment() (gas: 9774)
CreateVaultTest:test_createVault() (gas: 692936)
ExecuteAccountTest:testDeployment() (gas: 28742)
ExecuteAccountTest:test_ExecuteAccountLimit() (gas: 1338446)
ExecuteAccountTest:test_ExecuteAccountMintMP() (gas: 3857454)
ExecuteAccountTest:test_RevertWhen_InvalidLimitEpoch() (gas: 1155096)
ExecuteAccountTest:test_ShouldNotMintMoreThanCap() (gas: 110608299)
ExecuteAccountTest:test_ExecuteAccountLimit() (gas: 1338316)
ExecuteAccountTest:test_ExecuteAccountMintMP() (gas: 3857142)
ExecuteAccountTest:test_RevertWhen_InvalidLimitEpoch() (gas: 1154374)
ExecuteAccountTest:test_ShouldNotMintMoreThanCap() (gas: 110607467)
ExecuteEpochTest:testDeployment() (gas: 28720)
ExecuteEpochTest:testNewDeployment() (gas: 30815)
ExecuteEpochTest:test_ExecuteEpochShouldIncreaseEpoch() (gas: 94810)
ExecuteEpochTest:test_ExecuteEpochShouldIncreasePendingReward() (gas: 253041)
ExecuteEpochTest:test_ExecuteEpochShouldNotIncreaseEpochBeforeEnd() (gas: 17972)
ExecuteEpochTest:test_ExecuteEpochShouldNotIncreaseEpochInMigration() (gas: 105698)
LeaveTest:testDeployment() (gas: 28720)
LeaveTest:test_RevertWhen_NoPendingMigration() (gas: 1154760)
LeaveTest:test_RevertWhen_NoPendingMigration() (gas: 1154630)
LeaveTest:test_RevertWhen_SenderIsNotVault() (gas: 10750)
LockTest:testDeployment() (gas: 28720)
LockTest:test_NewLockupPeriod() (gas: 1143513)
LockTest:test_RevertWhen_InvalidNewLockupPeriod() (gas: 1135130)
LockTest:test_RevertWhen_InvalidUpdateLockupPeriod() (gas: 1231731)
LockTest:test_NewLockupPeriod() (gas: 1143383)
LockTest:test_RevertWhen_InvalidNewLockupPeriod() (gas: 1135000)
LockTest:test_RevertWhen_InvalidUpdateLockupPeriod() (gas: 1231009)
LockTest:test_RevertWhen_SenderIsNotVault() (gas: 10630)
LockTest:test_ShouldIncreaseBonusMP() (gas: 1123613)
LockTest:test_UpdateLockupPeriod() (gas: 1281110)
LockTest:test_ShouldIncreaseBonusMP() (gas: 1123483)
LockTest:test_UpdateLockupPeriod() (gas: 1280388)
MigrateTest:testDeployment() (gas: 28720)
MigrateTest:test_RevertWhen_NoPendingMigration() (gas: 1152399)
MigrateTest:test_RevertWhen_NoPendingMigration() (gas: 1152269)
MigrateTest:test_RevertWhen_SenderIsNotVault() (gas: 10750)
MigrationInitializeTest:testDeployment() (gas: 28720)
MigrationInitializeTest:test_RevertWhen_MigrationPending() (gas: 5715768)
MigrationInitializeTest:test_RevertWhen_MigrationPending() (gas: 5698143)
MigrationStakeManagerTest:testDeployment() (gas: 28720)
MigrationStakeManagerTest:testNewDeployment() (gas: 30859)
MigrationStakeManagerTest:test_ExecuteEpochShouldNotIncreaseEpochInMigration() (gas: 105686)
Expand All @@ -35,22 +35,22 @@ SetStakeManagerTest:test_SetStakeManager() (gas: 19869)
StakeManagerTest:testDeployment() (gas: 28492)
StakeTest:testDeployment() (gas: 28720)
StakeTest:test_RevertWhen_InvalidLockupPeriod() (gas: 892125)
StakeTest:test_RevertWhen_Restake() (gas: 1158072)
StakeTest:test_RevertWhen_RestakeWithLock() (gas: 1160132)
StakeTest:test_RevertWhen_Restake() (gas: 1157942)
StakeTest:test_RevertWhen_RestakeWithLock() (gas: 1159410)
StakeTest:test_RevertWhen_SenderIsNotVault() (gas: 10651)
StakeTest:test_RevertWhen_StakeIsTooLow() (gas: 745253)
StakeTest:test_RevertWhen_StakeTokenTransferFails() (gas: 175040)
StakeTest:test_StakeWithoutLockUpTimeMintsMultiplierPoints() (gas: 1029141)
StakeTest:test_StakeWithoutLockUpTimeMintsMultiplierPoints() (gas: 1029011)
StakedTokenTest:testStakeToken() (gas: 7616)
UnstakeTest:testDeployment() (gas: 28742)
UnstakeTest:test_RevertWhen_AmountMoreThanBalance() (gas: 1133014)
UnstakeTest:test_RevertWhen_FundsLocked() (gas: 1158758)
UnstakeTest:test_RevertWhen_AmountMoreThanBalance() (gas: 1132884)
UnstakeTest:test_RevertWhen_FundsLocked() (gas: 1158036)
UnstakeTest:test_RevertWhen_SenderIsNotVault() (gas: 10653)
UnstakeTest:test_UnstakeShouldBurnMultiplierPoints() (gas: 5497132)
UnstakeTest:test_UnstakeShouldReturnFund_NoLockUp() (gas: 1026621)
UnstakeTest:test_UnstakeShouldReturnFund_WithLockUp() (gas: 1115812)
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, μ: 68773621, ~: 28286723)
UserFlowsTest:test_StakeWithLockUpTimeLocksStake() (gas: 1116700)
UserFlowsTest:test_StakedSupplyShouldIncreaseAndDecreaseAgain() (gas: 1950999)
UserFlowsTest:test_PendingMPToBeMintedCannotBeGreaterThanTotalSupplyMP(uint8) (runs: 1001, μ: 69063471, ~: 30145773)
UserFlowsTest:test_StakeWithLockUpTimeLocksStake() (gas: 1115978)
UserFlowsTest:test_StakedSupplyShouldIncreaseAndDecreaseAgain() (gas: 1950739)
VaultFactoryTest:testDeployment() (gas: 9774)
5 changes: 0 additions & 5 deletions contracts/StakeManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,11 +476,6 @@ contract StakeManager is Ownable {
uint256 mpToMint;
if (amount > 0) {
mpToMint += amount; //initial multiplier points
if (block.timestamp < account.lockUntil) {
//increasing balance on locked account?
//bonus for remaining previously locked time of new balance.
mpToMint += _getMPToMint(amount, account.lockUntil - block.timestamp);
}
}
if (increasedLockTime > 0) {
//bonus for increased lock time
Expand Down
Loading