From 3212095374840230c931566c1b8ea7b91a2b24f5 Mon Sep 17 00:00:00 2001 From: Benjamin Bollen Date: Fri, 3 Nov 2017 22:12:32 +0530 Subject: [PATCH 1/2] contracts: correct hasSaleEnded to correct for paused, but not yet ended sale --- contracts/TokenSale.sol | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/contracts/TokenSale.sol b/contracts/TokenSale.sol index c064dca..5014f27 100644 --- a/contracts/TokenSale.sol +++ b/contracts/TokenSale.sol @@ -214,11 +214,18 @@ contract TokenSale is OpsManaged, Pausable, TokenSaleConfig { // Pausable is als function hasSaleEnded() private view returns (bool) { - if (totalTokensSold >= TOKENS_SALE || currentTime() >= endTime || finalized) { + // if sold out or finalized, sale has ended + if (totalTokensSold >= TOKENS_SALE || finalized) { return true; + // else if sale is not paused (pausedTime = 0) + // and endtime has past, then sale has ended + } else if (pausedTime == 0 && currentTime() >= endTime) { + return true; + // otherwise it not past and not paused; or paused + // and as such not ended + } else { + return false; } - - return false; } From e5019899cb33306d75c6277033bab6849df9bbf2 Mon Sep 17 00:00:00 2001 From: Benjamin Bollen Date: Fri, 3 Nov 2017 23:38:30 +0530 Subject: [PATCH 2/2] contracts: with corrected hasSaleEnded, revert requirement for updateWhiteList to not-hasSaleEnded --- contracts/TokenSale.sol | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contracts/TokenSale.sol b/contracts/TokenSale.sol index 5014f27..764a0fd 100644 --- a/contracts/TokenSale.sol +++ b/contracts/TokenSale.sol @@ -221,7 +221,7 @@ contract TokenSale is OpsManaged, Pausable, TokenSaleConfig { // Pausable is als // and endtime has past, then sale has ended } else if (pausedTime == 0 && currentTime() >= endTime) { return true; - // otherwise it not past and not paused; or paused + // otherwise it is not past and not paused; or paused // and as such not ended } else { return false; @@ -242,7 +242,7 @@ contract TokenSale is OpsManaged, Pausable, TokenSaleConfig { // Pausable is als function updateWhitelist(address _account, uint8 _phase) external onlyOps returns (bool) { require(_account != address(0)); require(_phase <= 2); - require(!finalized); + require(!hasSaleEnded()); whitelist[_account] = _phase;