From 9a4b703ed511c4f6e0fcbcb834ee488f4099a602 Mon Sep 17 00:00:00 2001 From: Daniel Lima Date: Sat, 4 May 2024 21:24:44 -0300 Subject: [PATCH 1/2] Fix: update isAuctionExpired function --- .../marketplace/english-auctions/EnglishAuctionsLogic.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts/prebuilts/marketplace/english-auctions/EnglishAuctionsLogic.sol b/contracts/prebuilts/marketplace/english-auctions/EnglishAuctionsLogic.sol index 89a56f756..1b0280cb9 100644 --- a/contracts/prebuilts/marketplace/english-auctions/EnglishAuctionsLogic.sol +++ b/contracts/prebuilts/marketplace/english-auctions/EnglishAuctionsLogic.sol @@ -283,7 +283,7 @@ contract EnglishAuctionsLogic is IEnglishAuctions, ReentrancyGuard, ERC2771Conte } function isAuctionExpired(uint256 _auctionId) external view onlyExistingAuction(_auctionId) returns (bool) { - return _englishAuctionsStorage().auctions[_auctionId].endTimestamp >= block.timestamp; + return _englishAuctionsStorage().auctions[_auctionId].endTimestamp <= block.timestamp; } /*/////////////////////////////////////////////////////////////// From 244d56e6aa87f74a7df91baaebacad651fc256ac Mon Sep 17 00:00:00 2001 From: Daniel Lima Date: Sun, 5 May 2024 22:20:45 -0300 Subject: [PATCH 2/2] Fix tests --- src/test/marketplace/EnglishAuctions.t.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/marketplace/EnglishAuctions.t.sol b/src/test/marketplace/EnglishAuctions.t.sol index ac3a07581..604d4c873 100644 --- a/src/test/marketplace/EnglishAuctions.t.sol +++ b/src/test/marketplace/EnglishAuctions.t.sol @@ -1885,7 +1885,7 @@ contract MarketplaceEnglishAuctionsTest is BaseTest, IExtension { uint256 auctionId = _setup_newAuction(); IEnglishAuctions.Auction memory existingAuction = EnglishAuctionsLogic(marketplace).getAuction(auctionId); - vm.warp(existingAuction.endTimestamp); + vm.warp(existingAuction.endTimestamp + 1); assertTrue(EnglishAuctionsLogic(marketplace).isAuctionExpired(auctionId)); }