Merge pull request #492 from tablelandnetwork/dtb/deploy-amoy

dtbuchholz · web-flow · commit ba094f6e6350 · 2024-04-16T00:07:00.000-07:00
diff --git a/.env.example b/.env.example
@@ -18,8 +18,8 @@ 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
+POLYGON_AMOY_PRIVATE_KEY=0xfixme
+POLYGON_AMOY_API_KEY=fixme
 FILECOIN_CALIBRATION_PRIVATE_KEY=0xfixme
 FILECOIN_CALIBRATION_API_KEY=fixme
 # devnets
@@ -32,7 +32,7 @@ ETHERSCAN_API_KEY=fixme
 OPTIMISM_ETHERSCAN_API_KEY=fixme
 ARBISCAN_API_KEY=fixme
 ARBISCAN_NOVA_API_KEY=fixme
-POLYSCAN_API_KEY=fixme
+OKLINK_API_KEY=fixme
 FILFOX_API_KEY=fixme
 # hardhat
 HARDHAT_DISABLE_AUTO_MINING=false
diff --git a/.openzeppelin/unknown-80002.json b/.openzeppelin/unknown-80002.json
@@ -0,0 +1,173 @@
+{
+  "manifestVersion": "3.2",
+  "proxies": [
+    {
+      "address": "0x170fb206132b693e38adFc8727dCfa303546Cec1",
+      "txHash": "0x43ec0a752d1d222f7d213f27b690348f1ec2ea5cc22248c705ade3b32ebbdf17",
+      "kind": "uups"
+    }
+  ],
+  "impls": {
+    "f81fdad50c4628dce7f1a7ebf243ab81c2f61f18d2d7ff651bb95a932120d900": {
+      "address": "0x3BDC3E46d8de7A2e67A07Ac917382dB6D94577dc",
+      "txHash": "0xdcbf3c92d37b8db713896a96bc5a5c844df375a68ab19680a0d582fd8b183b50",
+      "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:40"
+          },
+          {
+            "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"
+          }
+        },
+        "namespaces": {}
+      }
+    }
+  }
+}
diff --git a/README.md b/README.md
@@ -26,12 +26,12 @@ This is the Tableland Tables EVM contracts and client components.
 | optimism             | 10       | 0xfad44BF5B843dE943a09D4f3E84949A11d3aa3e6 |
 | arbitrum             | 42161    | 0x9aBd75E8640871A5a20d3B4eE6330a04c962aFfd |
 | arbitrum-nova        | 42170    | 0x1A22854c5b1642760a827f20137a67930AE108d2 |
-| matic                | 137      | 0x5c4e6A9e5C1e1BF445A062006faF19EA6c49aFeA |
+| polygon              | 137      | 0x5c4e6A9e5C1e1BF445A062006faF19EA6c49aFeA |
 | filecoin             | 314      | 0x59EF8Bf2d6c102B4c42AEf9189e1a9F0ABfD652d |
 | sepolia              | 11155111 | 0xc50C62498448ACc8dBdE43DA77f8D5D2E2c7597D |
 | optimism-sepolia     | 11155420 | 0x68A2f4423ad3bf5139Db563CF3bC80aA09ed7079 |
 | arbitrum-sepolia     | 421614   | 0x223A74B8323914afDC3ff1e5005564dC17231d6e |
-| maticmum             | 80001    | 0x4b48841d4b32C4650E4ABc117A03FE8B51f38F68 |
+| polygon-amoy         | 80002    | 0x170fb206132b693e38adFc8727dCfa303546Cec1 |
 | filecoin-calibration | 314159   | 0x030BCf3D50cad04c2e57391B12740982A9308621 |
 
 # Development
diff --git a/contracts/utils/TablelandDeployments.sol b/contracts/utils/TablelandDeployments.sol
@@ -30,7 +30,7 @@ library TablelandDeployments {
     address internal constant ARBITRUM_NOVA =
         0x1A22854c5b1642760a827f20137a67930AE108d2;
     // TablelandTables address on Polygon.
-    address internal constant MATIC =
+    address internal constant POLYGON =
         0x5c4e6A9e5C1e1BF445A062006faF19EA6c49aFeA;
     // TablelandTables address on Filecoin.
     address internal constant FILECOIN =
@@ -45,9 +45,9 @@ library TablelandDeployments {
     // TablelandTables address on Arbitrum Sepolia.
     address internal constant ARBITRUM_SEPOLIA =
         0x223A74B8323914afDC3ff1e5005564dC17231d6e;
-    // TablelandTables address on Polygon Mumbai.
-    address internal constant MATICMUM =
-        0x4b48841d4b32C4650E4ABc117A03FE8B51f38F68;
+    // TablelandTables address on Polygon Amoy.
+    address internal constant POLYGON_AMOY =
+        0x170fb206132b693e38adFc8727dCfa303546Cec1;
     // TablelandTables address on Filecoin Calibration.
     address internal constant FILECOIN_CALIBRATION =
         0x030BCf3D50cad04c2e57391B12740982A9308621;
@@ -75,7 +75,7 @@ library TablelandDeployments {
         } else if (block.chainid == 42170) {
             return TablelandTablesImpl(ARBITRUM_NOVA);
         } else if (block.chainid == 137) {
-            return TablelandTablesImpl(MATIC);
+            return TablelandTablesImpl(POLYGON);
         } else if (block.chainid == 314) {
             return TablelandTablesImpl(FILECOIN);
         } else if (block.chainid == 11155111) {
@@ -84,8 +84,8 @@ library TablelandDeployments {
             return TablelandTablesImpl(OPTIMISM_SEPOLIA);
         } else if (block.chainid == 421614) {
             return TablelandTablesImpl(ARBITRUM_SEPOLIA);
-        } else if (block.chainid == 80001) {
-            return TablelandTablesImpl(MATICMUM);
+        } else if (block.chainid == 80002) {
+            return TablelandTablesImpl(POLYGON_AMOY);
         } else if (block.chainid == 314159) {
             return TablelandTablesImpl(FILECOIN_CALIBRATION);
         } else if (block.chainid == 31337) {
@@ -123,7 +123,7 @@ library TablelandDeployments {
             return "https://testnets.tableland.network/api/v1/";
         } else if (block.chainid == 421614) {
             return "https://testnets.tableland.network/api/v1/";
-        } else if (block.chainid == 80001) {
+        } else if (block.chainid == 80002) {
             return "https://testnets.tableland.network/api/v1/";
         } else if (block.chainid == 314159) {
             return "https://testnets.tableland.network/api/v1/";
diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -68,7 +68,7 @@ const config: HardhatUserConfig = {
 
       // polygon
       polygon: process.env.POLYSCAN_API_KEY || "",
-      polygonMumbai: process.env.POLYSCAN_API_KEY || "",
+      polygonAmoy: process.env.OKLINK_API_KEY || "",
     },
     customChains: [
       {
@@ -95,6 +95,15 @@ const config: HardhatUserConfig = {
           browserURL: "https://sepolia.arbiscan.io/",
         },
       },
+      {
+        network: "polygonAmoy",
+        chainId: 80002,
+        urls: {
+          apiURL:
+            "https://www.oklink.com/api/v5/explorer/contract/verify-source-code-plugin/AMOY_TESTNET",
+          browserURL: "https://www.oklink.com/amoy",
+        },
+      },
     ],
   },
   networks: {
@@ -128,7 +137,7 @@ const config: HardhatUserConfig = {
           ? [process.env.ARBITRUM_NOVA_PRIVATE_KEY]
           : [],
     },
-    matic: {
+    polygon: {
       url: `https://polygon-mainnet.g.alchemy.com/v2/${
         process.env.POLYGON_API_KEY ?? ""
       }`,
@@ -174,13 +183,13 @@ const config: HardhatUserConfig = {
           ? [process.env.ARBITRUM_SEPOLIA_PRIVATE_KEY]
           : [],
     },
-    maticmum: {
-      url: `https://polygon-mumbai.g.alchemy.com/v2/${
-        process.env.POLYGON_MUMBAI_API_KEY ?? ""
+    "polygon-amoy": {
+      url: `https://polygon-amoy.g.alchemy.com/v2/${
+        process.env.POLYGON_AMOY_API_KEY ?? ""
       }`,
       accounts:
-        process.env.POLYGON_MUMBAI_PRIVATE_KEY !== undefined
-          ? [process.env.POLYGON_MUMBAI_PRIVATE_KEY]
+        process.env.POLYGON_AMOY_PRIVATE_KEY !== undefined
+          ? [process.env.POLYGON_AMOY_PRIVATE_KEY]
           : [],
     },
     "filecoin-calibration": {
diff --git a/network.ts b/network.ts
@@ -5,13 +5,13 @@ export interface TablelandNetworkConfig {
   optimism: string | number;
   arbitrum: string | number;
   "arbitrum-nova": string | number;
-  matic: string | number;
+  polygon: string | number;
   filecoin: string | number;
   // tableland testnet testnets
   sepolia: string | number;
   "optimism-sepolia": string | number;
   "arbitrum-sepolia": string | number;
-  maticmum: string | number;
+  "polygon-amoy": string | number;
   "filecoin-calibration": string | number;
   // tableland testnet devnets (uncomment when needed for admin)
   // "optimism-sepolia-staging": string | number;
@@ -29,13 +29,13 @@ export const proxies: TablelandNetworkConfig = {
   optimism: "0xfad44BF5B843dE943a09D4f3E84949A11d3aa3e6",
   arbitrum: "0x9aBd75E8640871A5a20d3B4eE6330a04c962aFfd",
   "arbitrum-nova": "0x1A22854c5b1642760a827f20137a67930AE108d2",
-  matic: "0x5c4e6A9e5C1e1BF445A062006faF19EA6c49aFeA",
+  polygon: "0x5c4e6A9e5C1e1BF445A062006faF19EA6c49aFeA",
   filecoin: "0x59EF8Bf2d6c102B4c42AEf9189e1a9F0ABfD652d",
   // testnets
   sepolia: "0xc50C62498448ACc8dBdE43DA77f8D5D2E2c7597D",
   "optimism-sepolia": "0x68A2f4423ad3bf5139Db563CF3bC80aA09ed7079",
   "arbitrum-sepolia": "0x223A74B8323914afDC3ff1e5005564dC17231d6e",
-  maticmum: "0x4b48841d4b32C4650E4ABc117A03FE8B51f38F68",
+  "polygon-amoy": "0x170fb206132b693e38adFc8727dCfa303546Cec1",
   "filecoin-calibration": "0x030BCf3D50cad04c2e57391B12740982A9308621",
   // devnets (uncomment when needed for admin)
   // "optimism-sepolia-staging": "0xinternal",
@@ -55,15 +55,15 @@ export const baseURIs: TablelandNetworkConfig = {
   optimism: "https://tableland.network/api/v1/tables/10/",
   arbitrum: "https://tableland.network/api/v1/tables/42161/",
   "arbitrum-nova": "https://tableland.network/api/v1/tables/42170/",
-  matic: "https://tableland.network/api/v1/tables/137/",
+  polygon: "https://tableland.network/api/v1/tables/137/",
   filecoin: "https://tableland.network/api/v1/tables/314/",
   // testnets
   sepolia: "https://testnets.tableland.network/api/v1/tables/11155111/",
   "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/",
+  "polygon-amoy": "https://testnets.tableland.network/api/v1/tables/80002/",
   "filecoin-calibration":
     "https://testnets.tableland.network/api/v1/tables/314159/",
   // devnets (uncomment when needed for admin)
@@ -86,13 +86,13 @@ export const validatorPollingTimeouts: TablelandNetworkConfig = {
   optimism: 10_000,
   arbitrum: 10_000,
   "arbitrum-nova": 10_000,
-  matic: 15_000,
+  polygon: 15_000,
   filecoin: 210_000,
   // testnets
   sepolia: 40_000,
   "optimism-sepolia": 10_000,
   "arbitrum-sepolia": 10_000,
-  maticmum: 15_000,
+  "polygon-amoy": 15_000,
   "filecoin-calibration": 210_000,
   // devnets (uncomment when needed for admin)
   // "optimism-sepolia-staging": 10_000,
diff --git a/package-lock.json b/package-lock.json
diff --git a/scripts/deploy.ts b/scripts/deploy.ts
diff --git a/scripts/utils.ts b/scripts/utils.ts
