Fix cancels judgement mechanism (#169)

fix cancel judgement
mangata-finance · Jul 9, 2024 · 5b26e1a · 5b26e1a
1 parent 1146078
commit 5b26e1a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 19 deletions.
diff --git a/contracts/src/Rolldown.sol b/contracts/src/Rolldown.sol
@@ -358,7 +358,7 @@ contract Rolldown is
         CancelResolution memory resolution = CancelResolution({
             requestId: RequestId({origin: Origin.L1, id: counter++}),
             l2RequestId: cancel.requestId.id,
-            cancelJustified: correct_hash == cancel.hash,
+            cancelJustified: correct_hash != cancel.hash,
             timeStamp: timeStamp
         });
 

diff --git a/contracts/test/rolldown.t.sol b/contracts/test/rolldown.t.sol
@@ -36,7 +36,7 @@ contract RolldownTest is Test, IRolldownPrimitives {
         users = utils.createUsers(1);
         rolldown = new Rolldown();
         rolldown.initialize(avsPauserReg, avsOwner, ChainId.Ethereum, users[0]);
-        ETH_TOKEN_ADDRESS = payable(0x5748395867463837537395739375937493733457);
+        ETH_TOKEN_ADDRESS = payable(0x0000000000000000000000000000000000000001);
     }
 
     function beforeEach() public {}
@@ -413,7 +413,7 @@ contract RolldownTest is Test, IRolldownPrimitives {
 
         vm.startPrank(alice);
         vm.expectEmit(true, true, true, true);
-        emit IRolldownPrimitives.DisputeResolutionAcceptedIntoQueue(1, false);
+        emit IRolldownPrimitives.DisputeResolutionAcceptedIntoQueue(1, true);
         rolldown.update_l1_from_l2(l2Update);
         vm.stopPrank();
     }
@@ -447,7 +447,7 @@ contract RolldownTest is Test, IRolldownPrimitives {
 
         vm.startPrank(alice);
         vm.expectEmit(true, true, true, true);
-        emit IRolldownPrimitives.DisputeResolutionAcceptedIntoQueue(1, true);
+        emit IRolldownPrimitives.DisputeResolutionAcceptedIntoQueue(1, false);
         rolldown.update_l1_from_l2(l2Update);
         vm.stopPrank();
     }

diff --git a/rollup-sequencer/src/index.ts b/rollup-sequencer/src/index.ts
@@ -43,7 +43,6 @@ async function main() {
     print(`is selected ${isSequencerSelected}`);
     print(`rights : ${hasSequencerRights}`);
     if (isSequencerSelected && hasSequencerRights) {
-      try {
         if (inProgress) {
           return;
         }else{
@@ -77,20 +76,7 @@ async function main() {
 				} else {
 					print(`L1Update with max id == ${lastRequestId} was already submitted`);
 				}
-			} catch (e) {
-        if (e instanceof BaseError) {
-          print("Viem error occured - restarting service");
-          print(e);
-          throw e;
-        }else{
-          print("The contract function getUpdateForL2 returned no data");
-          print(e);
-          // Do nothing with error
-          // Error only appear when we have block where there are no data for getUpdateForL2 at all.
-          // This is only in the very beginning
-          // ContractFunctionExecutionError: The contract function "getUpdateForL2" returned no data ("0x").
-        }
-			}
+
 			inProgress = false;
 		}