Skip to content

Fix farming balance inflation bug #94

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

Open
zZoMROT wants to merge 2 commits into
base: master
Choose a base branch
from
+22 −5
Open

Fix farming balance inflation bug #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e347f13
Use actual transferred amount for balance update
zZoMROT Jul 4, 2025
84b1784
Fix return value in method
zZoMROT Sep 11, 2025
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
10 changes: 5 additions & 5 deletions contracts/accounting/FarmAccounting.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,25 +31,25 @@ library FarmAccounting {
}
}

function startFarming(Info storage info, uint256 amount, uint256 period) internal returns(uint256) {
function startFarming(Info storage info, uint256 amount, uint256 period) internal returns(uint256 newAmount) {
if (period == 0) revert ZeroDuration();
if (period > type(uint32).max) revert DurationTooLarge();

newAmount = amount;
// If something left from prev farming add it to the new farming
(uint40 finished, uint32 duration, uint184 reward, uint256 balance) = (info.finished, info.duration, info.reward, info.balance);
if (block.timestamp < finished) {
amount += reward - farmedSinceCheckpointScaled(info, finished - duration) / _SCALE;
newAmount += reward - farmedSinceCheckpointScaled(info, finished - duration) / _SCALE;
}

if (amount > _MAX_REWARD_AMOUNT) revert AmountTooLarge();
if (newAmount > _MAX_REWARD_AMOUNT) revert AmountTooLarge();

(info.finished, info.duration, info.reward, info.balance) = (
uint40(block.timestamp + period),
uint32(period),
uint184(amount),
uint184(newAmount),
balance + amount
);
return amount;
}

function stopFarming(Info storage info) internal returns(uint256 leftover) {
Expand Down
17 changes: 17 additions & 0 deletions test/FarmingPool.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,23 @@ describe('FarmingPool', function () {
farm.connect(wallet2).startFarming(1000, 60 * 60 * 24),
).to.be.revertedWithCustomError(farm, 'NotDistributor');
});

it('should rescue extra gift tokens from farm in the case of overlapping farming', async function () {
const { gift, farm } = await loadFixture(initContracts);
const duration = BigInt(60 * 60 * 24);
const amount = 100n;
await gift.mint(farm, amount);
await farm.startFarming(1000, duration);
await time.increaseTo((await farm.farmInfo()).finished - duration / 2n);
await farm.startFarming(1000, duration);
await farm.stopFarming();
const farmInfoBefore = await farm.farmInfo();
console.log(`farmBalance = ${await gift.balanceOf(farm)}, farmInfo.reward = ${farmInfoBefore.reward}, farmInfo.balance = ${farmInfoBefore.balance}`);
// Shouldn't revert with InsufficientFunds
await farm.rescueFunds(gift, amount);
const farmInfoAfter = await farm.farmInfo();
console.log(`farmBalance = ${await gift.balanceOf(farm)}, farmInfo.reward = ${farmInfoAfter.reward}, farmInfo.balance = ${farmInfoAfter.balance}`);
});
});

describe('name', function () {
Expand Down