update contract for withdrawal

layer2/contracts-bedrock/scripts/deploy/Deploy.s.sol

@@ -1424,46 +1424,46 @@ contract Deploy is Deployer {
 
     /// @notice Sets the implementation for the `CANNON` game type in the `DisputeGameFactory`
     function setCannonFaultGameImplementation(bool _allowUpgrade) public broadcast {
-        //console.log("Setting Cannon FaultDisputeGame implementation");
-        //DisputeGameFactory factory = DisputeGameFactory(mustGetAddress("DisputeGameFactoryProxy"));
-        //DelayedWETH weth = DelayedWETH(mustGetAddress("DelayedWETHProxy"));
-
-        //// Set the Cannon FaultDisputeGame implementation in the factory.
-        //_setFaultGameImplementation({
-        //    _factory: factory,
-        //    _allowUpgrade: _allowUpgrade,
-        //    _params: FaultDisputeGameParams({
-        //        anchorStateRegistry: AnchorStateRegistry(mustGetAddress("AnchorStateRegistryProxy")),
-        //        weth: weth,
-        //        gameType: GameTypes.CANNON,
-        //        absolutePrestate: loadMipsAbsolutePrestate(),
-        //        faultVm: IBigStepper(mustGetAddress("Mips")),
-        //        maxGameDepth: cfg.faultGameMaxDepth(),
-        //        maxClockDuration: Duration.wrap(uint64(cfg.faultGameMaxClockDuration()))
-        //    })
-        //});
+//        console.log("Setting Cannon FaultDisputeGame implementation");
+//        DisputeGameFactory factory = DisputeGameFactory(mustGetAddress("DisputeGameFactoryProxy"));
+//        DelayedWETH weth = DelayedWETH(mustGetAddress("DelayedWETHProxy"));
+//
+//        // Set the Cannon FaultDisputeGame implementation in the factory.
+//        _setFaultGameImplementation({
+//            _factory: factory,
+//            _allowUpgrade: _allowUpgrade,
+//            _params: FaultDisputeGameParams({
+//                anchorStateRegistry: AnchorStateRegistry(mustGetAddress("AnchorStateRegistryProxy")),
+//                weth: weth,
+//                gameType: GameTypes.CANNON,
+//                absolutePrestate: loadMipsAbsolutePrestate(),
+//                faultVm: IBigStepper(mustGetAddress("Mips")),
+//                maxGameDepth: cfg.faultGameMaxDepth(),
+//                maxClockDuration: Duration.wrap(uint64(cfg.faultGameMaxClockDuration()))
+//            })
+//        });
     }
 
     /// @notice Sets the implementation for the `PERMISSIONED_CANNON` game type in the `DisputeGameFactory`
     function setPermissionedCannonFaultGameImplementation(bool _allowUpgrade) public broadcast {
-        //console.log("Setting Cannon PermissionedDisputeGame implementation");
-        //DisputeGameFactory factory = DisputeGameFactory(mustGetAddress("DisputeGameFactoryProxy"));
-        //DelayedWETH weth = DelayedWETH(mustGetAddress("PermissionedDelayedWETHProxy"));
-
-        //// Set the Cannon FaultDisputeGame implementation in the factory.
-        //_setFaultGameImplementation({
-        //    _factory: factory,
-        //    _allowUpgrade: _allowUpgrade,
-        //    _params: FaultDisputeGameParams({
-        //        anchorStateRegistry: AnchorStateRegistry(mustGetAddress("AnchorStateRegistryProxy")),
-        //        weth: weth,
-        //        gameType: GameTypes.PERMISSIONED_CANNON,
-        //        absolutePrestate: loadMipsAbsolutePrestate(),
-        //        faultVm: IBigStepper(mustGetAddress("Mips")),
-        //        maxGameDepth: cfg.faultGameMaxDepth(),
-        //        maxClockDuration: Duration.wrap(uint64(cfg.faultGameMaxClockDuration()))
-        //    })
-        //});
+//        console.log("Setting Cannon PermissionedDisputeGame implementation");
+//        DisputeGameFactory factory = DisputeGameFactory(mustGetAddress("DisputeGameFactoryProxy"));
+//        DelayedWETH weth = DelayedWETH(mustGetAddress("PermissionedDelayedWETHProxy"));
+//
+//        // Set the Cannon FaultDisputeGame implementation in the factory.
+//        _setFaultGameImplementation({
+//            _factory: factory,
+//            _allowUpgrade: _allowUpgrade,
+//            _params: FaultDisputeGameParams({
+//                anchorStateRegistry: AnchorStateRegistry(mustGetAddress("AnchorStateRegistryProxy")),
+//                weth: weth,
+//                gameType: GameTypes.PERMISSIONED_CANNON,
+//                absolutePrestate: loadMipsAbsolutePrestate(),
+//                faultVm: IBigStepper(mustGetAddress("Mips")),
+//                maxGameDepth: cfg.faultGameMaxDepth(),
+//                maxClockDuration: Duration.wrap(uint64(cfg.faultGameMaxClockDuration()))
+//            })
+//        });
     }
 
     /// @notice Sets the implementation for the `ALPHABET` game type in the `DisputeGameFactory`

layer2/contracts-bedrock/src/libraries/Hashing.sol

@@ -107,6 +107,13 @@ library Hashing {
         return keccak256(abi.encode(_tx.nonce, _tx.sender, _tx.target, _tx.value, _tx.gasLimit, _tx.data));
     }
 
+    /// @notice Derives the withdrawal hash according to the encoding in the L2.
+    /// @param _param Withdrawal param to hash.
+    /// @return Hashed withdrawal param.
+    function hashExChainWithdrawal(Types.ExChainWithdrawalParam memory _param) internal pure returns (bytes32) {
+        return keccak256(abi.encode(_param.user, _param.coin, _param.value, _param.txHash));
+    }
+
     /// @notice Hashes the various elements of an output root proof into an output root hash which
     ///         can be used to check if the proof is valid.
     /// @param _outputRootProof Output root proof which should hash to an output root.

layer2/contracts-bedrock/src/libraries/Types.sol

@@ -67,4 +67,19 @@ library Types {
         uint256 gasLimit;
         bytes data;
     }
+
+    struct ExChainWithdrawalParam {
+        uint256 value;
+        address user;
+        bytes coin;
+        bytes32 txHash;
+    }
+    struct BatchExChainWithdrawalParam {
+        uint256 value;
+        address user;
+        bytes coin;
+        bytes32 txHash;
+        bytes[] _withdrawalProof;
+    }
+
 }