Raffle Timing Fix

sudiptab2100 · Jun 12, 2021 · 15f77fd · 15f77fd
1 parent 1b8cfc4
commit 15f77fd
Show file tree

Hide file tree

Showing 9 changed files with 21,659 additions and 18,326 deletions.
diff --git a/build/contracts/IDO.json b/build/contracts/IDO.json
diff --git a/build/contracts/IStaker.json b/build/contracts/IStaker.json
diff --git a/build/contracts/RaffleWrap.json b/build/contracts/RaffleWrap.json
diff --git a/build/contracts/RaffleWrapTest.json b/build/contracts/RaffleWrapTest.json
diff --git a/build/contracts/Random.json b/build/contracts/Random.json
diff --git a/build/contracts/RandomTest.json b/build/contracts/RandomTest.json
diff --git a/contracts/IDOStaker/RaffleWrap.sol b/contracts/IDOStaker/RaffleWrap.sol
@@ -96,13 +96,14 @@ contract RaffleWrap is IDO, Random {
     uint256 public ticketPrice = 3 * 10 ** 18; // Price of a ticket(no. of tokens)
 
     modifier raffleParticipationPeriod() {
-        require(regStarts >= block.timestamp, "Raffle: Can't Participate Now");
+        require(regStarts <= block.timestamp, "Raffle: Participation Didn't Begin");
+        require(regStarts + regDuration >= block.timestamp, "Raffle: Participation Ended");
         _;
     }
 
     modifier raffleResultPeriod() {
-        require(regStarts <= block.timestamp && isInitialized, "Registration Not Started Yet");
-        require(regStarts + regDuration >= block.timestamp, "Registration Ended");
+        require(regStarts + regDuration <= block.timestamp, "Raffle: Participation Didn't End");
+        require(saleStarts >= block.timestamp, "Raffle: Out Of Time");
         _;
     }
 
@@ -125,6 +126,7 @@ contract RaffleWrap is IDO, Random {
 
     // Buy Tickets
     function buyTickets(uint256 _noOfTickets) external raffleParticipationPeriod nonReentrant {
+        require(!getRegistrationStatus(msg.sender), "Already Participated In IDO");
         uint256 nextTicket = ticketsSold;
         nativeToken.transferFrom(msg.sender, owner(), _noOfTickets * ticketPrice);
 

diff --git a/contracts/IDOStaker/RaffleWrapTest.sol b/contracts/IDOStaker/RaffleWrapTest.sol
@@ -96,13 +96,14 @@ contract RaffleWrapTest is IDO, RandomTest {
     uint256 public ticketPrice = 3 * 10 ** 18; // Price of a ticket(no. of tokens)
 
     modifier raffleParticipationPeriod() {
-        require(regStarts >= block.timestamp, "Raffle: Can't Participate Now");
+        require(regStarts <= block.timestamp, "Raffle: Participation Didn't Begin");
+        require(regStarts + regDuration >= block.timestamp, "Raffle: Participation Ended");
         _;
     }
 
     modifier raffleResultPeriod() {
-        require(regStarts <= block.timestamp && isInitialized, "Registration Not Started Yet");
-        require(regStarts + regDuration >= block.timestamp, "Registration Ended");
+        require(regStarts + regDuration <= block.timestamp, "Raffle: Participation Didn't End");
+        require(saleStarts >= block.timestamp, "Raffle: Out Of Time");
         _;
     }
 
@@ -125,6 +126,7 @@ contract RaffleWrapTest is IDO, RandomTest {
 
     // Buy Tickets
     function buyTickets(uint256 _noOfTickets) external raffleParticipationPeriod nonReentrant {
+        require(!getRegistrationStatus(msg.sender), "Already Participated In IDO");
         uint256 nextTicket = ticketsSold;
         nativeToken.transferFrom(msg.sender, owner(), _noOfTickets * ticketPrice);
 

diff --git a/test/3-raffle-test.js b/test/3-raffle-test.js
@@ -42,9 +42,11 @@ contract("RaffleWrap", accounts => {
     })
 
     it('Buy Test', async () => {
-        var initTime = Math.floor(Date.now() / 1000) + 10
+        var initTime = Math.floor(Date.now() / 1000) + 1
         await raffle.initialize(initTime)
 
+        await timeout(1)
+
         await polCoin.approve(raffle.address, '100000000000000000000', { from: accounts[0] })
         await raffle.buyTickets(5, { from: accounts[0] })
         var count1 = (await raffle.addressToTicketCount(accounts[0])).toNumber()
@@ -60,8 +62,9 @@ contract("RaffleWrap", accounts => {
     })
 
     it('Rand Winner Test', async () => {
-        var initTime = Math.floor(Date.now() / 1000) + 20
+        var initTime = Math.floor(Date.now() / 1000) + 1
         await raffle.initialize(initTime)
+        await timeout(1)
 
         await polCoin.approve(raffle.address, '100000000000000000000', { from: accounts[0] })
         await polCoin.approve(raffle.address, '100000000000000000000', { from: accounts[1] })
@@ -73,7 +76,7 @@ contract("RaffleWrap", accounts => {
         await raffle.buyTickets(30, { from: accounts[2] })
         // await raffle.buyTickets(30, { from: accounts[3] })
 
-        await timeout(20)
+        await timeout(48)
         await raffle.fulfillTest(
             '0x11784bfa961ea00360336b7dfda4504f3e5e01a6035d89a9464ccdf8c73ac1b0', 
             '77626901581511883625746798795701147174388658559238937904298300184740954966236'