fix: pre pr

defi-wonderland · Oct 2, 2024 · 619f23c · 619f23c
1 parent 7fcaf6c
commit 619f23c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/packages/contracts-bedrock/.gas-snapshot b/packages/contracts-bedrock/.gas-snapshot
@@ -9,9 +9,9 @@ GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_1() (gas: 2967382
 GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_0() (gas: 564356)
 GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_1() (gas: 4076571)
 GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_0() (gas: 467019)
-GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_1() (gas: 3512723)
+GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_1() (gas: 3512701)
 GasBenchMark_L1StandardBridge_Finalize:test_finalizeETHWithdrawal_benchmark() (gas: 72618)
 GasBenchMark_L2OutputOracle:test_proposeL2Output_benchmark() (gas: 92973)
-GasBenchMark_OptimismPortal:test_depositTransaction_benchmark() (gas: 68357)
-GasBenchMark_OptimismPortal:test_depositTransaction_benchmark_1() (gas: 68921)
+GasBenchMark_OptimismPortal:test_depositTransaction_benchmark() (gas: 68312)
+GasBenchMark_OptimismPortal:test_depositTransaction_benchmark_1() (gas: 68943)
 GasBenchMark_OptimismPortal:test_proveWithdrawalTransaction_benchmark() (gas: 155610)
diff --git a/packages/contracts-bedrock/lib/forge-std b/packages/contracts-bedrock/lib/forge-std
diff --git a/packages/contracts-bedrock/scripts/ops/FeeVaultWithdrawal.s.sol b/packages/contracts-bedrock/scripts/ops/FeeVaultWithdrawal.s.sol
@@ -65,7 +65,7 @@ contract FeeVaultWithdrawal is Script {
     }
 
     /// @notice Logs the information relevant to the user.
-    function log(uint256 _balance, address _recipient, address _vault) internal pure {
+    function log(uint256 _balance, address _recipient, address _vault) internal view {
         string memory logline = string.concat(
             "Withdrawing ", vm.toString(_balance), " to ", vm.toString(_recipient), " from ", vm.toString(_vault)
         );

diff --git a/packages/contracts-bedrock/semver-lock.json b/packages/contracts-bedrock/semver-lock.json
@@ -117,15 +117,15 @@
   },
   "src/L2/OptimismSuperchainERC20.sol": {
     "initCodeHash": "0xc6452d9aef6d76bdc789f3cddac6862658a481c619e6a2e7a74f6d61147f927b",
-    "sourceCodeHash": "0x2502433e4b622e1697ca071f91a95b08fa40fdb03bfd958c44b2033a47df2010"
+    "sourceCodeHash": "0x4463e49c98ceb3327bd768579341d1e0863c8c3925d4b533fbc0f7951306261f"
   },
   "src/L2/OptimismSuperchainERC20Beacon.sol": {
     "initCodeHash": "0x99ce8095b23c124850d866cbc144fee6cee05dbc6bb5d83acadfe00b90cf42c7",
     "sourceCodeHash": "0x5e58b7c867fafa49fe39d68d83875425e9cf94f05f2835bdcdaa08fc8bc6b68e"
   },
   "src/L2/OptimismSuperchainERC20Factory.sol": {
     "initCodeHash": "0x43ec413140b05bfb83ec453b0d4f82b33a2d560bf8c76405d08de17565b87053",
-    "sourceCodeHash": "0x1e8e1262a549ce7e24e19174a998716ceb9a3034296b456914d74b4cb4f40caa"
+    "sourceCodeHash": "0x04a88ee6c4cf68becf8727b53cbc56ab6cfbaac9dbeb61083f63613dbf823a76"
   },
   "src/L2/SequencerFeeVault.sol": {
     "initCodeHash": "0x2e6551705e493bacba8cffe22e564d5c401ae5bb02577a5424e0d32784e13e74",
@@ -136,11 +136,11 @@
     "sourceCodeHash": "0x9bc2e208774eb923894dbe391a5038a6189d7d36c202f4bf3e2c4dd332b0adf0"
   },
   "src/L2/SuperchainERC20Bridge.sol": {
-    "initCodeHash": "0xa21232df1d7239fd20e7eaa320cfc91efc76343c93d833d8060a58b54ac5c8bf",
+    "initCodeHash": "0xea7eb314f96cd2520a58012ff7cc376c82c5a95612187ff6bb96ace4f095ebc4",
     "sourceCodeHash": "0x83188d878ce0b2890a7f7f41d09a8807f94a126e0ea274f0dac8b93f77217d3b"
   },
   "src/L2/SuperchainWETH.sol": {
-    "initCodeHash": "0xf30071df59d85e0e8a552845031aca8d6f0261762e1b4ea1b28ff30379eaa20e",
+    "initCodeHash": "0x5db03c5c4cd6ea9e4b3e74e28f50d04fd3e130af5109b34fa208808fa9ba7742",
     "sourceCodeHash": "0xdafbb056dbc6198ade27a0ee051e9cd1c8f03084beb50821dc93c82d710ef2b4"
   },
   "src/L2/WETH.sol": {
@@ -235,4 +235,4 @@
     "initCodeHash": "0x21b3059e9b13b330f76d02b61f61dcfa3abf3517a0b56afa0895c4b8291740bf",
     "sourceCodeHash": "0xc1ea12a87e3a7ef9c950f0a41a4e35b60d4d9c4c816ff671dbfca663861c16f4"
   }
-}
+}
diff --git a/packages/contracts-bedrock/src/L2/interfaces/ISuperchainWETH.sol b/packages/contracts-bedrock/src/L2/interfaces/ISuperchainWETH.sol
@@ -39,8 +39,6 @@ interface ISuperchainWETH {
     /// @param _dst     Address to relay tokens to.
     /// @param _wad     Amount of tokens to relay.
     function relayERC20(address _from, address _dst, uint256 _wad) external;
-
-    function __constructor__() external;
 }
 
 interface ISuperchainWETHERC20 is IWETH, ISuperchainWETH { }
+1 −1		README.md
+1 −1		package.json
+1 −14		src/StdChains.sol
+3 −3		src/StdCheats.sol
+3 −18		src/StdInvariant.sol
+0 −104		src/StdJson.sol
+1 −1		src/StdStorage.sol
+0 −104		src/StdToml.sol
+60 −290		src/Vm.sol
+608 −635		src/console.sol
+1,555 −1		src/console2.sol
+2 −2		src/interfaces/IERC4626.sol
+5 −1		src/mocks/MockERC721.sol
+4 −693		src/safeconsole.sol
+1 −1		test/StdAssertions.t.sol
+12 −19		test/StdChains.t.sol
+10 −10		test/StdCheats.t.sol
+12 −12		test/StdError.t.sol
+1 −1		test/StdJson.t.sol
+14 −4		test/StdMath.t.sol
+5 −13		test/StdStorage.t.sol
+1 −1		test/StdStyle.t.sol
+1 −1		test/StdToml.t.sol
+12 −12		test/StdUtils.t.sol
+6 −9		test/Vm.t.sol