Merge branch 'develop' into willc/atst-final

packages/contracts-bedrock/.gas-snapshot

-GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_0() (gas: 261340)
-GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_1() (gas: 76067)
-GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_0() (gas: 348292)
-GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_1() (gas: 112945)
-GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_0() (gas: 348314)
-GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_1() (gas: 112965)
-GasBenchMark_L1StandardBridge_Finalize:test_finalizeETHWithdrawal_benchmark() (gas: 40409)
-GasBenchMark_L2OutputOracle:test_proposeL2Output_benchmark() (gas: 88535)
-GasBenchMark_OptimismPortal:test_depositTransaction_benchmark() (gas: 75075)
-GasBenchMark_OptimismPortal:test_depositTransaction_benchmark_1() (gas: 36386)
-GasBenchMark_OptimismPortal:test_proveWithdrawalTransaction_benchmark() (gas: 169229)
 Bytes_slice_Test:test_slice_acrossMultipleWords_works() (gas: 9423)
 Bytes_slice_Test:test_slice_acrossWords_works() (gas: 1418)
 Bytes_slice_Test:test_slice_fromNonZeroIdx_works() (gas: 17154)
@@ -17,9 +6,6 @@ Bytes_toNibbles_Test:test_toNibbles_expectedResult128Bytes_works() (gas: 129874)
 Bytes_toNibbles_Test:test_toNibbles_expectedResult5Bytes_works() (gas: 6132)
 Bytes_toNibbles_Test:test_toNibbles_zeroLengthInput_works() (gas: 944)
 CrossDomainMessenger_BaseGas_Test:test_baseGas_succeeds() (gas: 20097)
-CrossDomainOwnableThroughPortal_Test:test_depositTransaction_crossDomainOwner_succeeds() (gas: 72494)
-CrossDomainOwnable_Test:test_onlyOwner_notOwner_reverts() (gas: 10597)
-CrossDomainOwnable_Test:test_onlyOwner_succeeds() (gas: 34883)
 CrossDomainOwnable2_Test:test_onlyOwner_notMessenger_reverts() (gas: 8416)
 CrossDomainOwnable2_Test:test_onlyOwner_notOwner2_reverts() (gas: 62010)
 CrossDomainOwnable2_Test:test_onlyOwner_notOwner_reverts() (gas: 16566)
@@ -36,10 +22,24 @@ CrossDomainOwnable3_Test:test_transferOwnershipNoLocal_succeeds() (gas: 48610)
 CrossDomainOwnable3_Test:test_transferOwnership_noLocalZeroAddress_reverts() (gas: 12015)
 CrossDomainOwnable3_Test:test_transferOwnership_notOwner_reverts() (gas: 13437)
 CrossDomainOwnable3_Test:test_transferOwnership_zeroAddress_reverts() (gas: 12081)
+CrossDomainOwnableThroughPortal_Test:test_depositTransaction_crossDomainOwner_succeeds() (gas: 72494)
+CrossDomainOwnable_Test:test_onlyOwner_notOwner_reverts() (gas: 10597)
+CrossDomainOwnable_Test:test_onlyOwner_succeeds() (gas: 34883)
 DeployerWhitelist_Test:test_owner_succeeds() (gas: 7582)
 DeployerWhitelist_Test:test_storageSlots_succeeds() (gas: 33395)
 FeeVault_Test:test_constructor_succeeds() (gas: 10736)
 FeeVault_Test:test_minWithdrawalAmount_succeeds() (gas: 10713)
+GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_0() (gas: 261340)
+GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_1() (gas: 76067)
+GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_0() (gas: 348292)
+GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_1() (gas: 112945)
+GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_0() (gas: 348314)
+GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_1() (gas: 112965)
+GasBenchMark_L1StandardBridge_Finalize:test_finalizeETHWithdrawal_benchmark() (gas: 40409)
+GasBenchMark_L2OutputOracle:test_proposeL2Output_benchmark() (gas: 88535)
+GasBenchMark_OptimismPortal:test_depositTransaction_benchmark() (gas: 75075)
+GasBenchMark_OptimismPortal:test_depositTransaction_benchmark_1() (gas: 36386)
+GasBenchMark_OptimismPortal:test_proveWithdrawalTransaction_benchmark() (gas: 169229)
 GasPriceOracle_Test:test_baseFee_succeeds() (gas: 8325)
 GasPriceOracle_Test:test_decimals_succeeds() (gas: 6167)
 GasPriceOracle_Test:test_gasPrice_succeeds() (gas: 8294)
@@ -59,15 +59,15 @@ GovernanceToken_Test:test_mint_fromOwner_succeeds() (gas: 108592)
 GovernanceToken_Test:test_transferFrom_succeeds() (gas: 146273)
 GovernanceToken_Test:test_transfer_succeeds() (gas: 138108)
 Hashing_hashDepositSource_Test:test_hashDepositSource_succeeds() (gas: 633)
+L1BlockNumberTest:test_fallback_succeeds() (gas: 18655)
+L1BlockNumberTest:test_getL1BlockNumber_succeeds() (gas: 10625)
+L1BlockNumberTest:test_receive_succeeds() (gas: 25384)
 L1BlockTest:test_basefee_succeeds() (gas: 7554)
 L1BlockTest:test_hash_succeeds() (gas: 7576)
 L1BlockTest:test_number_succeeds() (gas: 7629)
 L1BlockTest:test_sequenceNumber_succeeds() (gas: 7630)
 L1BlockTest:test_timestamp_succeeds() (gas: 7640)
 L1BlockTest:test_updateValues_succeeds() (gas: 60482)
-L1BlockNumberTest:test_fallback_succeeds() (gas: 18655)
-L1BlockNumberTest:test_getL1BlockNumber_succeeds() (gas: 10625)
-L1BlockNumberTest:test_receive_succeeds() (gas: 25384)
 L1CrossDomainMessenger_Test:test_messageVersion_succeeds() (gas: 24715)
 L1CrossDomainMessenger_Test:test_relayMessage_legacyOldReplay_reverts() (gas: 49394)
 L1CrossDomainMessenger_Test:test_relayMessage_legacyRetryAfterFailureThenSuccess_reverts() (gas: 228293)
@@ -242,19 +242,19 @@ OptimismMintableERC20_Test:test_mint_notBridge_reverts() (gas: 11121)
 OptimismMintableERC20_Test:test_mint_succeeds() (gas: 63566)
 OptimismMintableERC20_Test:test_remoteToken_succeeds() (gas: 7689)
 OptimismMintableERC20_Test:test_semver_succeeds() (gas: 8812)
-OptimismMintableTokenFactory_Test:test_bridge_succeeds() (gas: 7580)
-OptimismMintableTokenFactory_Test:test_createStandardL2Token_remoteIsZero_succeeds() (gas: 9390)
-OptimismMintableTokenFactory_Test:test_createStandardL2Token_sameTwice_succeeds() (gas: 2523203)
-OptimismMintableTokenFactory_Test:test_createStandardL2Token_succeeds() (gas: 1268564)
+OptimismMintableERC721Factory_Test:test_constructor_succeeds() (gas: 8285)
+OptimismMintableERC721Factory_Test:test_createOptimismMintableERC721_succeeds() (gas: 2336687)
+OptimismMintableERC721Factory_Test:test_createOptimismMintableERC721_zeroRemoteToken_reverts() (gas: 9418)
 OptimismMintableERC721_Test:test_burn_notBridge_reverts() (gas: 136966)
 OptimismMintableERC721_Test:test_burn_succeeds() (gas: 118832)
 OptimismMintableERC721_Test:test_constructor_succeeds() (gas: 28279)
 OptimismMintableERC721_Test:test_safeMint_notBridge_reverts() (gas: 11098)
 OptimismMintableERC721_Test:test_safeMint_succeeds() (gas: 140524)
 OptimismMintableERC721_Test:test_tokenURI_succeeds() (gas: 163442)
-OptimismMintableERC721Factory_Test:test_constructor_succeeds() (gas: 8285)
-OptimismMintableERC721Factory_Test:test_createOptimismMintableERC721_succeeds() (gas: 2336687)
-OptimismMintableERC721Factory_Test:test_createOptimismMintableERC721_zeroRemoteToken_reverts() (gas: 9418)
+OptimismMintableTokenFactory_Test:test_bridge_succeeds() (gas: 7580)
+OptimismMintableTokenFactory_Test:test_createStandardL2Token_remoteIsZero_succeeds() (gas: 9390)
+OptimismMintableTokenFactory_Test:test_createStandardL2Token_sameTwice_succeeds() (gas: 2523203)
+OptimismMintableTokenFactory_Test:test_createStandardL2Token_succeeds() (gas: 1268564)
 OptimismPortalUpgradeable_Test:test_initialize_cannotInitImpl_reverts() (gas: 11016)
 OptimismPortalUpgradeable_Test:test_initialize_cannotInitProxy_reverts() (gas: 15940)
 OptimismPortalUpgradeable_Test:test_params_initValuesOnProxy_succeeds() (gas: 16056)
@@ -297,17 +297,6 @@ OptimismPortal_Test:test_receive_succeeds() (gas: 127554)
 OptimismPortal_Test:test_simple_isOutputFinalized_succeeds() (gas: 24232)
 OptimismPortal_Test:test_unpause_onlyGuardian_reverts() (gas: 46151)
 OptimismPortal_Test:test_unpause_succeeds() (gas: 31780)
-Proxy_Test:test_delegatesToImpl_succeeds() (gas: 45207)
-Proxy_Test:test_implementationKey_succeeds() (gas: 20909)
-Proxy_Test:test_implementation_isZeroAddress_reverts() (gas: 47626)
-Proxy_Test:test_implementation_zeroAddressCaller_succeeds() (gas: 14752)
-Proxy_Test:test_ownerKey_succeeds() (gas: 19059)
-Proxy_Test:test_ownerProxyCall_notAdmin_succeeds() (gas: 34615)
-Proxy_Test:test_proxyCallToImp_notAdmin_succeeds() (gas: 30008)
-Proxy_Test:test_upgradeToAndCall_functionDoesNotExist_reverts() (gas: 104565)
-Proxy_Test:test_upgradeToAndCall_isPayable_succeeds() (gas: 53742)
-Proxy_Test:test_upgradeToAndCall_succeeds() (gas: 125190)
-Proxy_Test:test_upgradeTo_clashingFunctionSignatures_succeeds() (gas: 101359)
 ProxyAdmin_Test:test_chugsplashChangeProxyAdmin_succeeds() (gas: 35586)
 ProxyAdmin_Test:test_chugsplashGetProxyAdmin_succeeds() (gas: 15675)
 ProxyAdmin_Test:test_chugsplashGetProxyImplementation_succeeds() (gas: 51084)
@@ -331,6 +320,17 @@ ProxyAdmin_Test:test_setAddressManager_notOwner_reverts() (gas: 10578)
 ProxyAdmin_Test:test_setImplementationName_notOwner_reverts() (gas: 11111)
 ProxyAdmin_Test:test_setImplementationName_succeeds() (gas: 38945)
 ProxyAdmin_Test:test_setProxyType_notOwner_reverts() (gas: 10814)
+Proxy_Test:test_delegatesToImpl_succeeds() (gas: 45207)
+Proxy_Test:test_implementationKey_succeeds() (gas: 20909)
+Proxy_Test:test_implementation_isZeroAddress_reverts() (gas: 47626)
+Proxy_Test:test_implementation_zeroAddressCaller_succeeds() (gas: 14752)
+Proxy_Test:test_ownerKey_succeeds() (gas: 19059)
+Proxy_Test:test_ownerProxyCall_notAdmin_succeeds() (gas: 34615)
+Proxy_Test:test_proxyCallToImp_notAdmin_succeeds() (gas: 30008)
+Proxy_Test:test_upgradeToAndCall_functionDoesNotExist_reverts() (gas: 104565)
+Proxy_Test:test_upgradeToAndCall_isPayable_succeeds() (gas: 53742)
+Proxy_Test:test_upgradeToAndCall_succeeds() (gas: 125190)
+Proxy_Test:test_upgradeTo_clashingFunctionSignatures_succeeds() (gas: 101359)
 RLPReader_readBytes_Test:test_readBytes_bytestring00_succeeds() (gas: 1878)
 RLPReader_readBytes_Test:test_readBytes_bytestring01_succeeds() (gas: 1855)
 RLPReader_readBytes_Test:test_readBytes_bytestring7f_succeeds() (gas: 1876)
@@ -392,6 +392,8 @@ RLPWriter_writeUint_Test:test_writeUint_smallint3_succeeds() (gas: 7301)
 RLPWriter_writeUint_Test:test_writeUint_smallint4_succeeds() (gas: 7302)
 RLPWriter_writeUint_Test:test_writeUint_smallint_succeeds() (gas: 7280)
 RLPWriter_writeUint_Test:test_writeUint_zero_succeeds() (gas: 7749)
+ResolvedDelegateProxy_Test:test_fallback_addressManagerNotSet_reverts() (gas: 605906)
+ResolvedDelegateProxy_Test:test_fallback_delegateCallBar_reverts() (gas: 24783)
 ResourceMetering_Test:test_meter_initialResourceParams_succeeds() (gas: 8983)
 ResourceMetering_Test:test_meter_updateNoGasDelta_succeeds() (gas: 2008142)
 ResourceMetering_Test:test_meter_updateOneEmptyBlock_succeeds() (gas: 18369)
@@ -413,4 +415,4 @@ SystemConfig_Setters_TestFail:test_setGasConfig_notOwner_reverts() (gas: 10555)
 SystemConfig_Setters_TestFail:test_setGasLimit_notOwner_reverts() (gas: 10658)
 SystemConfig_Setters_TestFail:test_setUnsafeBlockSigner_notOwner_reverts() (gas: 10660)
 TransferOnionTest:test_constructor_succeeds() (gas: 564855)
-TransferOnionTest:test_unwrap_succeeds() (gas: 724958)
+TransferOnionTest:test_unwrap_succeeds() (gas: 724958)
\ No newline at end of file

packages/contracts-bedrock/contracts/L1/ResourceMetering.sol

@@ -96,11 +96,11 @@ abstract contract ResourceMetering is Initializable {
 
             // Update base fee by adding the base fee delta and clamp the resulting value between
             // min and max.
-            int256 newBaseFee = Arithmetic.clamp(
-                int256(uint256(params.prevBaseFee)) + baseFeeDelta,
-                MINIMUM_BASE_FEE,
-                MAXIMUM_BASE_FEE
-            );
+            int256 newBaseFee = Arithmetic.clamp({
+                _value: int256(uint256(params.prevBaseFee)) + baseFeeDelta,
+                _min: MINIMUM_BASE_FEE,
+                _max: MAXIMUM_BASE_FEE
+            });
 
             // If we skipped more than one block, we also need to account for every empty block.
             // Empty block means there was no demand for deposits in that block, so we should
@@ -109,15 +109,15 @@ abstract contract ResourceMetering is Initializable {
                 // Update the base fee by repeatedly applying the exponent 1-(1/change_denominator)
                 // blockDiff - 1 times. Simulates multiple empty blocks. Clamp the resulting value
                 // between min and max.
-                newBaseFee = Arithmetic.clamp(
-                    Arithmetic.cdexp(
-                        newBaseFee,
-                        BASE_FEE_MAX_CHANGE_DENOMINATOR,
-                        int256(blockDiff - 1)
-                    ),
-                    MINIMUM_BASE_FEE,
-                    MAXIMUM_BASE_FEE
-                );
+                newBaseFee = Arithmetic.clamp({
+                    _value: Arithmetic.cdexp({
+                        _coefficient: newBaseFee,
+                        _denominator: BASE_FEE_MAX_CHANGE_DENOMINATOR,
+                        _exponent: int256(blockDiff - 1)
+                    }),
+                    _min: MINIMUM_BASE_FEE,
+                    _max: MAXIMUM_BASE_FEE
+                });
             }
 
             // Update new base fee, reset bought gas, and update block number.

packages/contracts-bedrock/contracts/test/ResolvedDelegateProxy.t.sol

+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.15;
+
+import { Test } from "forge-std/Test.sol";
+import { AddressManager } from "../legacy/AddressManager.sol";
+import { ResolvedDelegateProxy } from "../legacy/ResolvedDelegateProxy.sol";
+
+contract ResolvedDelegateProxy_Test is Test {
+    AddressManager internal addressManager;
+    SimpleImplementation internal impl;
+    SimpleImplementation internal proxy;
+
+    function setUp() public {
+        // Set up the address manager.
+        addressManager = new AddressManager();
+        impl = new SimpleImplementation();
+        addressManager.setAddress("SimpleImplementation", address(impl));
+
+        // Set up the proxy.
+        proxy = SimpleImplementation(
+            address(new ResolvedDelegateProxy(addressManager, "SimpleImplementation"))
+        );
+    }
+
+    // Tests that the proxy properly bubbles up returndata when the delegatecall succeeds.
+    function testFuzz_fallback_delegateCallFoo_succeeds(uint256 x) public {
+        vm.expectCall(address(impl), abi.encodeWithSelector(impl.foo.selector, x));
+        assertEq(proxy.foo(x), x);
+    }
+
+    // Tests that the proxy properly bubbles up returndata when the delegatecall reverts.
+    function test_fallback_delegateCallBar_reverts() public {
+        vm.expectRevert("SimpleImplementation: revert");
+        vm.expectCall(address(impl), abi.encodeWithSelector(impl.bar.selector));
+        proxy.bar();
+    }
+
+    // Tests that the proxy fallback reverts as expected if the implementation within the
+    // address manager is not set.
+    function test_fallback_addressManagerNotSet_reverts() public {
+        AddressManager am = new AddressManager();
+        SimpleImplementation p = SimpleImplementation(
+            address(new ResolvedDelegateProxy(am, "SimpleImplementation"))
+        );
+
+        vm.expectRevert("ResolvedDelegateProxy: target address must be initialized");
+        p.foo(0);
+    }
+}
+
+contract SimpleImplementation {
+    function foo(uint256 _x) public pure returns (uint256) {
+        return _x;
+    }
+
+    function bar() public pure {
+        revert("SimpleImplementation: revert");
+    }
+}