Merge pull request #3415 from ethereum-optimism/fix/speed-up-snapshot

contracts-bedrock: speed up storage snapshot

packages/contracts-bedrock/.storage-layout

@@ -3,7 +3,7 @@
 =======================
 
 =======================
-➡ L1CrossDomainMessenger
+➡ contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger
 =======================
 
 +------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------+
@@ -47,7 +47,7 @@
 +------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------+
 
 =======================
-➡ L1StandardBridge
+➡ contracts/L1/L1StandardBridge.sol:L1StandardBridge
 =======================
 
 +----------+-------------------------------------------------+------+--------+-------+----------------------------------------------------+
@@ -61,7 +61,7 @@
 +----------+-------------------------------------------------+------+--------+-------+----------------------------------------------------+
 
 =======================
-➡ L2OutputOracle
+➡ contracts/L1/L2OutputOracle.sol:L2OutputOracle
 =======================
 
 +-------------------+-------------------------------------------------+------+--------+-------+------------------------------------------------+
@@ -85,7 +85,7 @@
 +-------------------+-------------------------------------------------+------+--------+-------+------------------------------------------------+
 
 =======================
-➡ OptimismPortal
+➡ contracts/L1/OptimismPortal.sol:OptimismPortal
 =======================
 
 +----------------------+----------------------------------------+------+--------+-------+------------------------------------------------+
@@ -107,7 +107,7 @@
 +----------------------+----------------------------------------+------+--------+-------+------------------------------------------------+
 
 =======================
-➡ DeployerWhitelist
+➡ contracts/legacy/DeployerWhitelist.sol:DeployerWhitelist
 =======================
 
 +-----------+--------------------------+------+--------+-------+----------------------------------------------------------+
@@ -119,7 +119,7 @@
 +-----------+--------------------------+------+--------+-------+----------------------------------------------------------+
 
 =======================
-➡ GasPriceOracle
+➡ contracts/L2/GasPriceOracle.sol:GasPriceOracle
 =======================
 
 +----------+---------+------+--------+-------+------------------------------------------------+
@@ -139,7 +139,7 @@
 +----------+---------+------+--------+-------+------------------------------------------------+
 
 =======================
-➡ L1Block
+➡ contracts/L2/L1Block.sol:L1Block
 =======================
 
 +----------------+---------+------+--------+-------+----------------------------------+
@@ -157,7 +157,7 @@
 +----------------+---------+------+--------+-------+----------------------------------+
 
 =======================
-➡ L1BlockNumber
+➡ contracts/legacy/L1BlockNumber.sol:L1BlockNumber
 =======================
 
 +------+------+------+--------+-------+----------+
@@ -166,7 +166,7 @@
 +------+------+------+--------+-------+----------+
 
 =======================
-➡ L2CrossDomainMessenger
+➡ contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger
 =======================
 
 +------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------+
@@ -210,7 +210,7 @@
 +------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------+
 
 =======================
-➡ L2StandardBridge
+➡ contracts/L2/L2StandardBridge.sol:L2StandardBridge
 =======================
 
 +----------+-------------------------------------------------+------+--------+-------+----------------------------------------------------+
@@ -224,7 +224,7 @@
 +----------+-------------------------------------------------+------+--------+-------+----------------------------------------------------+
 
 =======================
-➡ L2ToL1MessagePasser
+➡ contracts/L2/L2ToL1MessagePasser.sol:L2ToL1MessagePasser
 =======================
 
 +--------------+--------------------------+------+--------+-------+----------------------------------------------------------+
@@ -236,7 +236,7 @@
 +--------------+--------------------------+------+--------+-------+----------------------------------------------------------+
 
 =======================
-➡ LegacyERC20ETH
+➡ contracts/legacy/LegacyERC20ETH.sol:LegacyERC20ETH
 =======================
 
 +--------------+-------------------------------------------------+------+--------+-------+----------------------------------------------------+
@@ -258,7 +258,7 @@
 +--------------+-------------------------------------------------+------+--------+-------+----------------------------------------------------+
 
 =======================
-➡ SequencerFeeVault
+➡ contracts/L2/SequencerFeeVault.sol:SequencerFeeVault
 =======================
 
 +-------------+---------+------+--------+-------+------------------------------------------------------+
@@ -268,7 +268,7 @@
 +-------------+---------+------+--------+-------+------------------------------------------------------+
 
 =======================
-➡ WETH9
+➡ contracts/vendor/WETH9.sol:WETH9
 =======================
 
 +-----------+-------------------------------------------------+------+--------+-------+----------------------------------+
@@ -286,7 +286,7 @@
 +-----------+-------------------------------------------------+------+--------+-------+----------------------------------+
 
 =======================
-➡ ProxyAdmin
+➡ contracts/universal/ProxyAdmin.sol:ProxyAdmin
 =======================
 
 +--------------------+-----------------------------------------------+------+--------+-------+-----------------------------------------------+
@@ -304,7 +304,7 @@
 +--------------------+-----------------------------------------------+------+--------+-------+-----------------------------------------------+
 
 =======================
-➡ Proxy
+➡ contracts/universal/Proxy.sol:Proxy
 =======================
 
 +------+------+------+--------+-------+----------+
@@ -313,7 +313,7 @@
 +------+------+------+--------+-------+----------+
 
 =======================
-➡ L1ChugSplashProxy
+➡ contracts/legacy/L1ChugSplashProxy.sol:L1ChugSplashProxy
 =======================
 
 +------+------+------+--------+-------+----------+
@@ -322,7 +322,7 @@
 +------+------+------+--------+-------+----------+
 
 =======================
-➡ OptimismMintableERC20
+➡ contracts/universal/OptimismMintableERC20.sol:OptimismMintableERC20
 =======================
 
 +--------------+-------------------------------------------------+------+--------+-------+---------------------------------------------------------------------+
@@ -344,7 +344,7 @@
 +--------------+-------------------------------------------------+------+--------+-------+---------------------------------------------------------------------+
 
 =======================
-➡ OptimismMintableERC20Factory
+➡ contracts/universal/OptimismMintableERC20Factory.sol:OptimismMintableERC20Factory
 =======================
 
 +------+------+------+--------+-------+----------+

packages/contracts-bedrock/scripts/storage-snapshot.sh

@@ -10,25 +10,25 @@ then
 fi
 
 contracts=(
-  L1CrossDomainMessenger
-  L1StandardBridge
-  L2OutputOracle
-  OptimismPortal
-  DeployerWhitelist
-  GasPriceOracle
-  L1Block
-  L1BlockNumber
-  L2CrossDomainMessenger
-  L2StandardBridge
-  L2ToL1MessagePasser
-  LegacyERC20ETH
-  SequencerFeeVault
-  WETH9
-  ProxyAdmin
-  Proxy
-  L1ChugSplashProxy
-  OptimismMintableERC20
-  OptimismMintableERC20Factory
+  contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger
+  contracts/L1/L1StandardBridge.sol:L1StandardBridge
+  contracts/L1/L2OutputOracle.sol:L2OutputOracle
+  contracts/L1/OptimismPortal.sol:OptimismPortal
+  contracts/legacy/DeployerWhitelist.sol:DeployerWhitelist
+  contracts/L2/GasPriceOracle.sol:GasPriceOracle
+  contracts/L2/L1Block.sol:L1Block
+  contracts/legacy/L1BlockNumber.sol:L1BlockNumber
+  contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger
+  contracts/L2/L2StandardBridge.sol:L2StandardBridge
+  contracts/L2/L2ToL1MessagePasser.sol:L2ToL1MessagePasser
+  contracts/legacy/LegacyERC20ETH.sol:LegacyERC20ETH
+  contracts/L2/SequencerFeeVault.sol:SequencerFeeVault
+  contracts/vendor/WETH9.sol:WETH9
+  contracts/universal/ProxyAdmin.sol:ProxyAdmin
+  contracts/universal/Proxy.sol:Proxy
+  contracts/legacy/L1ChugSplashProxy.sol:L1ChugSplashProxy
+  contracts/universal/OptimismMintableERC20.sol:OptimismMintableERC20
+  contracts/universal/OptimismMintableERC20Factory.sol:OptimismMintableERC20Factory
 )
 
 dir=$(dirname "$0")