Skip to content

Commit 58efe28

Browse files
authored
Solidity version upgrade =0.8.30 (#24)
* upgrade solc 0.8.25->0.8.30, evm_version cancun->prague * update all pragma statements to solidity 0.8.30 * add calibnet deployment artifacts for 0.8.30 upgrade * remove failed calibnet deployment artifacts, keep only successful run * pin all pragmas to =0.8.30, add --slow to devnet_deploy
1 parent 8549e7b commit 58efe28

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+153
-57
lines changed

deployments/calibnet/3546846.json

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
{
2+
"Allocator": "0x9fd24Fc6E377102a911Fb8b1a505443eb5598170",
3+
"Client": {
4+
"codeHash": "0xb49efd34a5f95e449eca59fe2f4e2f801e188dfa291f3c26eb70b4ba92636a17",
5+
"deployedCodeHash": "0x4432f0160d390c8737ceb3e7115ea20ad8635f60f8f7be669d3d815c34db0c13",
6+
"impl": "0x24CE9193843a9D2DCbff2b23bAD057A0f5b7e774",
7+
"proxy": "0x89b66546dB3b46a22900bCA09B06026A2a7c8df4"
8+
},
9+
"FilecoinPay": "0x09a0fDc2723fAd1A7b8e3e00eE5DF73841df55a0",
10+
"PoRepMarket": {
11+
"codeHash": "0x0c97394ffa761dafa92f7a3a76bb9c523a18056a14a2f469915091002e7d7bf6",
12+
"deployedCodeHash": "0x3228bd90a2129708c226368d5e4c31a97929e49ba9ccf4688adb676c3087397a",
13+
"impl": "0x923E95884Cf38dfD59443605Cd22AbC786149587",
14+
"proxy": "0xCa9a7A0c2A781b7cA6D3e36d38863ADFdB41E90F"
15+
},
16+
"PoRepService": "0xEB0680e8fEF19f5B6490a083d5b59f6F04930B5B",
17+
"SLIOracle": {
18+
"codeHash": "0x552bab6a91012658f51fb9692b5702e1ed8c9782bb6834469be02491925f78f7",
19+
"deployedCodeHash": "0xb2cf4f478ff232504963e838fb3110330b5241417adaa2d6ccd5ede0269a1de9",
20+
"impl": "0xCC201FE04Ea5541047444067D5c37bb915C7F55E",
21+
"proxy": "0x752e44b17DFD94de71900390CDA0316ba1D1E0f4"
22+
},
23+
"SLIScorer": {
24+
"codeHash": "0x718cff41e0d6cbab4d205bdc12de3261efb6eb00fa3d7824fd1ac192116fed8d",
25+
"deployedCodeHash": "0xd2688d4ad5ed90b831c776f4fd081f79660dbdcb90e09397b642b2bf939eb33b",
26+
"impl": "0x62172552F5B55063521A44e7f0FE1267637ac70D",
27+
"proxy": "0xA9554C48aaF093a92c8B86E70A2FFba615AE87dD"
28+
},
29+
"SPRegistry": {
30+
"codeHash": "0x4070933114860d12e663851fab66366c5cb6e9ecffd50410a62cc6974b3a2e30",
31+
"deployedCodeHash": "0xdca08069048b21fb5c9f7ff079120dd8dffa01ceeee159ec95fbbab579f01bb0",
32+
"impl": "0x1b3E4CD6C73E2bA8e3ab4CA672F6c474B77E2815",
33+
"proxy": "0xF50897bE366D051962707f9Bd9f380e8A8f3E41e"
34+
},
35+
"TerminationOracle": "0xe4Cd56f91Bc79cC610AEfB1bE92b07BB5b6F2e30",
36+
"ValidatorBeacon": "0x24FEcCD77E605F602BA7a8A06bE4634f40292FDe",
37+
"ValidatorFactory": {
38+
"codeHash": "0xec75ffb459e44e16ee3f4b1c1e55e293f0f31756ffc6403759951f438869088a",
39+
"deployedCodeHash": "0x90ddd6e7f12f3376de71cf17032d10c060d16aabccf45d55ed3fb1e7b082ac86",
40+
"impl": "0xC25d14ce4a0cC2e7d44c4eaeBc92c3De4854E567",
41+
"proxy": "0xEe64CcA9B2E119BB4168C3a804E89d920eF770d8"
42+
},
43+
"ValidatorImpl": "0xFC02d9b987Cf9622df5051B9b3aBCe6850253144",
44+
"block": 3546846,
45+
"chainId": 314159,
46+
"deployer": "0xEB0680e8fEF19f5B6490a083d5b59f6F04930B5B",
47+
"timestamp": 1773731760
48+
}

deployments/calibnet/latest.json

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
{
2+
"Allocator": "0x9fd24Fc6E377102a911Fb8b1a505443eb5598170",
3+
"Client": {
4+
"codeHash": "0xb49efd34a5f95e449eca59fe2f4e2f801e188dfa291f3c26eb70b4ba92636a17",
5+
"deployedCodeHash": "0x4432f0160d390c8737ceb3e7115ea20ad8635f60f8f7be669d3d815c34db0c13",
6+
"impl": "0x24CE9193843a9D2DCbff2b23bAD057A0f5b7e774",
7+
"proxy": "0x89b66546dB3b46a22900bCA09B06026A2a7c8df4"
8+
},
9+
"FilecoinPay": "0x09a0fDc2723fAd1A7b8e3e00eE5DF73841df55a0",
10+
"PoRepMarket": {
11+
"codeHash": "0x0c97394ffa761dafa92f7a3a76bb9c523a18056a14a2f469915091002e7d7bf6",
12+
"deployedCodeHash": "0x3228bd90a2129708c226368d5e4c31a97929e49ba9ccf4688adb676c3087397a",
13+
"impl": "0x923E95884Cf38dfD59443605Cd22AbC786149587",
14+
"proxy": "0xCa9a7A0c2A781b7cA6D3e36d38863ADFdB41E90F"
15+
},
16+
"PoRepService": "0xEB0680e8fEF19f5B6490a083d5b59f6F04930B5B",
17+
"SLIOracle": {
18+
"codeHash": "0x552bab6a91012658f51fb9692b5702e1ed8c9782bb6834469be02491925f78f7",
19+
"deployedCodeHash": "0xb2cf4f478ff232504963e838fb3110330b5241417adaa2d6ccd5ede0269a1de9",
20+
"impl": "0xCC201FE04Ea5541047444067D5c37bb915C7F55E",
21+
"proxy": "0x752e44b17DFD94de71900390CDA0316ba1D1E0f4"
22+
},
23+
"SLIScorer": {
24+
"codeHash": "0x718cff41e0d6cbab4d205bdc12de3261efb6eb00fa3d7824fd1ac192116fed8d",
25+
"deployedCodeHash": "0xd2688d4ad5ed90b831c776f4fd081f79660dbdcb90e09397b642b2bf939eb33b",
26+
"impl": "0x62172552F5B55063521A44e7f0FE1267637ac70D",
27+
"proxy": "0xA9554C48aaF093a92c8B86E70A2FFba615AE87dD"
28+
},
29+
"SPRegistry": {
30+
"codeHash": "0x4070933114860d12e663851fab66366c5cb6e9ecffd50410a62cc6974b3a2e30",
31+
"deployedCodeHash": "0xdca08069048b21fb5c9f7ff079120dd8dffa01ceeee159ec95fbbab579f01bb0",
32+
"impl": "0x1b3E4CD6C73E2bA8e3ab4CA672F6c474B77E2815",
33+
"proxy": "0xF50897bE366D051962707f9Bd9f380e8A8f3E41e"
34+
},
35+
"TerminationOracle": "0xe4Cd56f91Bc79cC610AEfB1bE92b07BB5b6F2e30",
36+
"ValidatorBeacon": "0x24FEcCD77E605F602BA7a8A06bE4634f40292FDe",
37+
"ValidatorFactory": {
38+
"codeHash": "0xec75ffb459e44e16ee3f4b1c1e55e293f0f31756ffc6403759951f438869088a",
39+
"deployedCodeHash": "0x90ddd6e7f12f3376de71cf17032d10c060d16aabccf45d55ed3fb1e7b082ac86",
40+
"impl": "0xC25d14ce4a0cC2e7d44c4eaeBc92c3De4854E567",
41+
"proxy": "0xEe64CcA9B2E119BB4168C3a804E89d920eF770d8"
42+
},
43+
"ValidatorImpl": "0xFC02d9b987Cf9622df5051B9b3aBCe6850253144",
44+
"block": 3546846,
45+
"chainId": 314159,
46+
"deployer": "0xEB0680e8fEF19f5B6490a083d5b59f6F04930B5B",
47+
"timestamp": 1773731760
48+
}

foundry.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ out = "out"
44
libs = ["lib"]
55
via_ir = true
66
optimizer = true
7-
solc_version = "0.8.25"
8-
evm_version = "cancun"
7+
solc_version = "0.8.30"
8+
evm_version = "prague"
99
optimizer_runs = 200
1010
fs_permissions = [
11-
{ access = "read-write", path = "./deployments/" }
11+
{ access = "read-write", path = "./deployments/" }
1212
]
1313

1414
[lint]

script/Deploy.s.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: MIT
22
// solhint-disable use-natspec, max-states-count, no-console
3-
pragma solidity =0.8.25;
3+
pragma solidity =0.8.30;
44

55
import {Script} from "forge-std/Script.sol";
66
import {PoRepMarket} from "../src/PoRepMarket.sol";

script/utils/DeployUtils.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: MIT
22
// solhint-disable use-natspec
3-
pragma solidity =0.8.25;
3+
pragma solidity =0.8.30;
44

55
import {Script} from "forge-std/Script.sol";
66
import {stdJson} from "forge-std/StdJson.sol";

src/Client.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity =0.8.25;
2+
pragma solidity =0.8.30;
33

44
import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
55
import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";

src/PoRepMarket.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: MIT
22
// solhint-disable var-name-mixedcase
33

4-
pragma solidity =0.8.25;
4+
pragma solidity =0.8.30;
55

66
import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
77
import {CommonTypes} from "filecoin-solidity/v0.8/types/CommonTypes.sol";

src/SLIOracle.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity =0.8.25;
2+
pragma solidity =0.8.30;
33

44
import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
55
import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";

src/SLIScorer.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity =0.8.25;
2+
pragma solidity =0.8.30;
33

44
import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
55
import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";

src/SPRegistry.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: MIT
22
// solhint-disable var-name-mixedcase
33

4-
pragma solidity ^0.8.24;
4+
pragma solidity =0.8.30;
55

66
import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
77
import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";

0 commit comments

Comments
 (0)