Merge branch 'rollup-contracts-port-tests' into rollup-contracts-port…

…-tests-cont
EspressoSystems · Feb 24, 2022 · 1dd3061 · 1dd3061
2 parents 8296585 + 2ba6d1a
commit 1dd3061
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -19,7 +19,7 @@ services:
       - "seqdata:/data"
       - "l1keystore:/l1keystore"
       - "deploydata:/deploydata"
-    command: -l1role sequencer -l1conn ws://geth:8546 -l1keystore /l1keystore -l1deployment /deploydata/deployment.json -httphost 0.0.0.0 -wshost 0.0.0.0
+    command: -datadir /data -dev -l1role sequencer -l1conn ws://geth:8546 -l1keystore /l1keystore -l1deployment /deploydata/deployment.json -httphost 0.0.0.0 -wshost 0.0.0.0
     depends_on:
       - geth
 volumes:

diff --git a/solgen/package.json b/solgen/package.json
@@ -7,8 +7,8 @@
   "license": "Apache-2.0",
   "scripts": {
     "build": "hardhat compile",
-    "solhint": "./node_modules/.bin/solhint -f table src/**/*.sol",
-    "prettier:solidity": "./node_modules/.bin/prettier --write src/**/*.sol"
+    "solhint": "solhint -f table src/**/*.sol",
+    "prettier:solidity": "prettier --write src/**/*.sol"
   },
   "dependencies": {
     "@openzeppelin/contracts": "4.5.0",

diff --git a/solgen/src/challenge/ChallengeManager.sol b/solgen/src/challenge/ChallengeManager.sol
@@ -310,12 +310,10 @@ contract ChallengeManager is DelegateCallAware, IChallengeManager {
     /// @dev This function causes the mode of the challenge to be set to NONE by deleting the challenge
     function _nextWin(uint64 challengeIndex, ChallengeTerminationType reason) private {
         ChallengeLib.Challenge storage challenge = challenges[challengeIndex];
+        address next = challenge.next.addr;
+        address current = challenge.current.addr;
         delete challenges[challengeIndex];
-        resultReceiver.completeChallenge(
-            challengeIndex,
-            challenge.next.addr,
-            challenge.current.addr
-        );
+        resultReceiver.completeChallenge(challengeIndex, next, current);
         emit ChallengeEnded(challengeIndex, reason);
     }
 
@@ -331,8 +329,10 @@ contract ChallengeManager is DelegateCallAware, IChallengeManager {
         ChallengeLib.Challenge storage challenge = challenges[challengeIndex];
         challenge.challengeStateHash = bytes32(0);
 
+        //        address next = challenge.next.addr;
+        //        address current = challenge.current.addr;
         //        delete challenges[challengeIndex];
-        //        resultReceiver.completeChallenge(challengeIndex, challenge.current.addr, challenge.next.addr);
+        //        resultReceiver.completeChallenge(challengeIndex, current, next);
         //        emit ChallengeEnded(challengeIndex, reason);
     }
 }