Skip to content

Commit 5778f53

Browse files
riccardo-ssvlabsriccardo-ssvlabs
authored
Merge 23cb052 into 1b5c742 
2 parents 1b5c742 + 23cb052 commit 5778f53

Some content is hidden

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

55 files changed

+288
-103
lines changed

‎.solhint.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "solhint:recommended",
33
"rules": {
4-
"compiler-version": ["error", "0.8.29"],
4+
"compiler-version": ["error", "0.8.30"],
55
"no-inline-assembly": "off",
66
"no-unused-import": "error",
77
"func-named-parameters": "off",

‎.tool-versions‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
solidity 0.8.29
1+
solidity 0.8.30

‎artifacts/deploy-hoodi-stage.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"addresses": {
3-
"BAppsModule": "0xdC97f7935Ed6FDcA407dDdE95EB26f7807E52Dc9",
4-
"ProtocolModule": "0x7AadaE0f159eECCe6a4Faad78FFF94e1eab4C540",
5-
"SSVBasedAppsImpl": "0xfCD7243D8fBb441497fEd67e19B7681C27BB20aD",
6-
"SSVBasedAppsProxy": "0x40d959B95e7c56962D6d388d87921c03734b9C2C",
7-
"StrategyModule": "0x7cF08Af55c6939BB748D4c4D2d219791EDe9dBC1"
3+
"BAppsModule": "0x7081f8BBe094d8A3C43C45E3AFb6fd32ab35965E",
4+
"ProtocolModule": "0x7b270FCa0693D1B0aC673Bbf989eC2bddb9c22dC",
5+
"SSVBasedAppsImpl": "0x90e71bd8580406DFAae69C0032CE48Ff68aF7986",
6+
"SSVBasedAppsProxy": "0xCb06f27a0dD4A941790f83739867B44383375bBA",
7+
"StrategyModule": "0xa64913E7d0aAAC0755466ed05dcEDAfC4c7342D4"
88
},
99
"chainInfo": {
1010
"chainId": 560048,

‎foundry.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[profile.default]
2-
solc = "0.8.29"
2+
solc = "0.8.30"
33
src = "src"
44
out = "out"
55
libs = ["lib"]
66
optimizer = true
77
optimizer_runs = 10_000
88
gas_reports = ["*"]
99
gas_reports_ignore = ["ERC20Mock", "BasedAppMock", "BasedAppMock2", "BasedAppMock3", "ERC1967Proxy"]
10-
fs_permissions = [{ access = "read", path = "./script/config/"}, { access = "write", path = "./artifacts/"}]
10+
fs_permissions = [{ access = "read", path = "./script/config/"}, { access = "read-write", path = "./artifacts/"}]
1111

1212
[rpc_endpoints]
1313
hoodi = "${HOODI_RPC_URL}"

‎package-lock.json‎

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "based-applications",
3-
"version": "0.1.0",
3+
"version": "0.2.0",
44
"description": "SSV Based Applications",
55
"author": "SSV.Network",
66
"repository": {
@@ -24,6 +24,10 @@
2424
"deploy:hoodi-stage": "source .env && forge script script/DeployAllHoodi.s.sol false --sig 'run(bool)' --rpc-url $HOODI_RPC_URL --private-key $DEPLOYER_PRIVATE_KEY --verify -vvv --broadcast",
2525
"deploy:hoodi-prod": "source .env && forge script script/DeployAllHoodi.s.sol true --sig 'run(bool)' --rpc-url $HOODI_RPC_URL --private-key $DEPLOYER_PRIVATE_KEY --verify -vvv --broadcast",
2626
"deploy:mainnet": "source .env && forge script script/DeployAllMainnet.s.sol --rpc-url $MAINNET_RPC_URL --private-key $DEPLOYER_PRIVATE_KEY --verify -vvv --broadcast",
27+
"update-modules:hoodi-stage":"source .env && forge script script/UpdateModulesHoodi.s.sol false [0,1,2] --sig 'run(bool,uint8[])' --rpc-url $HOODI_RPC_URL --private-key $DEPLOYER_PRIVATE_KEY --verify -vvv --broadcast",
28+
"update-modules:hoodi-prod":"source .env && forge script script/UpdateModulesHoodi.s.sol true [0,1,2] --sig 'run(bool,uint8[])' --rpc-url $HOODI_RPC_URL --private-key $DEPLOYER_PRIVATE_KEY --verify -vvv --broadcast",
29+
"update-implementation:hoodi-stage":"source .env && forge script script/UpdateNewImplHoodi.s.sol false --sig 'run(bool)' --rpc-url $HOODI_RPC_URL --private-key $DEPLOYER_PRIVATE_KEY --verify -vvv --broadcast",
30+
"update-implementation:hoodi-prod":"source .env && forge script script/UpdateNewImplHoodi.s.sol true --sig 'run(bool)' --rpc-url $HOODI_RPC_URL --private-key $DEPLOYER_PRIVATE_KEY --verify -vvv --broadcast",
2731
"gas-report": "forge test --gas-report",
2832
"generate-docs": "solc --include-path node_modules --base-path . --combined-json userdoc,devdoc src/SSVBasedApps.sol --output-dir ./docs --overwrite",
2933
"prepare": "husky",
@@ -37,7 +41,7 @@
3741
"devDependencies": {
3842
"@openzeppelin/contracts-upgradeable": "5.3.0",
3943
"husky": "9.1.7",
40-
"lint-staged": "16.0.0",
44+
"lint-staged": "16.1.0",
4145
"prettier": "3.5.3",
4246
"prettier-plugin-solidity": "2.0.0",
4347
"solhint": "5.1.0"

‎script/DeployAll.sol‎

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: GPL-3.0
2-
pragma solidity 0.8.29;
2+
pragma solidity 0.8.30;
33

44
import {
55
ERC1967Proxy
@@ -16,7 +16,7 @@ import { ProtocolStorageLib } from "src/core/libraries/ProtocolStorageLib.sol";
1616
contract DeployAll is Script {
1717
using stdJson for string;
1818

19-
function _deployAll(string memory raw) internal returns (string memory) {
19+
function _deployAll(string memory json) internal returns (string memory) {
2020
vm.startBroadcast();
2121

2222
SSVBasedApps impl = new SSVBasedApps();
@@ -29,7 +29,7 @@ contract DeployAll is Script {
2929
strategyMod,
3030
bAppsMod,
3131
protocolMod,
32-
raw
32+
json
3333
);
3434

3535
vm.stopBroadcast();
@@ -40,7 +40,8 @@ contract DeployAll is Script {
4040
console.log("ProtocolModule: ", address(protocolMod));
4141
console.log("SSVBasedApps Proxy: ", address(proxy));
4242

43-
return saveToJson(impl, proxy, strategyMod, bAppsMod, protocolMod, raw);
43+
return
44+
saveToJson(impl, proxy, strategyMod, bAppsMod, protocolMod, json);
4445
}
4546

4647
function saveToJson(
@@ -49,7 +50,7 @@ contract DeployAll is Script {
4950
StrategyManager strategyMod,
5051
BasedAppsManager bAppsMod,
5152
ProtocolManager protocolMod,
52-
string memory raw
53+
string memory json
5354
) internal returns (string memory) {
5455
string memory parent = "parent";
5556

@@ -85,48 +86,48 @@ contract DeployAll is Script {
8586
vm.serializeUint(
8687
parameters,
8788
"feeTimelockPeriod",
88-
raw.readUint(".feeTimelockPeriod")
89+
json.readUint(".feeTimelockPeriod")
8990
);
9091
vm.serializeUint(
9192
parameters,
9293
"feeExpireTime",
93-
raw.readUint(".feeExpireTime")
94+
json.readUint(".feeExpireTime")
9495
);
9596
vm.serializeUint(
9697
parameters,
9798
"withdrawalTimelockPeriod",
98-
raw.readUint(".withdrawalTimelockPeriod")
99+
json.readUint(".withdrawalTimelockPeriod")
99100
);
100101
vm.serializeUint(
101102
parameters,
102103
"withdrawalExpireTime",
103-
raw.readUint(".withdrawalExpireTime")
104+
json.readUint(".withdrawalExpireTime")
104105
);
105106
vm.serializeUint(
106107
parameters,
107108
"obligationTimelockPeriod",
108-
raw.readUint(".obligationTimelockPeriod")
109+
json.readUint(".obligationTimelockPeriod")
109110
);
110111
vm.serializeUint(
111112
parameters,
112113
"obligationExpireTime",
113-
raw.readUint(".obligationExpireTime")
114+
json.readUint(".obligationExpireTime")
114115
);
115116
vm.serializeUint(
116117
parameters,
117118
"tokenUpdateTimelockPeriod",
118-
raw.readUint(".tokenUpdateTimelockPeriod")
119+
json.readUint(".tokenUpdateTimelockPeriod")
119120
);
120-
vm.serializeUint(parameters, "maxShares", raw.readUint(".maxShares"));
121+
vm.serializeUint(parameters, "maxShares", json.readUint(".maxShares"));
121122
vm.serializeUint(
122123
parameters,
123124
"maxFeeIncrement",
124-
raw.readUint(".maxFeeIncrement")
125+
json.readUint(".maxFeeIncrement")
125126
);
126127
string memory parameters_output = vm.serializeUint(
127128
parameters,
128129
"disabledFeatures",
129-
raw.readUint(".disabledFeatures")
130+
json.readUint(".disabledFeatures")
130131
);
131132

132133
string memory chain_info = "chainInfo";
@@ -152,7 +153,7 @@ contract DeployAll is Script {
152153
StrategyManager strategyMod,
153154
BasedAppsManager bAppsMod,
154155
ProtocolManager protocolMod,
155-
string memory raw
156+
string memory json
156157
) internal returns (ERC1967Proxy proxy) {
157158
return
158159
new ERC1967Proxy(
@@ -165,30 +166,30 @@ contract DeployAll is Script {
165166
address(protocolMod),
166167
ProtocolStorageLib.Data({
167168
feeTimelockPeriod: uint32(
168-
raw.readUint(".feeTimelockPeriod")
169+
json.readUint(".feeTimelockPeriod")
169170
),
170-
feeExpireTime: uint32(raw.readUint(".feeExpireTime")),
171+
feeExpireTime: uint32(json.readUint(".feeExpireTime")),
171172
withdrawalTimelockPeriod: uint32(
172-
raw.readUint(".withdrawalTimelockPeriod")
173+
json.readUint(".withdrawalTimelockPeriod")
173174
),
174175
withdrawalExpireTime: uint32(
175-
raw.readUint(".withdrawalExpireTime")
176+
json.readUint(".withdrawalExpireTime")
176177
),
177178
obligationTimelockPeriod: uint32(
178-
raw.readUint(".obligationTimelockPeriod")
179+
json.readUint(".obligationTimelockPeriod")
179180
),
180181
obligationExpireTime: uint32(
181-
raw.readUint(".obligationExpireTime")
182+
json.readUint(".obligationExpireTime")
182183
),
183184
tokenUpdateTimelockPeriod: uint32(
184-
raw.readUint(".tokenUpdateTimelockPeriod")
185+
json.readUint(".tokenUpdateTimelockPeriod")
185186
),
186-
maxShares: raw.readUint(".maxShares"),
187+
maxShares: json.readUint(".maxShares"),
187188
maxFeeIncrement: uint32(
188-
raw.readUint(".maxFeeIncrement")
189+
json.readUint(".maxFeeIncrement")
189190
),
190191
disabledFeatures: uint32(
191-
raw.readUint(".disabledFeatures")
192+
json.readUint(".disabledFeatures")
192193
)
193194
})
194195
)

‎script/DeployAllHoodi.s.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// SPDX-License-Identifier: GPL-3.0
2-
pragma solidity 0.8.29;
2+
pragma solidity 0.8.30;
33

44
import { Script } from "forge-std/Script.sol";
55
import { DeployAll } from "./DeployAll.sol";
66

77
contract DeployAllHoodi is Script, DeployAll {
88
function run(bool isProd) external {
99
if (block.chainid != 560_048) {
10-
revert("This script is only for the Hoodi prod");
10+
revert("This script is only for the Hoodi");
1111
}
1212

1313
string memory cfgPath;

‎script/DeployAllMainnet.s.sol‎

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

44
import { Script, console } from "forge-std/Script.sol";
55
import { DeployAll } from "./DeployAll.sol";

‎script/DeployAllSepolia.s.sol‎

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

44
import { Script, console } from "forge-std/Script.sol";
55
import { DeployAll } from "./DeployAll.sol";

0 commit comments

Comments
 (0)