Merge pull request #482 from tablelandnetwork/joe/depre-goerli

replace goerli chains with sepolia
tablelandnetwork · Mar 6, 2024 · 26f8133 · 26f8133
2 parents 4387b48 + 656c380
commit 26f8133
Show file tree

Hide file tree

Showing 6 changed files with 225 additions and 33 deletions.
diff --git a/.env.example b/.env.example
@@ -14,17 +14,17 @@ FILECOIN_API_KEY=fixme
 # testnets
 ETHEREUM_SEPOLIA_PRIVATE_KEY=0xfixme
 ETHEREUM_SEPOLIA_API_KEY=fixme
-OPTIMISM_GOERLI_PRIVATE_KEY=0xfixme
-OPTIMISM_GOERLI_API_KEY=fixme
+OPTIMISM_SEPOLIA_PRIVATE_KEY=0xfixme
+OPTIMISM_SEPOLIA_API_KEY=fixme
 ARBITRUM_SEPOLIA_PRIVATE_KEY=0xfixme
 ARBITRUM_SEPOLIA_API_KEY=fixme
 POLYGON_MUMBAI_PRIVATE_KEY=0xfixme
 POLYGON_MUMBAI_API_KEY=fixme
 FILECOIN_CALIBRATION_PRIVATE_KEY=0xfixme
 FILECOIN_CALIBRATION_API_KEY=fixme
 # devnets
-OPTIMISM_GOERLI_STAGING_PRIVATE_KEY=0xfixme
-OPTIMISM_GOERLI_STAGING_API_KEY=fixme
+OPTIMISM_SEPOLIA_STAGING_PRIVATE_KEY=0xfixme
+OPTIMISM_SEPOLIA_STAGING_API_KEY=fixme
 # gas reporting
 REPORT_GAS=false
 # contract verification

diff --git a/.openzeppelin/unknown-11155420.json b/.openzeppelin/unknown-11155420.json
@@ -0,0 +1,177 @@
+{
+  "manifestVersion": "3.2",
+  "proxies": [
+    {
+      "address": "0xd39a346e8299F4e3685f3D44215e0c9328e73439",
+      "txHash": "0x467b507ec9e71feea80d0c8b5e46a122ef1945eeaaa8cd3d9dbaa1ad692405e1",
+      "kind": "uups"
+    },
+    {
+      "address": "0x68A2f4423ad3bf5139Db563CF3bC80aA09ed7079",
+      "txHash": "0xcd948dc5947c8fcda70ba7cbcdbdb0236db2f007b680f2eb5d3fe7c4c43a23fc",
+      "kind": "uups"
+    }
+  ],
+  "impls": {
+    "f81fdad50c4628dce7f1a7ebf243ab81c2f61f18d2d7ff651bb95a932120d900": {
+      "address": "0xE63FE02b180c4158Bd215E6A0b197ADe334E7007",
+      "txHash": "0xc90b975c1b354a0eb12856fee013edf8806ef5dcf20458272e00586b9d784aea",
+      "layout": {
+        "solcVersion": "0.8.19",
+        "storage": [
+          {
+            "label": "_initialized",
+            "offset": 0,
+            "slot": "0",
+            "type": "t_uint8",
+            "contract": "Initializable",
+            "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:63",
+            "retypedFrom": "bool"
+          },
+          {
+            "label": "_initializing",
+            "offset": 1,
+            "slot": "0",
+            "type": "t_bool",
+            "contract": "Initializable",
+            "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:68"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "1",
+            "type": "t_array(t_uint256)50_storage",
+            "contract": "ContextUpgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36"
+          },
+          {
+            "label": "_owner",
+            "offset": 0,
+            "slot": "51",
+            "type": "t_address",
+            "contract": "OwnableUpgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:22"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "52",
+            "type": "t_array(t_uint256)49_storage",
+            "contract": "OwnableUpgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:94"
+          },
+          {
+            "label": "_paused",
+            "offset": 0,
+            "slot": "101",
+            "type": "t_bool",
+            "contract": "PausableUpgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol:29"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "102",
+            "type": "t_array(t_uint256)49_storage",
+            "contract": "PausableUpgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol:116"
+          },
+          {
+            "label": "_status",
+            "offset": 0,
+            "slot": "151",
+            "type": "t_uint256",
+            "contract": "ReentrancyGuardUpgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:38"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "152",
+            "type": "t_array(t_uint256)49_storage",
+            "contract": "ReentrancyGuardUpgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:88"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "201",
+            "type": "t_array(t_uint256)50_storage",
+            "contract": "ERC1967UpgradeUpgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:169"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "251",
+            "type": "t_array(t_uint256)50_storage",
+            "contract": "UUPSUpgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:111"
+          },
+          {
+            "label": "_baseURIString",
+            "offset": 0,
+            "slot": "301",
+            "type": "t_string_storage",
+            "contract": "TablelandTables",
+            "src": "contracts/TablelandTables.sol:27"
+          },
+          {
+            "label": "_controllers",
+            "offset": 0,
+            "slot": "302",
+            "type": "t_mapping(t_uint256,t_address)",
+            "contract": "TablelandTables",
+            "src": "contracts/TablelandTables.sol:29"
+          },
+          {
+            "label": "_locks",
+            "offset": 0,
+            "slot": "303",
+            "type": "t_mapping(t_uint256,t_bool)",
+            "contract": "TablelandTables",
+            "src": "contracts/TablelandTables.sol:31"
+          }
+        ],
+        "types": {
+          "t_address": {
+            "label": "address",
+            "numberOfBytes": "20"
+          },
+          "t_array(t_uint256)49_storage": {
+            "label": "uint256[49]",
+            "numberOfBytes": "1568"
+          },
+          "t_array(t_uint256)50_storage": {
+            "label": "uint256[50]",
+            "numberOfBytes": "1600"
+          },
+          "t_bool": {
+            "label": "bool",
+            "numberOfBytes": "1"
+          },
+          "t_mapping(t_uint256,t_address)": {
+            "label": "mapping(uint256 => address)",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_uint256,t_bool)": {
+            "label": "mapping(uint256 => bool)",
+            "numberOfBytes": "32"
+          },
+          "t_string_storage": {
+            "label": "string",
+            "numberOfBytes": "32"
+          },
+          "t_uint256": {
+            "label": "uint256",
+            "numberOfBytes": "32"
+          },
+          "t_uint8": {
+            "label": "uint8",
+            "numberOfBytes": "1"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ This is the Tableland Tables EVM contracts and client components.
 | matic                | 137      | 0x5c4e6A9e5C1e1BF445A062006faF19EA6c49aFeA |
 | filecoin             | 314      | 0x59EF8Bf2d6c102B4c42AEf9189e1a9F0ABfD652d |
 | sepolia              | 11155111 | 0xc50C62498448ACc8dBdE43DA77f8D5D2E2c7597D |
-| optimism-goerli      | 420      | 0xC72E8a7Be04f2469f8C2dB3F1BdF69A7D516aBbA |
+| optimism-sepolia     | 11155420 | 0x68A2f4423ad3bf5139Db563CF3bC80aA09ed7079 |
 | arbitrum-sepolia     | 421614   | 0x223A74B8323914afDC3ff1e5005564dC17231d6e |
 | maticmum             | 80001    | 0x4b48841d4b32C4650E4ABc117A03FE8B51f38F68 |
 | filecoin-calibration | 314159   | 0x030BCf3D50cad04c2e57391B12740982A9308621 |

diff --git a/contracts/utils/TablelandDeployments.sol b/contracts/utils/TablelandDeployments.sol
@@ -39,9 +39,9 @@ library TablelandDeployments {
     // TablelandTables address on Ethereum Sepolia.
     address internal constant SEPOLIA =
         0xc50C62498448ACc8dBdE43DA77f8D5D2E2c7597D;
-    // TablelandTables address on Optimism Goerli.
-    address internal constant OPTIMISM_GOERLI =
-        0xC72E8a7Be04f2469f8C2dB3F1BdF69A7D516aBbA;
+    // TablelandTables address on Optimism Sepolia.
+    address internal constant OPTIMISM_SEPOLIA =
+        0x68A2f4423ad3bf5139Db563CF3bC80aA09ed7079;
     // TablelandTables address on Arbitrum Sepolia.
     address internal constant ARBITRUM_SEPOLIA =
         0x223A74B8323914afDC3ff1e5005564dC17231d6e;
@@ -80,8 +80,8 @@ library TablelandDeployments {
             return TablelandTablesImpl(FILECOIN);
         } else if (block.chainid == 11155111) {
             return TablelandTablesImpl(SEPOLIA);
-        } else if (block.chainid == 420) {
-            return TablelandTablesImpl(OPTIMISM_GOERLI);
+        } else if (block.chainid == 11155420) {
+            return TablelandTablesImpl(OPTIMISM_SEPOLIA);
         } else if (block.chainid == 421614) {
             return TablelandTablesImpl(ARBITRUM_SEPOLIA);
         } else if (block.chainid == 80001) {
@@ -119,9 +119,9 @@ library TablelandDeployments {
             return "https://tableland.network/api/v1/";
         } else if (block.chainid == 11155111) {
             return "https://testnets.tableland.network/api/v1/";
-        } else if (block.chainid == 420) {
+        } else if (block.chainid == 11155420) {
             return "https://testnets.tableland.network/api/v1/";
-        } else if (block.chainid == 421613) {
+        } else if (block.chainid == 421614) {
             return "https://testnets.tableland.network/api/v1/";
         } else if (block.chainid == 80001) {
             return "https://testnets.tableland.network/api/v1/";

diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -59,7 +59,7 @@ const config: HardhatUserConfig = {
 
       // optimism
       optimisticEthereum: process.env.OPTIMISM_ETHERSCAN_API_KEY || "",
-      optimisticGoerli: process.env.OPTIMISM_ETHERSCAN_API_KEY || "",
+      optimisticSepolia: process.env.OPTIMISM_ETHERSCAN_API_KEY || "",
 
       // arbitrum
       arbitrumOne: process.env.ARBISCAN_API_KEY || "",
@@ -71,6 +71,14 @@ const config: HardhatUserConfig = {
       polygonMumbai: process.env.POLYSCAN_API_KEY || "",
     },
     customChains: [
+      {
+        network: "optimisticSepolia",
+        chainId: 11155420,
+        urls: {
+          apiURL: "https://api-sepolia-optimistic.etherscan.io/api",
+          browserURL: "https://sepolia-optimism.etherscan.io/",
+        },
+      },
       {
         network: "arbitrumNova",
         chainId: 42170,
@@ -148,13 +156,13 @@ const config: HardhatUserConfig = {
           ? [process.env.ETHEREUM_SEPOLIA_PRIVATE_KEY]
           : [],
     },
-    "optimism-goerli": {
-      url: `https://opt-goerli.g.alchemy.com/v2/${
-        process.env.OPTIMISM_GOERLI_API_KEY ?? ""
+    "optimism-sepolia": {
+      url: `https://opt-sepolia.g.alchemy.com/v2/${
+        process.env.OPTIMISM_SEPOLIA_API_KEY ?? ""
       }`,
       accounts:
-        process.env.OPTIMISM_GOERLI_PRIVATE_KEY !== undefined
-          ? [process.env.OPTIMISM_GOERLI_PRIVATE_KEY]
+        process.env.OPTIMISM_SEPOLIA_PRIVATE_KEY !== undefined
+          ? [process.env.OPTIMISM_SEPOLIA_PRIVATE_KEY]
           : [],
     },
     "arbitrum-sepolia": {
@@ -185,13 +193,13 @@ const config: HardhatUserConfig = {
           : [],
     },
     // devnets
-    "optimism-goerli-staging": {
-      url: `https://opt-goerli.g.alchemy.com/v2/${
-        process.env.OPTIMISM_GOERLI_STAGING_API_KEY ?? ""
+    "optimism-sepolia-staging": {
+      url: `https://opt-sepolia.g.alchemy.com/v2/${
+        process.env.OPTIMISM_SEPOLIA_STAGING_API_KEY ?? ""
       }`,
       accounts:
-        process.env.OPTIMISM_GOERLI_STAGING_PRIVATE_KEY !== undefined
-          ? [process.env.OPTIMISM_GOERLI_STAGING_PRIVATE_KEY]
+        process.env.OPTIMISM_SEPOLIA_STAGING_PRIVATE_KEY !== undefined
+          ? [process.env.OPTIMISM_SEPOLIA_STAGING_PRIVATE_KEY]
           : [],
     },
     hardhat: {

diff --git a/network.ts b/network.ts
@@ -9,12 +9,12 @@ export interface TablelandNetworkConfig {
   filecoin: string | number;
   // tableland testnet testnets
   sepolia: string | number;
-  "optimism-goerli": string | number;
+  "optimism-sepolia": string | number;
   "arbitrum-sepolia": string | number;
   maticmum: string | number;
   "filecoin-calibration": string | number;
-  // tableland staging testnets
-  "optimism-goerli-staging": string | number;
+  // tableland testnet devnets (uncomment when needed for admin)
+  // "optimism-sepolia-staging": string | number;
   // local tableland
   localhost: string | number; // hardhat
   "local-tableland": string | number; // hardhat backed by a local validator
@@ -23,19 +23,22 @@ export interface TablelandNetworkConfig {
 const homesteadAddr = "0x012969f7e3439a9B04025b5a049EB9BAD82A8C12";
 
 export const proxies: TablelandNetworkConfig = {
+  // mainnets
   mainnet: homesteadAddr,
   homestead: homesteadAddr,
   optimism: "0xfad44BF5B843dE943a09D4f3E84949A11d3aa3e6",
   arbitrum: "0x9aBd75E8640871A5a20d3B4eE6330a04c962aFfd",
   "arbitrum-nova": "0x1A22854c5b1642760a827f20137a67930AE108d2",
   matic: "0x5c4e6A9e5C1e1BF445A062006faF19EA6c49aFeA",
   filecoin: "0x59EF8Bf2d6c102B4c42AEf9189e1a9F0ABfD652d",
+  // testnets
   sepolia: "0xc50C62498448ACc8dBdE43DA77f8D5D2E2c7597D",
-  "optimism-goerli": "0xC72E8a7Be04f2469f8C2dB3F1BdF69A7D516aBbA",
+  "optimism-sepolia": "0x68A2f4423ad3bf5139Db563CF3bC80aA09ed7079",
   "arbitrum-sepolia": "0x223A74B8323914afDC3ff1e5005564dC17231d6e",
   maticmum: "0x4b48841d4b32C4650E4ABc117A03FE8B51f38F68",
   "filecoin-calibration": "0x030BCf3D50cad04c2e57391B12740982A9308621",
-  "optimism-goerli-staging": "0xfe79824f6E5894a3DD86908e637B7B4AF57eEE28",
+  // devnets (uncomment when needed for admin)
+  // "optimism-sepolia-staging": "0xinternal",
   // localhost is a stand alone node
   localhost: "",
   // local-tableland implies that a validator is also running. the proxy address will always be
@@ -56,14 +59,17 @@ export const baseURIs: TablelandNetworkConfig = {
   filecoin: "https://tableland.network/api/v1/tables/314/",
   // testnets
   sepolia: "https://testnets.tableland.network/api/v1/tables/11155111/",
-  "optimism-goerli": "https://testnets.tableland.network/api/v1/tables/420/",
+  "optimism-sepolia":
+    "https://testnets.tableland.network/api/v1/tables/11155420/",
   "arbitrum-sepolia":
     "https://testnets.tableland.network/api/v1/tables/421614/",
   maticmum: "https://testnets.tableland.network/api/v1/tables/80001/",
   "filecoin-calibration":
     "https://testnets.tableland.network/api/v1/tables/314159/",
-  "optimism-goerli-staging":
-    "https://staging.tableland.network/api/v1/tables/420/",
+  // devnets (uncomment when needed for admin)
+  // "optimism-sepolia-staging":
+  //   "https://testnets.tableland.network/api/v1/tables/11155420/",
+  // local
   localhost: localTablelandURI,
   "local-tableland": localTablelandURI,
 };
@@ -84,11 +90,12 @@ export const validatorPollingTimeouts: TablelandNetworkConfig = {
   filecoin: 210_000,
   // testnets
   sepolia: 40_000,
-  "optimism-goerli": 10_000,
+  "optimism-sepolia": 10_000,
   "arbitrum-sepolia": 10_000,
   maticmum: 15_000,
   "filecoin-calibration": 210_000,
-  "optimism-goerli-staging": 10_000,
+  // devnets (uncomment when needed for admin)
+  // "optimism-sepolia-staging": 10_000,
   // local
   localhost: 5_000,
   "local-tableland": 5_000,