fix: PVE-001 claim fix in vrt

VenusProtocol · Apr 14, 2023 · 369cf3f · 369cf3f
1 parent 672b9de
commit 369cf3f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/contracts/VRTVault/VRTVault.sol b/contracts/VRTVault/VRTVault.sol
@@ -214,7 +214,12 @@ contract VRTVault is VRTVaultStorage, AccessControlledV5 {
             uint256 vrtBalance = vrt.balanceOf(address(this));
             require(vrtBalance >= accruedInterest, "Failed to transfer VRT, Insufficient VRT in Vault.");
             emit Claim(account, accruedInterest);
-            user.accrualStartBlockNumber = getBlockNumber();
+            uint256 currentBlock_ = getBlockNumber();
+            if (lastAccruingBlock > currentBlock_) {
+                user.accrualStartBlockNumber = currentBlock_;
+            } else {
+                user.accrualStartBlockNumber = lastAccruingBlock;
+            }
             vrt.safeTransfer(user.userAddress, accruedInterest);
         }
     }

diff --git a/tests/hardhat/VRT/VRTVault.ts b/tests/hardhat/VRT/VRTVault.ts
@@ -1,5 +1,5 @@
 import { FakeContract, smock } from "@defi-wonderland/smock";
-import { loadFixture, mineUpTo } from "@nomicfoundation/hardhat-network-helpers";
+import { loadFixture, mine, mineUpTo } from "@nomicfoundation/hardhat-network-helpers";
 import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
 import { expect } from "chai";
 import { BigNumber } from "ethers";
@@ -79,7 +79,7 @@ describe("VRTVault", async () => {
 
   it("should not able to set lastAccuringBlock less than current block", async function () {
     const { vrtVault, lastAccruingBlock } = fixture;
-    await mineUpTo(200);
+    await mine(200);
     await expect(vrtVault.setLastAccruingBlock(lastAccruingBlock - 7)).to.be.revertedWith(
       "Invalid _lastAccruingBlock interest have been accumulated",
     );