Skip to content

Commit 26f8133

Browse files
sanderpicksanderpick
authored
Merge pull request #482 from tablelandnetwork/joe/depre-goerli
replace goerli chains with sepolia
2 parents 4387b48 + 656c380 commit 26f8133

File tree

6 files changed

+225
-33
lines changed

6 files changed

+225
-33
lines changed

‎.env.example‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ FILECOIN_API_KEY=fixme
1414
# testnets
1515
ETHEREUM_SEPOLIA_PRIVATE_KEY=0xfixme
1616
ETHEREUM_SEPOLIA_API_KEY=fixme
17-
OPTIMISM_GOERLI_PRIVATE_KEY=0xfixme
18-
OPTIMISM_GOERLI_API_KEY=fixme
17+
OPTIMISM_SEPOLIA_PRIVATE_KEY=0xfixme
18+
OPTIMISM_SEPOLIA_API_KEY=fixme
1919
ARBITRUM_SEPOLIA_PRIVATE_KEY=0xfixme
2020
ARBITRUM_SEPOLIA_API_KEY=fixme
2121
POLYGON_MUMBAI_PRIVATE_KEY=0xfixme
2222
POLYGON_MUMBAI_API_KEY=fixme
2323
FILECOIN_CALIBRATION_PRIVATE_KEY=0xfixme
2424
FILECOIN_CALIBRATION_API_KEY=fixme
2525
# devnets
26-
OPTIMISM_GOERLI_STAGING_PRIVATE_KEY=0xfixme
27-
OPTIMISM_GOERLI_STAGING_API_KEY=fixme
26+
OPTIMISM_SEPOLIA_STAGING_PRIVATE_KEY=0xfixme
27+
OPTIMISM_SEPOLIA_STAGING_API_KEY=fixme
2828
# gas reporting
2929
REPORT_GAS=false
3030
# contract verification

‎.openzeppelin/unknown-11155420.json‎

Lines changed: 177 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,177 @@
1+
{
2+
"manifestVersion": "3.2",
3+
"proxies": [
4+
{
5+
"address": "0xd39a346e8299F4e3685f3D44215e0c9328e73439",
6+
"txHash": "0x467b507ec9e71feea80d0c8b5e46a122ef1945eeaaa8cd3d9dbaa1ad692405e1",
7+
"kind": "uups"
8+
},
9+
{
10+
"address": "0x68A2f4423ad3bf5139Db563CF3bC80aA09ed7079",
11+
"txHash": "0xcd948dc5947c8fcda70ba7cbcdbdb0236db2f007b680f2eb5d3fe7c4c43a23fc",
12+
"kind": "uups"
13+
}
14+
],
15+
"impls": {
16+
"f81fdad50c4628dce7f1a7ebf243ab81c2f61f18d2d7ff651bb95a932120d900": {
17+
"address": "0xE63FE02b180c4158Bd215E6A0b197ADe334E7007",
18+
"txHash": "0xc90b975c1b354a0eb12856fee013edf8806ef5dcf20458272e00586b9d784aea",
19+
"layout": {
20+
"solcVersion": "0.8.19",
21+
"storage": [
22+
{
23+
"label": "_initialized",
24+
"offset": 0,
25+
"slot": "0",
26+
"type": "t_uint8",
27+
"contract": "Initializable",
28+
"src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:63",
29+
"retypedFrom": "bool"
30+
},
31+
{
32+
"label": "_initializing",
33+
"offset": 1,
34+
"slot": "0",
35+
"type": "t_bool",
36+
"contract": "Initializable",
37+
"src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:68"
38+
},
39+
{
40+
"label": "__gap",
41+
"offset": 0,
42+
"slot": "1",
43+
"type": "t_array(t_uint256)50_storage",
44+
"contract": "ContextUpgradeable",
45+
"src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36"
46+
},
47+
{
48+
"label": "_owner",
49+
"offset": 0,
50+
"slot": "51",
51+
"type": "t_address",
52+
"contract": "OwnableUpgradeable",
53+
"src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:22"
54+
},
55+
{
56+
"label": "__gap",
57+
"offset": 0,
58+
"slot": "52",
59+
"type": "t_array(t_uint256)49_storage",
60+
"contract": "OwnableUpgradeable",
61+
"src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:94"
62+
},
63+
{
64+
"label": "_paused",
65+
"offset": 0,
66+
"slot": "101",
67+
"type": "t_bool",
68+
"contract": "PausableUpgradeable",
69+
"src": "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol:29"
70+
},
71+
{
72+
"label": "__gap",
73+
"offset": 0,
74+
"slot": "102",
75+
"type": "t_array(t_uint256)49_storage",
76+
"contract": "PausableUpgradeable",
77+
"src": "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol:116"
78+
},
79+
{
80+
"label": "_status",
81+
"offset": 0,
82+
"slot": "151",
83+
"type": "t_uint256",
84+
"contract": "ReentrancyGuardUpgradeable",
85+
"src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:38"
86+
},
87+
{
88+
"label": "__gap",
89+
"offset": 0,
90+
"slot": "152",
91+
"type": "t_array(t_uint256)49_storage",
92+
"contract": "ReentrancyGuardUpgradeable",
93+
"src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:88"
94+
},
95+
{
96+
"label": "__gap",
97+
"offset": 0,
98+
"slot": "201",
99+
"type": "t_array(t_uint256)50_storage",
100+
"contract": "ERC1967UpgradeUpgradeable",
101+
"src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:169"
102+
},
103+
{
104+
"label": "__gap",
105+
"offset": 0,
106+
"slot": "251",
107+
"type": "t_array(t_uint256)50_storage",
108+
"contract": "UUPSUpgradeable",
109+
"src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:111"
110+
},
111+
{
112+
"label": "_baseURIString",
113+
"offset": 0,
114+
"slot": "301",
115+
"type": "t_string_storage",
116+
"contract": "TablelandTables",
117+
"src": "contracts/TablelandTables.sol:27"
118+
},
119+
{
120+
"label": "_controllers",
121+
"offset": 0,
122+
"slot": "302",
123+
"type": "t_mapping(t_uint256,t_address)",
124+
"contract": "TablelandTables",
125+
"src": "contracts/TablelandTables.sol:29"
126+
},
127+
{
128+
"label": "_locks",
129+
"offset": 0,
130+
"slot": "303",
131+
"type": "t_mapping(t_uint256,t_bool)",
132+
"contract": "TablelandTables",
133+
"src": "contracts/TablelandTables.sol:31"
134+
}
135+
],
136+
"types": {
137+
"t_address": {
138+
"label": "address",
139+
"numberOfBytes": "20"
140+
},
141+
"t_array(t_uint256)49_storage": {
142+
"label": "uint256[49]",
143+
"numberOfBytes": "1568"
144+
},
145+
"t_array(t_uint256)50_storage": {
146+
"label": "uint256[50]",
147+
"numberOfBytes": "1600"
148+
},
149+
"t_bool": {
150+
"label": "bool",
151+
"numberOfBytes": "1"
152+
},
153+
"t_mapping(t_uint256,t_address)": {
154+
"label": "mapping(uint256 => address)",
155+
"numberOfBytes": "32"
156+
},
157+
"t_mapping(t_uint256,t_bool)": {
158+
"label": "mapping(uint256 => bool)",
159+
"numberOfBytes": "32"
160+
},
161+
"t_string_storage": {
162+
"label": "string",
163+
"numberOfBytes": "32"
164+
},
165+
"t_uint256": {
166+
"label": "uint256",
167+
"numberOfBytes": "32"
168+
},
169+
"t_uint8": {
170+
"label": "uint8",
171+
"numberOfBytes": "1"
172+
}
173+
}
174+
}
175+
}
176+
}
177+
}

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ This is the Tableland Tables EVM contracts and client components.
2929
| matic | 137 | 0x5c4e6A9e5C1e1BF445A062006faF19EA6c49aFeA |
3030
| filecoin | 314 | 0x59EF8Bf2d6c102B4c42AEf9189e1a9F0ABfD652d |
3131
| sepolia | 11155111 | 0xc50C62498448ACc8dBdE43DA77f8D5D2E2c7597D |
32-
| optimism-goerli | 420 | 0xC72E8a7Be04f2469f8C2dB3F1BdF69A7D516aBbA |
32+
| optimism-sepolia | 11155420 | 0x68A2f4423ad3bf5139Db563CF3bC80aA09ed7079 |
3333
| arbitrum-sepolia | 421614 | 0x223A74B8323914afDC3ff1e5005564dC17231d6e |
3434
| maticmum | 80001 | 0x4b48841d4b32C4650E4ABc117A03FE8B51f38F68 |
3535
| filecoin-calibration | 314159 | 0x030BCf3D50cad04c2e57391B12740982A9308621 |

‎contracts/utils/TablelandDeployments.sol‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ library TablelandDeployments {
3939
// TablelandTables address on Ethereum Sepolia.
4040
address internal constant SEPOLIA =
4141
0xc50C62498448ACc8dBdE43DA77f8D5D2E2c7597D;
42-
// TablelandTables address on Optimism Goerli.
43-
address internal constant OPTIMISM_GOERLI =
44-
0xC72E8a7Be04f2469f8C2dB3F1BdF69A7D516aBbA;
42+
// TablelandTables address on Optimism Sepolia.
43+
address internal constant OPTIMISM_SEPOLIA =
44+
0x68A2f4423ad3bf5139Db563CF3bC80aA09ed7079;
4545
// TablelandTables address on Arbitrum Sepolia.
4646
address internal constant ARBITRUM_SEPOLIA =
4747
0x223A74B8323914afDC3ff1e5005564dC17231d6e;
@@ -80,8 +80,8 @@ library TablelandDeployments {
8080
return TablelandTablesImpl(FILECOIN);
8181
} else if (block.chainid == 11155111) {
8282
return TablelandTablesImpl(SEPOLIA);
83-
} else if (block.chainid == 420) {
84-
return TablelandTablesImpl(OPTIMISM_GOERLI);
83+
} else if (block.chainid == 11155420) {
84+
return TablelandTablesImpl(OPTIMISM_SEPOLIA);
8585
} else if (block.chainid == 421614) {
8686
return TablelandTablesImpl(ARBITRUM_SEPOLIA);
8787
} else if (block.chainid == 80001) {
@@ -119,9 +119,9 @@ library TablelandDeployments {
119119
return "https://tableland.network/api/v1/";
120120
} else if (block.chainid == 11155111) {
121121
return "https://testnets.tableland.network/api/v1/";
122-
} else if (block.chainid == 420) {
122+
} else if (block.chainid == 11155420) {
123123
return "https://testnets.tableland.network/api/v1/";
124-
} else if (block.chainid == 421613) {
124+
} else if (block.chainid == 421614) {
125125
return "https://testnets.tableland.network/api/v1/";
126126
} else if (block.chainid == 80001) {
127127
return "https://testnets.tableland.network/api/v1/";

‎hardhat.config.ts‎

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ const config: HardhatUserConfig = {
5959

6060
// optimism
6161
optimisticEthereum: process.env.OPTIMISM_ETHERSCAN_API_KEY || "",
62-
optimisticGoerli: process.env.OPTIMISM_ETHERSCAN_API_KEY || "",
62+
optimisticSepolia: process.env.OPTIMISM_ETHERSCAN_API_KEY || "",
6363

6464
// arbitrum
6565
arbitrumOne: process.env.ARBISCAN_API_KEY || "",
@@ -71,6 +71,14 @@ const config: HardhatUserConfig = {
7171
polygonMumbai: process.env.POLYSCAN_API_KEY || "",
7272
},
7373
customChains: [
74+
{
75+
network: "optimisticSepolia",
76+
chainId: 11155420,
77+
urls: {
78+
apiURL: "https://api-sepolia-optimistic.etherscan.io/api",
79+
browserURL: "https://sepolia-optimism.etherscan.io/",
80+
},
81+
},
7482
{
7583
network: "arbitrumNova",
7684
chainId: 42170,
@@ -148,13 +156,13 @@ const config: HardhatUserConfig = {
148156
? [process.env.ETHEREUM_SEPOLIA_PRIVATE_KEY]
149157
: [],
150158
},
151-
"optimism-goerli": {
152-
url: `https://opt-goerli.g.alchemy.com/v2/${
153-
process.env.OPTIMISM_GOERLI_API_KEY ?? ""
159+
"optimism-sepolia": {
160+
url: `https://opt-sepolia.g.alchemy.com/v2/${
161+
process.env.OPTIMISM_SEPOLIA_API_KEY ?? ""
154162
}`,
155163
accounts:
156-
process.env.OPTIMISM_GOERLI_PRIVATE_KEY !== undefined
157-
? [process.env.OPTIMISM_GOERLI_PRIVATE_KEY]
164+
process.env.OPTIMISM_SEPOLIA_PRIVATE_KEY !== undefined
165+
? [process.env.OPTIMISM_SEPOLIA_PRIVATE_KEY]
158166
: [],
159167
},
160168
"arbitrum-sepolia": {
@@ -185,13 +193,13 @@ const config: HardhatUserConfig = {
185193
: [],
186194
},
187195
// devnets
188-
"optimism-goerli-staging": {
189-
url: `https://opt-goerli.g.alchemy.com/v2/${
190-
process.env.OPTIMISM_GOERLI_STAGING_API_KEY ?? ""
196+
"optimism-sepolia-staging": {
197+
url: `https://opt-sepolia.g.alchemy.com/v2/${
198+
process.env.OPTIMISM_SEPOLIA_STAGING_API_KEY ?? ""
191199
}`,
192200
accounts:
193-
process.env.OPTIMISM_GOERLI_STAGING_PRIVATE_KEY !== undefined
194-
? [process.env.OPTIMISM_GOERLI_STAGING_PRIVATE_KEY]
201+
process.env.OPTIMISM_SEPOLIA_STAGING_PRIVATE_KEY !== undefined
202+
? [process.env.OPTIMISM_SEPOLIA_STAGING_PRIVATE_KEY]
195203
: [],
196204
},
197205
hardhat: {

‎network.ts‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ export interface TablelandNetworkConfig {
99
filecoin: string | number;
1010
// tableland testnet testnets
1111
sepolia: string | number;
12-
"optimism-goerli": string | number;
12+
"optimism-sepolia": string | number;
1313
"arbitrum-sepolia": string | number;
1414
maticmum: string | number;
1515
"filecoin-calibration": string | number;
16-
// tableland staging testnets
17-
"optimism-goerli-staging": string | number;
16+
// tableland testnet devnets (uncomment when needed for admin)
17+
// "optimism-sepolia-staging": string | number;
1818
// local tableland
1919
localhost: string | number; // hardhat
2020
"local-tableland": string | number; // hardhat backed by a local validator
@@ -23,19 +23,22 @@ export interface TablelandNetworkConfig {
2323
const homesteadAddr = "0x012969f7e3439a9B04025b5a049EB9BAD82A8C12";
2424

2525
export const proxies: TablelandNetworkConfig = {
26+
// mainnets
2627
mainnet: homesteadAddr,
2728
homestead: homesteadAddr,
2829
optimism: "0xfad44BF5B843dE943a09D4f3E84949A11d3aa3e6",
2930
arbitrum: "0x9aBd75E8640871A5a20d3B4eE6330a04c962aFfd",
3031
"arbitrum-nova": "0x1A22854c5b1642760a827f20137a67930AE108d2",
3132
matic: "0x5c4e6A9e5C1e1BF445A062006faF19EA6c49aFeA",
3233
filecoin: "0x59EF8Bf2d6c102B4c42AEf9189e1a9F0ABfD652d",
34+
// testnets
3335
sepolia: "0xc50C62498448ACc8dBdE43DA77f8D5D2E2c7597D",
34-
"optimism-goerli": "0xC72E8a7Be04f2469f8C2dB3F1BdF69A7D516aBbA",
36+
"optimism-sepolia": "0x68A2f4423ad3bf5139Db563CF3bC80aA09ed7079",
3537
"arbitrum-sepolia": "0x223A74B8323914afDC3ff1e5005564dC17231d6e",
3638
maticmum: "0x4b48841d4b32C4650E4ABc117A03FE8B51f38F68",
3739
"filecoin-calibration": "0x030BCf3D50cad04c2e57391B12740982A9308621",
38-
"optimism-goerli-staging": "0xfe79824f6E5894a3DD86908e637B7B4AF57eEE28",
40+
// devnets (uncomment when needed for admin)
41+
// "optimism-sepolia-staging": "0xinternal",
3942
// localhost is a stand alone node
4043
localhost: "",
4144
// local-tableland implies that a validator is also running. the proxy address will always be
@@ -56,14 +59,17 @@ export const baseURIs: TablelandNetworkConfig = {
5659
filecoin: "https://tableland.network/api/v1/tables/314/",
5760
// testnets
5861
sepolia: "https://testnets.tableland.network/api/v1/tables/11155111/",
59-
"optimism-goerli": "https://testnets.tableland.network/api/v1/tables/420/",
62+
"optimism-sepolia":
63+
"https://testnets.tableland.network/api/v1/tables/11155420/",
6064
"arbitrum-sepolia":
6165
"https://testnets.tableland.network/api/v1/tables/421614/",
6266
maticmum: "https://testnets.tableland.network/api/v1/tables/80001/",
6367
"filecoin-calibration":
6468
"https://testnets.tableland.network/api/v1/tables/314159/",
65-
"optimism-goerli-staging":
66-
"https://staging.tableland.network/api/v1/tables/420/",
69+
// devnets (uncomment when needed for admin)
70+
// "optimism-sepolia-staging":
71+
// "https://testnets.tableland.network/api/v1/tables/11155420/",
72+
// local
6773
localhost: localTablelandURI,
6874
"local-tableland": localTablelandURI,
6975
};
@@ -84,11 +90,12 @@ export const validatorPollingTimeouts: TablelandNetworkConfig = {
8490
filecoin: 210_000,
8591
// testnets
8692
sepolia: 40_000,
87-
"optimism-goerli": 10_000,
93+
"optimism-sepolia": 10_000,
8894
"arbitrum-sepolia": 10_000,
8995
maticmum: 15_000,
9096
"filecoin-calibration": 210_000,
91-
"optimism-goerli-staging": 10_000,
97+
// devnets (uncomment when needed for admin)
98+
// "optimism-sepolia-staging": 10_000,
9299
// local
93100
localhost: 5_000,
94101
"local-tableland": 5_000,

0 commit comments

Comments
 (0)