Merge pull request #89 from raiden-network/waiting-period

Add waiting period before claiming tokens

Author: LefterisJP

contracts/auction.sol

@@ -15,6 +15,9 @@ contract DutchAuction {
      * token_multiplier set from token's number of decimals (i.e. 10 ** decimals)
      */
 
+    // Wait 7 days after the end of the auction, before ayone can claim tokens
+    uint constant public token_claim_waiting_period = 7 days;
+
     /*
      * Storage
      */
@@ -260,6 +263,10 @@ contract DutchAuction {
         isValidPayload
         atStage(Stages.AuctionEnded)
     {
+        // Waiting period after the end of the auction, before anyone can claim tokens
+        // Ensures enough time to check if auction was finalized correctly
+        // before users start transacting tokens
+        require(now > end_time + token_claim_waiting_period);
         require(receiver_address != 0x0);
         require(bids[receiver_address] > 0);
 

tests/auction_fixtures.py

@@ -176,7 +176,6 @@ def get(token, auction, bidders, distributor=None):
         assert final_price > 0
 
         for i, bidder in enumerate(bidders):
-            print('auction_claim_tokens_tested bidder', bidder)
             values.append(auction.call().bids(bidder))
             tokens_expected = token_multiplier * values[i] // final_price
             expected_tokens.append(tokens_expected)
@@ -188,11 +187,9 @@ def get(token, auction, bidders, distributor=None):
             assert values[i] > 0
 
         if len(bidders) == 1:
-            print('auction_claim_tokens_tested claimTokens', bidders[0])
             auction.transact({'from': bidders[0]}).claimTokens()
             # auction.transact({'from': owner}).claimTokens(bidders[0])
         else:
-            print('auction_claim_tokens_tested distribute', bidders)
             distributor.transact({'from': owner}).distribute(bidders)
 
         for i, bidder in enumerate(bidders):

tests/test_auction.py

@@ -293,6 +293,14 @@ def test_auction_bid(
             'value': 1
         })
 
+    # Claim tokens only after waiting period
+    with pytest.raises(tester.TransactionFailed):
+        auction_claim_tokens_tested(token, auction, A)
+
+    end_time = auction.call().end_time()
+    elapsed = auction.call().token_claim_waiting_period()
+    web3.testing.timeTravel(end_time + elapsed+1)
+
     auction_claim_tokens_tested(token, auction, A)
 
     assert auction.call().stage() == 4  # TokensDistributed
@@ -677,6 +685,14 @@ def test_auction_simulation(
 
     rounding_error_tokens = 0
 
+    # Claim tokens only after waiting period
+    with pytest.raises(tester.TransactionFailed):
+        auction_claim_tokens_tested(token, auction, bidders[0])
+
+    end_time = auction.call().end_time()
+    elapsed = auction.call().token_claim_waiting_period()
+    web3.testing.timeTravel(end_time + elapsed+1)
+
     for i in range(0, index):
         bidder = bidders[i]