Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[chore] migrate arbitrum testnet to sepolia #465

Merged
merged 2 commits into from
Nov 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ ETHEREUM_SEPOLIA_PRIVATE_KEY=0xfixme
ETHEREUM_SEPOLIA_API_KEY=fixme
OPTIMISM_GOERLI_PRIVATE_KEY=0xfixme
OPTIMISM_GOERLI_API_KEY=fixme
ARBITRUM_GOERLI_PRIVATE_KEY=0xfixme
ARBITRUM_GOERLI_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
Expand Down
172 changes: 172 additions & 0 deletions .openzeppelin/unknown-421614.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,172 @@
{
"manifestVersion": "3.2",
"proxies": [
{
"address": "0x223A74B8323914afDC3ff1e5005564dC17231d6e",
"txHash": "0x84ab45b57fbdff3fd21e024077877eb283abc367f636b7bf109e2f590c416616",
"kind": "uups"
}
],
"impls": {
"f81fdad50c4628dce7f1a7ebf243ab81c2f61f18d2d7ff651bb95a932120d900": {
"address": "0xd12A4A1768BbE6C38F5c6c1CcA9feCa7bcbF18e2",
"txHash": "0xe05412ca9ea82e197f447b2fe4b6d95cd96a1f4bac7a05348eea5c947df0b718",
"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"
}
}
}
}
}
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ This is the Tableland Tables EVM contracts and client components.
| filecoin | 314 | 0x59EF8Bf2d6c102B4c42AEf9189e1a9F0ABfD652d |
| sepolia | 11155111 | 0xc50C62498448ACc8dBdE43DA77f8D5D2E2c7597D |
| optimism-goerli | 420 | 0xC72E8a7Be04f2469f8C2dB3F1BdF69A7D516aBbA |
| arbitrum-goerli | 421613 | 0x033f69e8d119205089Ab15D340F5b797732f646b |
| arbitrum-sepolia | 421614 | 0x223A74B8323914afDC3ff1e5005564dC17231d6e |
| maticmum | 80001 | 0x4b48841d4b32C4650E4ABc117A03FE8B51f38F68 |
| filecoin-calibration | 314159 | 0x030BCf3D50cad04c2e57391B12740982A9308621 |

Expand Down
10 changes: 5 additions & 5 deletions contracts/utils/TablelandDeployments.sol
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ library TablelandDeployments {
// TablelandTables address on Optimism Goerli.
address internal constant OPTIMISM_GOERLI =
0xC72E8a7Be04f2469f8C2dB3F1BdF69A7D516aBbA;
// TablelandTables address on Arbitrum Goerli.
address internal constant ARBITRUM_GOERLI =
0x033f69e8d119205089Ab15D340F5b797732f646b;
// TablelandTables address on Arbitrum Sepolia.
address internal constant ARBITRUM_SEPOLIA =
0x223A74B8323914afDC3ff1e5005564dC17231d6e;
// TablelandTables address on Polygon Mumbai.
address internal constant MATICMUM =
0x4b48841d4b32C4650E4ABc117A03FE8B51f38F68;
Expand Down Expand Up @@ -79,8 +79,8 @@ library TablelandDeployments {
return TablelandTables(SEPOLIA);
} else if (block.chainid == 420) {
return TablelandTables(OPTIMISM_GOERLI);
} else if (block.chainid == 421613) {
return TablelandTables(ARBITRUM_GOERLI);
} else if (block.chainid == 421614) {
return TablelandTables(ARBITRUM_SEPOLIA);
} else if (block.chainid == 80001) {
return TablelandTables(MATICMUM);
} else if (block.chainid == 314159) {
Expand Down
20 changes: 14 additions & 6 deletions hardhat.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ const config: HardhatUserConfig = {
// arbitrum
arbitrumOne: process.env.ARBISCAN_API_KEY || "",
arbitrumNova: process.env.ARBISCAN_NOVA_API_KEY || "",
arbitrumGoerli: process.env.ARBISCAN_API_KEY || "",
arbitrumSepolia: process.env.ARBISCAN_API_KEY || "",

// polygon
polygon: process.env.POLYSCAN_API_KEY || "",
Expand All @@ -79,6 +79,14 @@ const config: HardhatUserConfig = {
browserURL: "https://nova.arbiscan.io/",
},
},
{
network: "arbitrumSepolia",
chainId: 421614,
urls: {
apiURL: "https://api-sepolia.arbiscan.io/api",
browserURL: "https://sepolia.arbiscan.io/",
},
},
],
},
networks: {
Expand Down Expand Up @@ -149,13 +157,13 @@ const config: HardhatUserConfig = {
? [process.env.OPTIMISM_GOERLI_PRIVATE_KEY]
: [],
},
"arbitrum-goerli": {
url: `https://arb-goerli.g.alchemy.com/v2/${
process.env.ARBITRUM_GOERLI_API_KEY ?? ""
"arbitrum-sepolia": {
url: `https://arb-sepolia.g.alchemy.com/v2/${
process.env.ARBITRUM_SEPOLIA_API_KEY ?? ""
}`,
accounts:
process.env.ARBITRUM_GOERLI_PRIVATE_KEY !== undefined
? [process.env.ARBITRUM_GOERLI_PRIVATE_KEY]
process.env.ARBITRUM_SEPOLIA_PRIVATE_KEY !== undefined
? [process.env.ARBITRUM_SEPOLIA_PRIVATE_KEY]
: [],
},
maticmum: {
Expand Down
9 changes: 5 additions & 4 deletions network.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export interface TablelandNetworkConfig {
// tableland testnet testnets
sepolia: string | number;
"optimism-goerli": string | number;
"arbitrum-goerli": string | number;
"arbitrum-sepolia": string | number;
maticmum: string | number;
"filecoin-calibration": string | number;
// tableland staging testnets
Expand All @@ -32,7 +32,7 @@ export const proxies: TablelandNetworkConfig = {
filecoin: "0x59EF8Bf2d6c102B4c42AEf9189e1a9F0ABfD652d",
sepolia: "0xc50C62498448ACc8dBdE43DA77f8D5D2E2c7597D",
"optimism-goerli": "0xC72E8a7Be04f2469f8C2dB3F1BdF69A7D516aBbA",
"arbitrum-goerli": "0x033f69e8d119205089Ab15D340F5b797732f646b",
"arbitrum-sepolia": "0x223A74B8323914afDC3ff1e5005564dC17231d6e",
maticmum: "0x4b48841d4b32C4650E4ABc117A03FE8B51f38F68",
"filecoin-calibration": "0x030BCf3D50cad04c2e57391B12740982A9308621",
"optimism-goerli-staging": "0xfe79824f6E5894a3DD86908e637B7B4AF57eEE28",
Expand All @@ -57,7 +57,8 @@ export const baseURIs: TablelandNetworkConfig = {
// testnets
sepolia: "https://testnets.tableland.network/api/v1/tables/11155111/",
"optimism-goerli": "https://testnets.tableland.network/api/v1/tables/420/",
"arbitrum-goerli": "https://testnets.tableland.network/api/v1/tables/421613/",
"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/",
Expand All @@ -84,7 +85,7 @@ export const validatorPollingTimeouts: TablelandNetworkConfig = {
// testnets
sepolia: 40_000,
"optimism-goerli": 10_000,
"arbitrum-goerli": 10_000,
"arbitrum-sepolia": 10_000,
maticmum: 15_000,
"filecoin-calibration": 210_000,
"optimism-goerli-staging": 10_000,
Expand Down
Loading