From 8613d0c8a215abac17fe78e50764af7d2dfc2d46 Mon Sep 17 00:00:00 2001 From: r4bbit <445106+0x-r4bbit@users.noreply.github.com> Date: Fri, 28 Feb 2025 11:09:54 +0100 Subject: [PATCH] refactor(StakeMath): remove unused errors --- .gas-report | 22 +++++++++++----------- .gas-snapshot | 12 ++++++------ src/math/StakeMath.sol | 2 -- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/.gas-report b/.gas-report index 1b8a222..3979d12 100644 --- a/.gas-report +++ b/.gas-report @@ -186,7 +186,7 @@ |------------------------------------------------------+-----------------+--------+--------+--------+---------| | rewardStartTime | 429 | 1429 | 1429 | 2429 | 2 | |------------------------------------------------------+-----------------+--------+--------+--------+---------| -| rewardsBalanceOf | 2324 | 3513 | 3909 | 6324 | 268 | +| rewardsBalanceOf | 2324 | 3507 | 3909 | 6324 | 268 | |------------------------------------------------------+-----------------+--------+--------+--------+---------| | setReward | 2484 | 105517 | 107034 | 107034 | 264 | |------------------------------------------------------+-----------------+--------+--------+--------+---------| @@ -194,7 +194,7 @@ |------------------------------------------------------+-----------------+--------+--------+--------+---------| | setTrustedCodehash | 24221 | 24221 | 24221 | 24221 | 77 | |------------------------------------------------------+-----------------+--------+--------+--------+---------| -| stake | 2681 | 237357 | 230009 | 251100 | 1607 | +| stake | 2681 | 237280 | 230009 | 251100 | 1607 | |------------------------------------------------------+-----------------+--------+--------+--------+---------| | totalMP | 777 | 1223 | 1223 | 1669 | 6 | |------------------------------------------------------+-----------------+--------+--------+--------+---------| @@ -206,17 +206,17 @@ |------------------------------------------------------+-----------------+--------+--------+--------+---------| | totalRewardsAccrued | 384 | 384 | 384 | 384 | 3 | |------------------------------------------------------+-----------------+--------+--------+--------+---------| -| totalRewardsSupply | 993 | 1612 | 1774 | 6733 | 290 | +| totalRewardsSupply | 993 | 1609 | 1774 | 6733 | 290 | |------------------------------------------------------+-----------------+--------+--------+--------+---------| | totalShares | 637 | 637 | 637 | 637 | 6 | |------------------------------------------------------+-----------------+--------+--------+--------+---------| | totalStaked | 385 | 385 | 385 | 385 | 1115 | |------------------------------------------------------+-----------------+--------+--------+--------+---------| -| unstake | 56017 | 81037 | 80911 | 88301 | 269 | +| unstake | 56017 | 81007 | 80911 | 88301 | 269 | |------------------------------------------------------+-----------------+--------+--------+--------+---------| -| updateGlobalState | 15809 | 27668 | 29200 | 29503 | 276 | +| updateGlobalState | 15809 | 27690 | 29200 | 29503 | 276 | |------------------------------------------------------+-----------------+--------+--------+--------+---------| -| updateVaultMP | 25103 | 34553 | 36516 | 36819 | 276 | +| updateVaultMP | 25103 | 34576 | 36516 | 36819 | 276 | |------------------------------------------------------+-----------------+--------+--------+--------+---------| | upgradeToAndCall | 3225 | 7892 | 8437 | 10925 | 5 | |------------------------------------------------------+-----------------+--------+--------+--------+---------| @@ -250,13 +250,13 @@ |----------------------------------------+-----------------+--------+--------+--------+---------| | register | 12632 | 78058 | 78550 | 78550 | 308 | |----------------------------------------+-----------------+--------+--------+--------+---------| -| stake | 12077 | 291048 | 283898 | 304989 | 1608 | +| stake | 12077 | 290972 | 283898 | 304989 | 1608 | |----------------------------------------+-----------------+--------+--------+--------+---------| | stakeManager | 367 | 367 | 367 | 367 | 307 | |----------------------------------------+-----------------+--------+--------+--------+---------| | trustStakeManager | 7577 | 7577 | 7577 | 7577 | 1 | |----------------------------------------+-----------------+--------+--------+--------+---------| -| unstake | 12054 | 111569 | 112021 | 119411 | 270 | +| unstake | 12054 | 111539 | 112021 | 119411 | 270 | |----------------------------------------+-----------------+--------+--------+--------+---------| | withdraw | 20705 | 20705 | 20705 | 20705 | 1 | ╰----------------------------------------+-----------------+--------+--------+--------+---------╯ @@ -272,7 +272,7 @@ |----------------------------------------------------+-----------------+------+--------+--------+---------| | Function Name | Min | Avg | Median | Max | # Calls | |----------------------------------------------------+-----------------+------+--------+--------+---------| -| fallback | 735 | 8100 | 833 | 142290 | 7358 | +| fallback | 735 | 8101 | 833 | 142290 | 7358 | |----------------------------------------------------+-----------------+------+--------+--------+---------| | implementation | 343 | 2342 | 2343 | 2343 | 2455 | ╰----------------------------------------------------+-----------------+------+--------+--------+---------╯ @@ -376,11 +376,11 @@ |---------------------------------------------+-----------------+-------+--------+-------+---------| | Function Name | Min | Avg | Median | Max | # Calls | |---------------------------------------------+-----------------+-------+--------+-------+---------| -| approve | 29158 | 32602 | 29338 | 46342 | 1586 | +| approve | 29158 | 32603 | 29350 | 46342 | 1586 | |---------------------------------------------+-----------------+-------+--------+-------+---------| | balanceOf | 558 | 1118 | 558 | 2558 | 1900 | |---------------------------------------------+-----------------+-------+--------+-------+---------| -| mint | 34095 | 38637 | 34287 | 68379 | 1598 | +| mint | 34095 | 38638 | 34287 | 68379 | 1598 | ╰---------------------------------------------+-----------------+-------+--------+-------+---------╯ ╭-----------------------------------------------------------------------------+-----------------+--------+--------+--------+---------╮ diff --git a/.gas-snapshot b/.gas-snapshot index bf043fe..b4379a2 100644 --- a/.gas-snapshot +++ b/.gas-snapshot @@ -7,11 +7,11 @@ EmergencyExitTest:test_EmergencyExitToAlternateAddress() (gas: 450444) EmergencyExitTest:test_EmergencyExitWithLock() (gas: 448187) EmergencyExitTest:test_EmergencyExitWithRewards() (gas: 435625) EmergencyExitTest:test_OnlyOwnerCanEnableEmergencyMode() (gas: 39462) -FuzzTests:testFuzz_AccrueMP(uint256,uint256,uint16) (runs: 1006, μ: 521106, ~: 515988) -FuzzTests:testFuzz_EmergencyExit(uint256,uint256) (runs: 1006, μ: 510643, ~: 501981) -FuzzTests:testFuzz_Rewards(uint256,uint256,uint256,uint16,uint16) (runs: 1003, μ: 604659, ~: 605935) -FuzzTests:testFuzz_Stake(uint256,uint256) (runs: 1006, μ: 404095, ~: 395433) -FuzzTests:testFuzz_Unstake(uint256,uint256,uint16,uint256) (runs: 1001, μ: 530264, ~: 529949) +FuzzTests:testFuzz_AccrueMP(uint256,uint256,uint16) (runs: 1000, μ: 521104, ~: 515988) +FuzzTests:testFuzz_EmergencyExit(uint256,uint256) (runs: 1000, μ: 510621, ~: 501981) +FuzzTests:testFuzz_Rewards(uint256,uint256,uint256,uint16,uint16) (runs: 1000, μ: 604657, ~: 605935) +FuzzTests:testFuzz_Stake(uint256,uint256) (runs: 1000, μ: 404073, ~: 395433) +FuzzTests:testFuzz_Unstake(uint256,uint256,uint16,uint256) (runs: 1000, μ: 530258, ~: 529949) IntegrationTest:testStakeFoo() (gas: 1403381) KarmaMintAllowanceTest:testAddKarmaDistributorOnlyOwner() (gas: 348463) KarmaMintAllowanceTest:testBalanceOf() (gas: 428643) @@ -48,7 +48,7 @@ KarmaTest:testTransfersNotAllowed() (gas: 20662) LeaveTest:test_LeaveShouldProperlyUpdateAccounting() (gas: 7249868) LeaveTest:test_RevertWhenStakeManagerIsTrusted() (gas: 350352) LeaveTest:test_TrustNewStakeManager() (gas: 7302750) -LockTest:test_LockFailsWithInvalidPeriod(uint256) (runs: 1009, μ: 406917, ~: 406944) +LockTest:test_LockFailsWithInvalidPeriod(uint256) (runs: 1000, μ: 406918, ~: 406944) LockTest:test_LockFailsWithNoStake() (gas: 114574) LockTest:test_LockFailsWithZero() (gas: 367631) LockTest:test_LockWithoutPriorLock() (gas: 465087) diff --git a/src/math/StakeMath.sol b/src/math/StakeMath.sol index f5615e8..b2df766 100644 --- a/src/math/StakeMath.sol +++ b/src/math/StakeMath.sol @@ -12,9 +12,7 @@ import { MultiplierPointMath } from "./MultiplierPointMath.sol"; abstract contract StakeMath is MultiplierPointMath { error StakeMath__FundsLocked(); error StakeMath__InvalidLockingPeriod(); - error StakeMath__StakeIsTooLow(); error StakeMath__InsufficientBalance(); - error StakeMath__AccrueTimeNotReached(); error StakeMath__AbsoluteMaxMPOverflow(); event StakeMathTest(uint256 lockTime);