ghostchain/ghost-dao-contracts
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

https://ghostforum.org/t/ghost-e02-third-party-dust-stake-can-extend-an-existing-users-warmup-expiry/131

Browse Source 
Signed-off-by: Uncle Fatso <uncle.fatso@ghostchain.io>
This commit is contained in:
Uncle Fatso 2026-10-10 19:47:59 +03:00
parent 44636659e3
commit d7977a5ddc
Signed by: f4ts0
GPG Key ID: 565F4F2860226EBB
4 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Staking.sol
View File

@ -38,7 +38,7 @@ contract GhostStaking is IStaking, GhostAccessControlled {
uint256 private _lastRebaseBlock; uint256 private _lastRebaseBlock;
mapping(address => bool) public locks; mapping(address => bool) public unlocks;
constructor( constructor(
address _ftso, address _ftso,
@ -79,7 +79,7 @@ contract GhostStaking is IStaking, GhostAccessControlled {
bool isRebase, bool isRebase,
bool isClaim bool isClaim
) external override returns (uint256 returnAmount) { ) external override returns (uint256 returnAmount) {
if (locks[to] && to != msg.sender) revert ExternalDepositsLocked(); if (!unlocks[to] && to != msg.sender) revert ExternalDepositsLocked();
returnAmount = amount + rebase(); returnAmount = amount + rebase();
IERC20(ftso).safeTransferFrom(msg.sender, address(this), amount); IERC20(ftso).safeTransferFrom(msg.sender, address(this), amount);
@ -94,7 +94,7 @@ contract GhostStaking is IStaking, GhostAccessControlled {
} }
function claim(address to, bool isRebase) public override returns (uint256) { function claim(address to, bool isRebase) public override returns (uint256) {
if (locks[to] && to != msg.sender) revert ExternalDepositsLocked(); if (!unlocks[to] && to != msg.sender) revert ExternalDepositsLocked();
uint256 claimedAmount = IGhostWarmup(warmup).claim(to, epoch.number); uint256 claimedAmount = IGhostWarmup(warmup).claim(to, epoch.number);
return _sendGhstBased(claimedAmount, to, isRebase); return _sendGhstBased(claimedAmount, to, isRebase);
} }
@ -104,7 +104,7 @@ contract GhostStaking is IStaking, GhostAccessControlled {
uint256 amount, uint256 amount,
bool isRebase bool isRebase
) public override returns (uint256) { ) public override returns (uint256) {
if (locks[to] && to != msg.sender) revert ExternalDepositsLocked(); if (!unlocks[to] && to != msg.sender) revert ExternalDepositsLocked();
uint256 claimedAmount = IGhostWarmup(warmup).claimByAmount(to, amount, epoch.number); uint256 claimedAmount = IGhostWarmup(warmup).claimByAmount(to, amount, epoch.number);
return _sendGhstBased(claimedAmount, to, isRebase); return _sendGhstBased(claimedAmount, to, isRebase);
} }
@ -123,7 +123,7 @@ contract GhostStaking is IStaking, GhostAccessControlled {
} }
function toggleLock() external override { function toggleLock() external override {
locks[msg.sender] = !locks[msg.sender]; unlocks[msg.sender] = !unlocks[msg.sender];
} }
function unstake( function unstake(
@ -260,9 +260,9 @@ contract GhostStaking is IStaking, GhostAccessControlled {
} }
function warmupInfo(address who) external view returns (uint256, uint256, uint48, bool) { function warmupInfo(address who) external view returns (uint256, uint256, uint48, bool) {
bool lock = locks[who];
(uint256 deposit, uint256 payout, uint48 expiry) = IGhostWarmup(warmup).warmupInfo(who); (uint256 deposit, uint256 payout, uint48 expiry) = IGhostWarmup(warmup).warmupInfo(who);
return (deposit, payout, expiry, lock); bool matured = expiry > 0 && epoch.number >= expiry;
return (deposit, payout, expiry, matured);
} }
function totalReserves() external override view returns (uint256) { function totalReserves() external override view returns (uint256) {

1
src/types/NoteKeeper.sol
View File

@ -25,7 +25,6 @@ abstract contract NoteKeeper is INoteKeeper {
_GHST = IGHST(_ghstAddress); _GHST = IGHST(_ghstAddress);
_STAKING = IStaking(_stakingAddress); _STAKING = IStaking(_stakingAddress);
_TREASURY = ITreasury(_treasuryAddress); _TREASURY = ITreasury(_treasuryAddress);
_STAKING.toggleLock();
} }
function addNote( function addNote(

2
test/bonding/BondDepositorty.t.sol
View File

@ -548,7 +548,7 @@ contract GhostBondDepositoryTest is Test {
(, uint256 payout,, bool matured) = staking.warmupInfo(address(depository)); (, uint256 payout,, bool matured) = staking.warmupInfo(address(depository));
assertEq(ghst.balanceOf(address(depository)) > 0, true); assertEq(ghst.balanceOf(address(depository)) > 0, true);
assertEq(payout > 0, true); assertEq(payout > 0, true);
assertEq(matured, true); assertEq(matured, false);
vm.prank(BOB); vm.prank(BOB);
depository.forceRedeemAll(bytes32(0)); depository.forceRedeemAll(bytes32(0));

17
test/staking/Staking.t.sol
View File

@ -179,11 +179,11 @@ contract StakingTest is Test {
assertEq(ftso.balanceOf(ALICE), 0); assertEq(ftso.balanceOf(ALICE), 0);
assertApproxEqAbs(staking.supplyInWarmup(), rebased, 1); assertApproxEqAbs(staking.supplyInWarmup(), rebased, 1);
(uint256 deposit, uint256 payout, uint48 expiry, bool lock) = staking.warmupInfo(ALICE); (uint256 deposit, uint256 payout, uint48 expiry, bool matured) = staking.warmupInfo(ALICE);
assertEq(deposit, AMOUNT); assertEq(deposit, AMOUNT);
assertEq(payout, ghst.balanceTo(AMOUNT)); assertEq(payout, ghst.balanceTo(AMOUNT));
assertEq(expiry, 1); assertEq(expiry, 1);
assertEq(lock, false); assertEq(matured, true);
} }
function test_stake_emitsStakedEvent() public { function test_stake_emitsStakedEvent() public {
@ -227,15 +227,17 @@ contract StakingTest is Test {
assertEq(ftso.balanceOf(ALICE), 0); assertEq(ftso.balanceOf(ALICE), 0);
assertApproxEqAbs(staking.supplyInWarmup(), rebased, 1); assertApproxEqAbs(staking.supplyInWarmup(), rebased, 1);
(uint256 deposit, uint256 payout, uint48 expiry, bool lock) = staking.warmupInfo(ALICE); (uint256 deposit, uint256 payout, uint48 expiry, bool matured) = staking.warmupInfo(ALICE);
assertEq(deposit, AMOUNT); assertEq(deposit, AMOUNT);
assertEq(payout, ghst.balanceTo(AMOUNT)); assertEq(payout, ghst.balanceTo(AMOUNT));
assertEq(expiry, 2); assertEq(expiry, 2);
assertEq(lock, false); assertEq(matured, false);
} }
function test_stake_allowsSelfDepositWhenNotLocked() public { function test_stake_allowsSelfDepositWhenNotLocked() public {
_mintAndApprove(ALICE, AMOUNT); _mintAndApprove(ALICE, AMOUNT);
vm.prank(BOB);
staking.toggleLock();
vm.prank(ALICE); vm.prank(ALICE);
staking.stake(AMOUNT, BOB, false, false); staking.stake(AMOUNT, BOB, false, false);
@ -245,8 +247,6 @@ contract StakingTest is Test {
function test_stake_disablesExternalDepositsWhenLocked() public { function test_stake_disablesExternalDepositsWhenLocked() public {
_mintAndApprove(ALICE, AMOUNT); _mintAndApprove(ALICE, AMOUNT);
vm.prank(BOB);
staking.toggleLock();
vm.expectRevert(); vm.expectRevert();
vm.prank(ALICE); vm.prank(ALICE);
@ -279,9 +279,6 @@ contract StakingTest is Test {
_prepareAndRoll(ALICE, AMOUNT, false, false); _prepareAndRoll(ALICE, AMOUNT, false, false);
assertEq(ghst.balanceOf(ALICE), 0); assertEq(ghst.balanceOf(ALICE), 0);
vm.prank(ALICE);
staking.toggleLock();
vm.expectRevert(); vm.expectRevert();
vm.prank(BOB); vm.prank(BOB);
staking.claim(ALICE, false); staking.claim(ALICE, false);
@ -290,6 +287,8 @@ contract StakingTest is Test {
function test_claim_allowExternalClaimsWhenNotLocked() public { function test_claim_allowExternalClaimsWhenNotLocked() public {
_prepareAndRoll(ALICE, AMOUNT, false, false); _prepareAndRoll(ALICE, AMOUNT, false, false);
vm.prank(ALICE);
staking.toggleLock();
assertEq(ghst.balanceOf(ALICE), 0); assertEq(ghst.balanceOf(ALICE), 0);
vm.prank(BOB); vm.prank(BOB);