Skip to content

Commit

Permalink
Revert temporary changes
Browse files Browse the repository at this point in the history
  • Loading branch information
victorges committed Jul 24, 2023
1 parent 0813a20 commit 315c578
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 9 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "lib/ds-test"]
path = lib/ds-test
url = https://github.com/dapphub/ds-test
[submodule "lib/forge-std"]
path = lib/forge-std
url = https://github.com/foundry-rs/forge-std
5 changes: 1 addition & 4 deletions contracts/bonding/BondingManager.sol
Original file line number Diff line number Diff line change
Expand Up @@ -332,8 +332,6 @@ contract BondingManager is ManagerProxyTarget, IBondingManager {
// based on rewards for currentRound
IMinter mtr = minter();
uint256 rewards = PreciseMathUtils.percOf(
// TODO: Should this be only `currentMintableTokens()`? The math here is different than what we have in
// `minter().createReward`, seems like we're double-counting the already minted tokens here.
mtr.currentMintableTokens().add(mtr.currentMintedTokens()),
totalStake,
currentRoundTotalActiveStake
Expand All @@ -344,7 +342,7 @@ contract BondingManager is ManagerProxyTarget, IBondingManager {
rewards = rewards.sub(treasuryRewards);

uint256 transcoderCommissionRewards = MathUtils.percOf(rewards, earningsPool.transcoderRewardCut);
uint256 delegatorsRewards = rewards.sub(transcoderCommissionRewards).sub(treasuryRewards);
uint256 delegatorsRewards = rewards.sub(transcoderCommissionRewards);

prevEarningsPool.cumulativeRewardFactor = PreciseMathUtils.percOf(
earningsPool.cumulativeRewardFactor,
Expand Down Expand Up @@ -385,7 +383,6 @@ contract BondingManager is ManagerProxyTarget, IBondingManager {
uint256 _slashAmount,
uint256 _finderFee
) external whenSystemNotPaused onlyVerifier {
// TODO: Verify if this is right? Seems like it was missing from this func.
_autoClaimEarnings(_transcoder);

Delegator storage del = delegators[_transcoder];
Expand Down
1 change: 0 additions & 1 deletion foundry.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
profile = { default = { libs = ["node_modules", "lib"] } }
[default]
src = 'src'
out = 'foundry_artifacts'
Expand Down
1 change: 0 additions & 1 deletion lib/forge-std
Submodule forge-std deleted from 77f254

0 comments on commit 315c578

Please sign in to comment.