Revert "temp: fixes for kontrol" (#10132)

* Revert "temp: fixes for kontrol"

This reverts commit aa0b0d5b9979fcedcc8dce6f8014ebd24f7c7795.

* kontrol: update

packages/contracts-bedrock/test/L1/OptimismPortal.t.sol

@@ -150,7 +150,7 @@ contract OptimismPortal_Test is CommonTest {
 
     /// @dev Tests that `depositTransaction` reverts when the destination address is non-zero
     ///      for a contract creation deposit.
-    function test_depositTransaction_contractCreation_reverts() external virtual {
+    function test_depositTransaction_contractCreation_reverts() external {
         // contract creation must have a target of address(0)
         vm.expectRevert(BadTarget.selector);
         optimismPortal.depositTransaction(address(1), 1, 0, true, hex"");
@@ -158,7 +158,7 @@ contract OptimismPortal_Test is CommonTest {
 
     /// @dev Tests that `depositTransaction` reverts when the data is too large.
     ///      This places an upper bound on unsafe blocks sent over p2p.
-    function test_depositTransaction_largeData_reverts() external virtual {
+    function test_depositTransaction_largeData_reverts() external {
         uint256 size = 120_001;
         uint64 gasLimit = optimismPortal.minimumGasLimit(uint64(size));
         vm.expectRevert(LargeCalldata.selector);
@@ -172,20 +172,14 @@ contract OptimismPortal_Test is CommonTest {
     }
 
     /// @dev Tests that `depositTransaction` reverts when the gas limit is too small.
-    function test_depositTransaction_smallGasLimit_reverts() external virtual {
+    function test_depositTransaction_smallGasLimit_reverts() external {
         vm.expectRevert(SmallGasLimit.selector);
         optimismPortal.depositTransaction({ _to: address(1), _value: 0, _gasLimit: 0, _isCreation: false, _data: hex"" });
     }
 
     /// @dev Tests that `depositTransaction` succeeds for small,
     ///      but sufficient, gas limits.
-    function testFuzz_depositTransaction_smallGasLimit_succeeds(
-        bytes memory _data,
-        bool _shouldFail
-    )
-        external
-        virtual
-    {
+    function testFuzz_depositTransaction_smallGasLimit_succeeds(bytes memory _data, bool _shouldFail) external {
         uint64 gasLimit = optimismPortal.minimumGasLimit(uint64(_data.length));
         if (_shouldFail) {
             gasLimit = uint64(bound(gasLimit, 0, gasLimit - 1));

packages/contracts-bedrock/test/kontrol/deployment/DeploymentSummary.t.sol

@@ -82,23 +82,6 @@ contract DeploymentSummary_TestOptimismPortal is DeploymentSummary, OptimismPort
     /// @notice This test is overridden because `KontrolDeployment` doesn't initialize
     ///         the L2OutputOracle, which is needed in this test
     function test_isOutputFinalized_succeeds() external override { }
-
-    /// Temporary test skips
-    function testFuzz_depositTransaction_smallGasLimit_succeeds(bytes memory, bool) external override {
-        vm.skip(true);
-    }
-
-    function test_depositTransaction_contractCreation_reverts() external override {
-        vm.skip(true);
-    }
-
-    function test_depositTransaction_largeData_reverts() external override {
-        vm.skip(true);
-    }
-
-    function test_depositTransaction_smallGasLimit_reverts() external override {
-        vm.skip(true);
-    }
 }
 
 contract DeploymentSummary_TestL1CrossDomainMessenger is DeploymentSummary, L1CrossDomainMessenger_Test {

packages/contracts-bedrock/test/kontrol/proofs/utils/DeploymentSummary.sol

@@ -21,7 +21,7 @@ contract DeploymentSummary is DeploymentSummaryCode {
     address internal constant l1StandardBridgeProxyAddress = 0x0c8b5822b6e02CDa722174F19A1439A7495a3fA6;
     address internal constant l2OutputOracleAddress = 0x19652082F846171168Daf378C4fD3ee85a0D4A60;
     address internal constant l2OutputOracleProxyAddress = 0x8B71b41D4dBEb2b6821d44692d3fACAAf77480Bb;
-    address internal constant optimismPortalAddress = 0x8887E7568E81405c4E0D4cAaabdda949e3B9d4E4;
+    address internal constant optimismPortalAddress = 0xCEa36be2e9724d88cB107C552c602a8025DB88bA;
     address internal constant optimismPortalProxyAddress = 0x978e3286EB805934215a88694d80b09aDed68D90;
     address internal constant protocolVersionsAddress = 0xfbfD64a6C0257F613feFCe050Aa30ecC3E3d7C3F;
     address internal constant protocolVersionsProxyAddress = 0x416C42991d05b31E9A6dC209e91AD22b79D87Ae6;
@@ -434,7 +434,7 @@ contract DeploymentSummary is DeploymentSummaryCode {
         value = hex"000000000000000000000000000000000000000000000000000000000000000a";
         vm.store(systemOwnerSafeAddress, slot, value);
         slot = hex"360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc";
-        value = hex"0000000000000000000000008887e7568e81405c4e0d4caaabdda949e3b9d4e4";
+        value = hex"000000000000000000000000cea36be2e9724d88cb107c552c602a8025db88ba";
         vm.store(optimismPortalProxyAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000000";
         value = hex"0000000000000000000000000000000000000000000000000000000000000001";