fix(erc-1497): reflect contract fixes

kleros · May 16, 2019 · 1e025b0 · 1e025b0
1 parent dae9102
commit 1e025b0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/contracts/examples/SimpleEscrow.sol b/contracts/examples/SimpleEscrow.sol
@@ -30,10 +30,9 @@ contract SimpleEscrow is IArbitrable {
     }
 
     function releaseFunds() public {
+        require(!resolved, "Already resolved.");
         require(reclaimedAt == 0, "Payer reclaimed the funds.");
         require(now - createdAt > reclamationPeriod, "Payer still has time to reclaim.");
-        require(!disputed, "There is a dispute.");
-        require(!resolved, "Already resolved.");
 
         resolved = true;
         payee.send(value);
@@ -46,7 +45,7 @@ contract SimpleEscrow is IArbitrable {
 
         if(awaitingArbitrationFeeFromPayee){
             require(now - reclaimedAt > arbitrationFeeDepositPeriod, "Payee still has time to deposit arbitration fee.");
-            payer.send(value);
+            payer.send(address(this).balance);
             resolved = true;
         }
         else{

diff --git a/contracts/examples/SimpleEscrowWithERC1497.sol b/contracts/examples/SimpleEscrowWithERC1497.sol
@@ -35,10 +35,9 @@ contract SimpleEscrowWithERC1497 is IArbitrable, IEvidence {
     }
 
     function releaseFunds() public {
+        require(!resolved, "Already resolved.");
         require(reclaimedAt == 0, "Payer reclaimed the funds.");
         require(now - createdAt > reclamationPeriod, "Payer still has time to reclaim.");
-        require(!disputed, "There is a dispute.");
-        require(!resolved, "Already resolved.");
 
         resolved = true;
         payee.send(value);
@@ -51,7 +50,7 @@ contract SimpleEscrowWithERC1497 is IArbitrable, IEvidence {
 
         if(awaitingArbitrationFeeFromPayee){
             require(now - reclaimedAt > arbitrationFeeDepositPeriod, "Payee still has time to deposit arbitration fee.");
-            payer.send(value);
+            payer.send(address(this).balance);
             resolved = true;
         }
         else{

diff --git a/docs/erc-1497.rst b/docs/erc-1497.rst
@@ -420,9 +420,9 @@ Lastly, we need a function to let parties submit evidence:
       }
 
       function releaseFunds() public {
-          require(now - createdAt > reclamationPeriod, "Payer still has time to reclaim.");
-          require(!disputed, "There is a dispute.");
           require(!resolved, "Already resolved.");
+          require(reclaimedAt == 0, "Payer reclaimed the funds.");
+          require(now - createdAt > reclamationPeriod, "Payer still has time to reclaim.");
 
           resolved = true;
           payee.send(value);
@@ -434,7 +434,7 @@ Lastly, we need a function to let parties submit evidence:
 
           if(awaitingArbitrationFeeFromPayee){
               require(now - reclaimedAt > arbitrationFeeDepositPeriod, "Payee still has time to deposit arbitration fee.");
-              payer.send(value);
+              payer.send(address(this).balance);
               resolved = true;
           }
           else{
@@ -455,7 +455,7 @@ Lastly, we need a function to let parties submit evidence:
           require(!resolved, "Already resolved");
           require(disputed, "There should be dispute to execute a ruling.");
           resolved = true;
-          if(_ruling == uint(RulingOptions.PayeeWins)) payer.send(address(this).balance);
+          if(_ruling == uint(RulingOptions.PayerWins)) payer.send(address(this).balance);
           else payee.send(address(this).balance);
           emit Ruling(arbitrator, _disputeID, _ruling);
       }