eliminated grace period from _prepareAuctionStatus

BuiltByMom · Jan 9, 2024 · 29b944c · 29b944c
1 parent 18d6457
commit 29b944c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/src/classes/Liquidation.ts b/src/classes/Liquidation.ts
@@ -58,9 +58,8 @@ export class Liquidation {
     const kickTime = new Date(kickTimestampNumber * 1000);
     const elapsedTime = currentTimestamp - kickTimestampNumber;
 
-    const isGracePeriod = elapsedTime < HOUR_TO_SECONDS;
     const zero = constants.Zero;
-    const isTakeable = !isGracePeriod && collateral.gt(zero);
+    const isTakeable = collateral.gt(zero);
     const isSettleable =
       kickTimestampNumber > 0 && (elapsedTime >= HOUR_TO_SECONDS * 72 || collateral.eq(0));
 

diff --git a/src/tests/erc20-pool-liquidations.spec.ts b/src/tests/erc20-pool-liquidations.spec.ts
@@ -246,7 +246,6 @@ describe('ERC20 Liquidations', () => {
     await submitAndVerifyTransaction(tx);
     const liquidation = pool.getLiquidation(signerBorrower2.address);
     let auctionStatus = await liquidation.getStatus();
-    expect(auctionStatus.isTakeable).toBeFalsy(); // in grace period
 
     // wait 8 hours
     const jumpTimeSeconds = 8 * 60 * 60; // 8 hours
@@ -298,7 +297,7 @@ describe('ERC20 Liquidations', () => {
     let auctionStatus = await liquidation.getStatus();
     let blockTime = await getBlockTime(signerLender);
     expect(auctionStatus.kickTime.valueOf() / 1000).toBeLessThanOrEqual(blockTime);
-    expect(auctionStatus.isTakeable).toBe(false);
+    expect(auctionStatus.isTakeable).toBe(true);
     expect(auctionStatus.isCollateralized).toBe(false);
     expect(auctionStatus.isSettleable).toBe(false);
 
@@ -356,7 +355,7 @@ describe('ERC20 Liquidations', () => {
     let auctionStatus = await liquidation.getStatus();
     const blockTime = await getBlockTime(signerLender);
     expect(auctionStatus.kickTime.valueOf() / 1000).toBeLessThanOrEqual(blockTime);
-    expect(auctionStatus.isTakeable).toBe(false);
+    expect(auctionStatus.isTakeable).toBe(true);
     expect(auctionStatus.isCollateralized).toBe(false);
     expect(auctionStatus.isSettleable).toBe(false);
 

diff --git a/src/tests/erc721-pool-liquidations.spec.ts b/src/tests/erc721-pool-liquidations.spec.ts
@@ -249,7 +249,6 @@ describe('ERC721 Liquidations', () => {
     await submitAndVerifyTransaction(tx);
     const liquidation = poolDuckDai.getLiquidation(signerBorrower2.address);
     let auctionStatus = await liquidation.getStatus();
-    expect(auctionStatus.isTakeable).toBeFalsy(); // in grace period
 
     // check auction status after kicking and before bucketTake
     expect(auctionStatus.debtToCover.gt(toWad('3.5'))).toBeTruthy();
@@ -294,7 +293,6 @@ describe('ERC721 Liquidations', () => {
     await submitAndVerifyTransaction(tx);
     const liquidation = poolDuckDai.getLiquidation(signerBorrower2.address);
     let auctionStatus = await liquidation.getStatus();
-    expect(auctionStatus.isTakeable).toBeFalsy(); // in grace period
 
     // check auction status after kicking and before bucketTake
     expect(auctionStatus.debtToCover.gt(toWad('3.5'))).toBeTruthy();
@@ -395,7 +393,7 @@ describe('ERC721 Liquidations', () => {
     let auctionStatus = await liquidation.getStatus();
     let blockTime = await getBlockTime(signerLender);
     expect(auctionStatus.kickTime.valueOf() / 1000).toBeLessThanOrEqual(blockTime);
-    expect(auctionStatus.isTakeable).toBe(false);
+    expect(auctionStatus.isTakeable).toBe(true);
     expect(auctionStatus.isCollateralized).toBe(false);
     expect(auctionStatus.isSettleable).toBe(false);
 
@@ -453,7 +451,7 @@ describe('ERC721 Liquidations', () => {
     let auctionStatus = await liquidation.getStatus();
     const blockTime = await getBlockTime(signerLender);
     expect(auctionStatus.kickTime.valueOf() / 1000).toBeLessThanOrEqual(blockTime);
-    expect(auctionStatus.isTakeable).toBe(false);
+    expect(auctionStatus.isTakeable).toBe(true);
     expect(auctionStatus.isCollateralized).toBe(false);
     expect(auctionStatus.isSettleable).toBe(false);
 

diff --git a/src/types/classes.ts b/src/types/classes.ts
@@ -75,7 +75,7 @@ export interface AuctionStatus {
   collateral: BigNumber;
   /** remaining borrower debt to be covered */
   debtToCover: BigNumber;
-  /** true if the grace period has elapsed and the auction has not expired */
+  /** true if collateral is available to be taken */
   isTakeable: boolean;
   /** helps determine if the liquidation may be settled */
   isCollateralized: boolean;