Add storage layout assertion for proxies

contracts/hardhat.config.js

@@ -235,6 +235,11 @@ module.exports = {
     mainnet: {
       url: `${process.env.PROVIDER_URL}`,
       accounts: defaultAccounts,
+      verify: {
+        etherscan: {
+          apiKey: process.env.ETHERSCAN_API_KEY,
+        },
+      },
     },
     holesky: {
       url: holeskyProviderUrl,
@@ -252,6 +257,12 @@ module.exports = {
       // Fails if gas limit is anything less than 20M on Arbitrum One
       gas: 20000000,
       // initialBaseFeePerGas: 0,
+      verify: {
+        etherscan: {
+          apiKey: process.env.ARBISCAN_API_KEY,
+          apiUrl: "https://api.arbiscan.io",
+        },
+      },
     },
     base: {
       url: baseProviderUrl,
@@ -260,6 +271,12 @@ module.exports = {
       tags: ["base"],
       live: true,
       saveDeployments: true,
+      verify: {
+        etherscan: {
+          apiKey: process.env.BASESCAN_API_KEY,
+          apiUrl: "https://api.basescan.org",
+        },
+      },
     },
     sonic: {
       url: sonicProviderUrl,
@@ -268,6 +285,12 @@ module.exports = {
       tags: ["sonic"],
       live: true,
       saveDeployments: true,
+      verify: {
+        etherscan: {
+          apiKey: process.env.SONICSCAN_API_KEY,
+          apiUrl: "https://api.sonicscan.org",
+        },
+      },
     },
     plume: {
       url: plumeProviderUrl,
@@ -276,6 +299,12 @@ module.exports = {
       tags: ["plume"],
       live: true,
       saveDeployments: true,
+      verify: {
+        etherscan: {
+          apiKey: "",
+          apiUrl: "https://explorer.plume.org",
+        },
+      },
     },
   },
   mocha: {
@@ -385,50 +414,6 @@ module.exports = {
     alphaSort: true,
     runOnCompile: process.env.CONTRACT_SIZE ? true : false,
   },
-  etherscan: {
-    apiKey: {
-      mainnet: process.env.ETHERSCAN_API_KEY,
-      arbitrumOne: process.env.ARBISCAN_API_KEY,
-      holesky: process.env.ETHERSCAN_API_KEY,
-      base: process.env.BASESCAN_API_KEY,
-      sonic: process.env.SONICSCAN_API_KEY,
-      plume: "empty", // this works for: npx hardhat verify...
-    },
-    customChains: [
-      {
-        network: "holesky",
-        chainId: 17000,
-        urls: {
-          apiURL: "https://api-holesky.etherscan.io/api",
-          browserURL: "https://holesky.etherscan.io",
-        },
-      },
-      {
-        network: "base",
-        chainId: 8453,
-        urls: {
-          apiURL: "https://api.basescan.org/api",
-          browserURL: "https://basescan.org",
-        },
-      },
-      {
-        network: "sonic",
-        chainId: 146,
-        urls: {
-          apiURL: "https://api.sonicscan.org/api",
-          browserURL: "https://sonicscan.org",
-        },
-      },
-      {
-        network: "plume",
-        chainId: 98866,
-        urls: {
-          apiURL: "https://explorer.plume.org/api",
-          browserURL: "https://explorer.plume.org",
-        },
-      },
-    ],
-  },
   gasReporter: {
     enabled: process.env.REPORT_GAS ? true : false,
   },

contracts/storageLayout/arbitrumOne/BridgedWOETHProxy-impl.json

@@ -0,0 +1,187 @@
+{
+  "solcVersion": "0.8.28",
+  "storage": [
+    {
+      "label": "_roles",
+      "offset": 0,
+      "slot": "0",
+      "type": "t_mapping(t_bytes32,t_struct(RoleData)5668_storage)",
+      "contract": "AccessControl",
+      "src": "@openzeppelin/contracts/access/AccessControl.sol:55"
+    },
+    {
+      "label": "_roleMembers",
+      "offset": 0,
+      "slot": "1",
+      "type": "t_mapping(t_bytes32,t_struct(AddressSet)8931_storage)",
+      "contract": "AccessControlEnumerable",
+      "src": "@openzeppelin/contracts/access/AccessControlEnumerable.sol:16"
+    },
+    {
+      "label": "initialized",
+      "offset": 0,
+      "slot": "2",
+      "type": "t_bool",
+      "contract": "Initializable",
+      "src": "contracts/utils/Initializable.sol:12"
+    },
+    {
+      "label": "initializing",
+      "offset": 1,
+      "slot": "2",
+      "type": "t_bool",
+      "contract": "Initializable",
+      "src": "contracts/utils/Initializable.sol:17"
+    },
+    {
+      "label": "______gap",
+      "offset": 0,
+      "slot": "3",
+      "type": "t_array(t_uint256)50_storage",
+      "contract": "Initializable",
+      "src": "contracts/utils/Initializable.sol:41"
+    },
+    {
+      "label": "_balances",
+      "offset": 0,
+      "slot": "53",
+      "type": "t_mapping(t_address,t_uint256)",
+      "contract": "ERC20",
+      "src": "@openzeppelin/contracts/token/ERC20/ERC20.sol:36"
+    },
+    {
+      "label": "_allowances",
+      "offset": 0,
+      "slot": "54",
+      "type": "t_mapping(t_address,t_mapping(t_address,t_uint256))",
+      "contract": "ERC20",
+      "src": "@openzeppelin/contracts/token/ERC20/ERC20.sol:38"
+    },
+    {
+      "label": "_totalSupply",
+      "offset": 0,
+      "slot": "55",
+      "type": "t_uint256",
+      "contract": "ERC20",
+      "src": "@openzeppelin/contracts/token/ERC20/ERC20.sol:40"
+    },
+    {
+      "label": "_name",
+      "offset": 0,
+      "slot": "56",
+      "type": "t_string_storage",
+      "contract": "ERC20",
+      "src": "@openzeppelin/contracts/token/ERC20/ERC20.sol:42"
+    },
+    {
+      "label": "_symbol",
+      "offset": 0,
+      "slot": "57",
+      "type": "t_string_storage",
+      "contract": "ERC20",
+      "src": "@openzeppelin/contracts/token/ERC20/ERC20.sol:43"
+    }
+  ],
+  "types": {
+    "t_address": {
+      "label": "address",
+      "numberOfBytes": "20"
+    },
+    "t_array(t_bytes32)dyn_storage": {
+      "label": "bytes32[]",
+      "numberOfBytes": "32"
+    },
+    "t_array(t_uint256)50_storage": {
+      "label": "uint256[50]",
+      "numberOfBytes": "1600"
+    },
+    "t_bool": {
+      "label": "bool",
+      "numberOfBytes": "1"
+    },
+    "t_bytes32": {
+      "label": "bytes32",
+      "numberOfBytes": "32"
+    },
+    "t_mapping(t_address,t_bool)": {
+      "label": "mapping(address => bool)",
+      "numberOfBytes": "32"
+    },
+    "t_mapping(t_address,t_mapping(t_address,t_uint256))": {
+      "label": "mapping(address => mapping(address => uint256))",
+      "numberOfBytes": "32"
+    },
+    "t_mapping(t_address,t_uint256)": {
+      "label": "mapping(address => uint256)",
+      "numberOfBytes": "32"
+    },
+    "t_mapping(t_bytes32,t_struct(AddressSet)8931_storage)": {
+      "label": "mapping(bytes32 => struct EnumerableSet.AddressSet)",
+      "numberOfBytes": "32"
+    },
+    "t_mapping(t_bytes32,t_struct(RoleData)5668_storage)": {
+      "label": "mapping(bytes32 => struct AccessControl.RoleData)",
+      "numberOfBytes": "32"
+    },
+    "t_mapping(t_bytes32,t_uint256)": {
+      "label": "mapping(bytes32 => uint256)",
+      "numberOfBytes": "32"
+    },
+    "t_string_storage": {
+      "label": "string",
+      "numberOfBytes": "32"
+    },
+    "t_struct(AddressSet)8931_storage": {
+      "label": "struct EnumerableSet.AddressSet",
+      "members": [
+        {
+          "label": "_inner",
+          "type": "t_struct(Set)8630_storage",
+          "offset": 0,
+          "slot": "0"
+        }
+      ],
+      "numberOfBytes": "64"
+    },
+    "t_struct(RoleData)5668_storage": {
+      "label": "struct AccessControl.RoleData",
+      "members": [
+        {
+          "label": "members",
+          "type": "t_mapping(t_address,t_bool)",
+          "offset": 0,
+          "slot": "0"
+        },
+        {
+          "label": "adminRole",
+          "type": "t_bytes32",
+          "offset": 0,
+          "slot": "1"
+        }
+      ],
+      "numberOfBytes": "64"
+    },
+    "t_struct(Set)8630_storage": {
+      "label": "struct EnumerableSet.Set",
+      "members": [
+        {
+          "label": "_values",
+          "type": "t_array(t_bytes32)dyn_storage",
+          "offset": 0,
+          "slot": "0"
+        },
+        {
+          "label": "_indexes",
+          "type": "t_mapping(t_bytes32,t_uint256)",
+          "offset": 0,
+          "slot": "1"
+        }
+      ],
+      "numberOfBytes": "64"
+    },
+    "t_uint256": {
+      "label": "uint256",
+      "numberOfBytes": "32"
+    }
+  }
+}