diff --git a/crates/cast/tests/cli/main.rs b/crates/cast/tests/cli/main.rs
index d43a78f1337f..b05ffb902af0 100644
--- a/crates/cast/tests/cli/main.rs
+++ b/crates/cast/tests/cli/main.rs
@@ -1101,43 +1101,32 @@ casttest!(storage_layout, |_prj, cmd| {
     cmd.args([
             "storage",
             "--rpc-url",
-            next_rpc_endpoint(NamedChain::Optimism).as_str(),
+            next_rpc_endpoint(NamedChain::Mainnet).as_str(),
             "--block",
-            "110000000",
+            "21034138",
             "--etherscan-api-key",
-            "JQNGFHINKS1W7Y5FRXU4SPBYF43J3NYK46",
-            "0xB67c152E69217b5aCB85A2e19dF13423351b0E27",
+            next_mainnet_etherscan_api_key().as_str(),
+            "0xDFC14d2Af169B0D36C4EFF567Ada9b2E0CAE044f",
         ])
         .assert_success()
         .stdout_eq(str![[r#"
-| Name                          | Type                                                            | Slot | Offset | Bytes | Value                                             | Hex Value                                                          | Contract                                           |
-|-------------------------------|-----------------------------------------------------------------|------|--------|-------|---------------------------------------------------|--------------------------------------------------------------------|----------------------------------------------------|
-| gov                           | address                                                         | 0    | 0      | 20    | 1352965747418285184211909460723571462248744342032 | 0x000000000000000000000000ecfd15165d994c2766fbe0d6bacdc2e8dedfd210 | contracts/perp/PositionManager.sol:PositionManager |
-| _status                       | uint256                                                         | 1    | 0      | 32    | 1                                                 | 0x0000000000000000000000000000000000000000000000000000000000000001 | contracts/perp/PositionManager.sol:PositionManager |
-| admin                         | address                                                         | 2    | 0      | 20    | 1352965747418285184211909460723571462248744342032 | 0x000000000000000000000000ecfd15165d994c2766fbe0d6bacdc2e8dedfd210 | contracts/perp/PositionManager.sol:PositionManager |
-| feeCalculator                 | address                                                         | 3    | 0      | 20    | 1297482016264593221714872710065075000476194625473 | 0x000000000000000000000000e3451b170806aab3e24b5cd03a331c1ccdb4d7c1 | contracts/perp/PositionManager.sol:PositionManager |
-| oracle                        | address                                                         | 4    | 0      | 20    | 241116142622541106669066767052022920958068430970  | 0x0000000000000000000000002a3c0592dcb58accd346ccee2bb46e3fb744987a | contracts/perp/PositionManager.sol:PositionManager |
-| referralStorage               | address                                                         | 5    | 0      | 20    | 0                                                 | 0x0000000000000000000000000000000000000000000000000000000000000000 | contracts/perp/PositionManager.sol:PositionManager |
-| minExecutionFee               | uint256                                                         | 6    | 0      | 32    | 20000                                             | 0x0000000000000000000000000000000000000000000000000000000000004e20 | contracts/perp/PositionManager.sol:PositionManager |
-| minBlockDelayKeeper           | uint256                                                         | 7    | 0      | 32    | 0                                                 | 0x0000000000000000000000000000000000000000000000000000000000000000 | contracts/perp/PositionManager.sol:PositionManager |
-| minTimeExecuteDelayPublic     | uint256                                                         | 8    | 0      | 32    | 180                                               | 0x00000000000000000000000000000000000000000000000000000000000000b4 | contracts/perp/PositionManager.sol:PositionManager |
-| minTimeCancelDelayPublic      | uint256                                                         | 9    | 0      | 32    | 180                                               | 0x00000000000000000000000000000000000000000000000000000000000000b4 | contracts/perp/PositionManager.sol:PositionManager |
-| maxTimeDelay                  | uint256                                                         | 10   | 0      | 32    | 1800                                              | 0x0000000000000000000000000000000000000000000000000000000000000708 | contracts/perp/PositionManager.sol:PositionManager |
-| isUserExecuteEnabled          | bool                                                            | 11   | 0      | 1     | 1                                                 | 0x0000000000000000000000000000000000000000000000000000000000000001 | contracts/perp/PositionManager.sol:PositionManager |
-| isUserCancelEnabled           | bool                                                            | 11   | 1      | 1     | 1                                                 | 0x0000000000000000000000000000000000000000000000000000000000000001 | contracts/perp/PositionManager.sol:PositionManager |
-| allowPublicKeeper             | bool                                                            | 11   | 2      | 1     | 0                                                 | 0x0000000000000000000000000000000000000000000000000000000000000000 | contracts/perp/PositionManager.sol:PositionManager |
-| allowUserCloseOnly            | bool                                                            | 11   | 3      | 1     | 1                                                 | 0x0000000000000000000000000000000000000000000000000000000000000001 | contracts/perp/PositionManager.sol:PositionManager |
-| openPositionRequestKeys       | bytes32[]                                                       | 12   | 0      | 32    | 9287                                              | 0x0000000000000000000000000000000000000000000000000000000000002447 | contracts/perp/PositionManager.sol:PositionManager |
-| closePositionRequestKeys      | bytes32[]                                                       | 13   | 0      | 32    | 5782                                              | 0x0000000000000000000000000000000000000000000000000000000000001696 | contracts/perp/PositionManager.sol:PositionManager |
-| openPositionRequestKeysStart  | uint256                                                         | 14   | 0      | 32    | 9287                                              | 0x0000000000000000000000000000000000000000000000000000000000002447 | contracts/perp/PositionManager.sol:PositionManager |
-| closePositionRequestKeysStart | uint256                                                         | 15   | 0      | 32    | 5782                                              | 0x0000000000000000000000000000000000000000000000000000000000001696 | contracts/perp/PositionManager.sol:PositionManager |
-| isPositionKeeper              | mapping(address => bool)                                        | 16   | 0      | 32    | 0                                                 | 0x0000000000000000000000000000000000000000000000000000000000000000 | contracts/perp/PositionManager.sol:PositionManager |
-| openPositionsIndex            | mapping(address => uint256)                                     | 17   | 0      | 32    | 0                                                 | 0x0000000000000000000000000000000000000000000000000000000000000000 | contracts/perp/PositionManager.sol:PositionManager |
-| openPositionRequests          | mapping(bytes32 => struct PositionManager.OpenPositionRequest)  | 18   | 0      | 32    | 0                                                 | 0x0000000000000000000000000000000000000000000000000000000000000000 | contracts/perp/PositionManager.sol:PositionManager |
-| closePositionsIndex           | mapping(address => uint256)                                     | 19   | 0      | 32    | 0                                                 | 0x0000000000000000000000000000000000000000000000000000000000000000 | contracts/perp/PositionManager.sol:PositionManager |
-| closePositionRequests         | mapping(bytes32 => struct PositionManager.ClosePositionRequest) | 20   | 0      | 32    | 0                                                 | 0x0000000000000000000000000000000000000000000000000000000000000000 | contracts/perp/PositionManager.sol:PositionManager |
-| managers                      | mapping(address => bool)                                        | 21   | 0      | 32    | 0                                                 | 0x0000000000000000000000000000000000000000000000000000000000000000 | contracts/perp/PositionManager.sol:PositionManager |
-| approvedManagers              | mapping(address => mapping(address => bool))                    | 22   | 0      | 32    | 0                                                 | 0x0000000000000000000000000000000000000000000000000000000000000000 | contracts/perp/PositionManager.sol:PositionManager |
+| Name                 | Type                                            | Slot | Offset | Bytes | Value                                                                         | Hex Value                                                          | Contract                   |
+|----------------------|-------------------------------------------------|------|--------|-------|-------------------------------------------------------------------------------|--------------------------------------------------------------------|----------------------------|
+| totalSupply          | uint256                                         | 0    | 0      | 32    | 83830546793748974270                                                          | 0x0000000000000000000000000000000000000000000000048b61ee27d82b4abe | Contract.sol:UniswapV2Pair |
+| balanceOf            | mapping(address => uint256)                     | 1    | 0      | 32    | 0                                                                             | 0x0000000000000000000000000000000000000000000000000000000000000000 | Contract.sol:UniswapV2Pair |
+| allowance            | mapping(address => mapping(address => uint256)) | 2    | 0      | 32    | 0                                                                             | 0x0000000000000000000000000000000000000000000000000000000000000000 | Contract.sol:UniswapV2Pair |
+| DOMAIN_SEPARATOR     | bytes32                                         | 3    | 0      | 32    | 24431994160268227242244579702667263358646685984554335916871124115813463999896 | 0x360404c620d5b15ee1a03cb4e9f05d590792c37ed3507630d41f92379543c598 | Contract.sol:UniswapV2Pair |
+| nonces               | mapping(address => uint256)                     | 4    | 0      | 32    | 0                                                                             | 0x0000000000000000000000000000000000000000000000000000000000000000 | Contract.sol:UniswapV2Pair |
+| factory              | address                                         | 5    | 0      | 20    | 527585359103765554095092340981710322784165800559                              | 0x0000000000000000000000005c69bee701ef814a2b6a3edd4b1652cb9cc5aa6f | Contract.sol:UniswapV2Pair |
+| token0               | address                                         | 6    | 0      | 20    | 729466174051048026939049150500379070045048658665                              | 0x0000000000000000000000007fc66500c84a76ad7e9c93437bfc5ac33e2ddae9 | Contract.sol:UniswapV2Pair |
+| token1               | address                                         | 7    | 0      | 20    | 1097077688018008265106216665536940668749033598146                             | 0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2 | Contract.sol:UniswapV2Pair |
+| reserve0             | uint112                                         | 8    | 0      | 14    | 515972123710487818030                                                         | 0x00000000000000000000000000000000000000000000001bf88d38c6f7886f2e | Contract.sol:UniswapV2Pair |
+| reserve1             | uint112                                         | 8    | 14     | 14    | 30456796612309404662                                                          | 0x000000000000000000000000000000000000000000000001a6ac4726e105cbf6 | Contract.sol:UniswapV2Pair |
+| blockTimestampLast   | uint32                                          | 8    | 28     | 4     | 1729755515                                                                    | 0x000000000000000000000000000000000000000000000000000000006719f97b | Contract.sol:UniswapV2Pair |
+| price0CumulativeLast | uint256                                         | 9    | 0      | 32    | 47654595694858616179069266331692577979700                                     | 0x0000000000000000000000000000008c0b55489c9999a37760e1a89ea85dfd34 | Contract.sol:UniswapV2Pair |
+| price1CumulativeLast | uint256                                         | 10   | 0      | 32    | 12725880763600919027073537003654151331110141                                  | 0x00000000000000000000000000009216009b21ce1c5df64e8dba22bdd76fdcfd | Contract.sol:UniswapV2Pair |
+| kLast                | uint256                                         | 11   | 0      | 32    | 0                                                                             | 0x0000000000000000000000000000000000000000000000000000000000000000 | Contract.sol:UniswapV2Pair |
+| unlocked             | uint256                                         | 12   | 0      | 32    | 1                                                                             | 0x0000000000000000000000000000000000000000000000000000000000000001 | Contract.sol:UniswapV2Pair |
 
 "#]]);
 });