Skip to content
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
2 changes: 1 addition & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
{
"files": "*.sol",
"options": {
"parser": "solidity-parse",
"parser": "slang",
"printWidth": 80,
"tabWidth": 4,
"useTabs": false,
Expand Down
852 changes: 320 additions & 532 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
"devDependencies": {
"@openzeppelin/contracts-upgradeable": "^5.3.0",
"husky": "^9.1.7",
"lint-staged": "^15.5.1",
"lint-staged": "^15.5.2",
"prettier": "^3.5.3",
"prettier-plugin-solidity": "^1.4.2",
"prettier-plugin-solidity": "^2.0.0",
"solhint": "^5.1.0"
},
"lint-staged": {
Expand Down
4 changes: 3 additions & 1 deletion script/DeployAll.sol
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
// SPDX-License-Identifier: GPL-3.0
pragma solidity 0.8.29;

import { ERC1967Proxy } from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
import {
ERC1967Proxy
} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
import { Script, console } from "forge-std/Script.sol";
import { stdJson } from "forge-std/StdJson.sol";

Expand Down
19 changes: 19 additions & 0 deletions script/DeployAllSepolia.s.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// SPDX-License-Identifier: GPL-3.0
pragma solidity 0.8.29;

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

contract DeployAllHoodi is Script, DeployAll {
function run() external {
if (block.chainid != 11155111) {
revert("This script is only for Sepolia");
}

string memory finalJson = _deployAll(
vm.readFile("script/config/sepolia.json")
);

vm.writeJson(finalJson, "artifacts/deploy-sepolia.json");
}
}
38 changes: 29 additions & 9 deletions src/core/SSVBasedApps.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,37 @@
pragma solidity 0.8.29;

import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
import { Ownable2StepUpgradeable } from "@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol";
import { UUPSUpgradeable } from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";

import { MIN_EXPIRE_TIME, MIN_TIME_LOCK_PERIOD, MAX_PERCENTAGE, ETH_ADDRESS } from "@ssv/src/core/libraries/ValidationLib.sol";
import { IBasedAppManager } from "@ssv/src/core/interfaces/IBasedAppManager.sol";
import {
Ownable2StepUpgradeable
} from "@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol";
import {
UUPSUpgradeable
} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";

import {
MIN_EXPIRE_TIME,
MIN_TIME_LOCK_PERIOD,
MAX_PERCENTAGE,
ETH_ADDRESS
} from "@ssv/src/core/libraries/ValidationLib.sol";
import {
IBasedAppManager
} from "@ssv/src/core/interfaces/IBasedAppManager.sol";
import { ICore } from "@ssv/src/core/interfaces/ICore.sol";
import { ISSVBasedApps } from "@ssv/src/core/interfaces/ISSVBasedApps.sol";
import { IProtocolManager } from "@ssv/src/core/interfaces/IProtocolManager.sol";
import { IStrategyManager } from "@ssv/src/core/interfaces/IStrategyManager.sol";
import { CoreStorageLib, SSVCoreModules } from "@ssv/src/core/libraries/CoreStorageLib.sol";
import { ProtocolStorageLib } from "@ssv/src/core/libraries/ProtocolStorageLib.sol";
import {
IProtocolManager
} from "@ssv/src/core/interfaces/IProtocolManager.sol";
import {
IStrategyManager
} from "@ssv/src/core/interfaces/IStrategyManager.sol";
import {
CoreStorageLib,
SSVCoreModules
} from "@ssv/src/core/libraries/CoreStorageLib.sol";
import {
ProtocolStorageLib
} from "@ssv/src/core/libraries/ProtocolStorageLib.sol";

/**
* @title SSVBasedApps
Expand Down
16 changes: 12 additions & 4 deletions src/core/interfaces/ISSVBasedApps.sol
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
// SPDX-License-Identifier: GPL-3.0
pragma solidity 0.8.29;

import { IStrategyManager } from "@ssv/src/core/interfaces/IStrategyManager.sol";
import { IBasedAppManager } from "@ssv/src/core/interfaces/IBasedAppManager.sol";
import { IProtocolManager } from "@ssv/src/core/interfaces/IProtocolManager.sol";
import {
IStrategyManager
} from "@ssv/src/core/interfaces/IStrategyManager.sol";
import {
IBasedAppManager
} from "@ssv/src/core/interfaces/IBasedAppManager.sol";
import {
IProtocolManager
} from "@ssv/src/core/interfaces/IProtocolManager.sol";
import { IViews } from "@ssv/src/core/interfaces/IViews.sol";
import { SSVCoreModules } from "@ssv/src/core/libraries/CoreStorageLib.sol";
import { ProtocolStorageLib } from "@ssv/src/core/libraries/ProtocolStorageLib.sol";
import {
ProtocolStorageLib
} from "@ssv/src/core/libraries/ProtocolStorageLib.sol";

interface ISSVBasedApps is
IStrategyManager,
Expand Down
8 changes: 6 additions & 2 deletions src/core/modules/BasedAppsManager.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@
pragma solidity 0.8.29;

import { ICore } from "@ssv/src/core/interfaces/ICore.sol";
import { IBasedAppManager } from "@ssv/src/core/interfaces/IBasedAppManager.sol";
import {
IBasedAppManager
} from "@ssv/src/core/interfaces/IBasedAppManager.sol";
import { CoreStorageLib } from "@ssv/src/core/libraries/CoreStorageLib.sol";
import { ProtocolStorageLib } from "@ssv/src/core/libraries/ProtocolStorageLib.sol";
import {
ProtocolStorageLib
} from "@ssv/src/core/libraries/ProtocolStorageLib.sol";
import { ValidationLib } from "@ssv/src/core/libraries/ValidationLib.sol";

contract BasedAppsManager is IBasedAppManager {
Expand Down
13 changes: 10 additions & 3 deletions src/core/modules/ProtocolManager.sol
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
// SPDX-License-Identifier: GPL-3.0-or-later
pragma solidity 0.8.29;

import { MIN_EXPIRE_TIME, MIN_TIME_LOCK_PERIOD } from "@ssv/src/core/libraries/ValidationLib.sol";
import { IProtocolManager } from "@ssv/src/core/interfaces/IProtocolManager.sol";
import { ProtocolStorageLib } from "@ssv/src/core/libraries/ProtocolStorageLib.sol";
import {
MIN_EXPIRE_TIME,
MIN_TIME_LOCK_PERIOD
} from "@ssv/src/core/libraries/ValidationLib.sol";
import {
IProtocolManager
} from "@ssv/src/core/interfaces/IProtocolManager.sol";
import {
ProtocolStorageLib
} from "@ssv/src/core/libraries/ProtocolStorageLib.sol";
import { ISSVBasedApps } from "@ssv/src/core/interfaces/ISSVBasedApps.sol";

contract ProtocolManager is IProtocolManager {
Expand Down
30 changes: 22 additions & 8 deletions src/core/modules/StrategyManager.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,29 @@
pragma solidity 0.8.29;

import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
import { ReentrancyGuardTransient } from "@openzeppelin/contracts/utils/ReentrancyGuardTransient.sol";
import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";

import { ValidationLib, MAX_PERCENTAGE, ETH_ADDRESS } from "@ssv/src/core/libraries/ValidationLib.sol";
import {
ReentrancyGuardTransient
} from "@openzeppelin/contracts/utils/ReentrancyGuardTransient.sol";
import {
SafeERC20
} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";

import {
ValidationLib,
MAX_PERCENTAGE,
ETH_ADDRESS
} from "@ssv/src/core/libraries/ValidationLib.sol";
import { ICore } from "@ssv/src/core/interfaces/ICore.sol";
import { IStrategyManager } from "@ssv/src/core/interfaces/IStrategyManager.sol";
import {
IStrategyManager
} from "@ssv/src/core/interfaces/IStrategyManager.sol";
import { CoreStorageLib } from "@ssv/src/core/libraries/CoreStorageLib.sol";
import { ProtocolStorageLib } from "@ssv/src/core/libraries/ProtocolStorageLib.sol";
import { IBasedAppManager } from "@ssv/src/core/interfaces/IBasedAppManager.sol";
import {
ProtocolStorageLib
} from "@ssv/src/core/libraries/ProtocolStorageLib.sol";
import {
IBasedAppManager
} from "@ssv/src/core/interfaces/IBasedAppManager.sol";

import { IBasedApp } from "@ssv/src/middleware/interfaces/IBasedApp.sol";

Expand Down Expand Up @@ -534,7 +548,7 @@ contract StrategyManager is ReentrancyGuardTransient, IStrategyManager {

if (obligationPercentage != 0) {
s
.obligations[strategyId][bApp][token]
.obligations[strategyId][bApp][token]
.percentage = obligationPercentage;
}

Expand Down
8 changes: 6 additions & 2 deletions src/middleware/examples/WhitelistExample.sol
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
// SPDX-License-Identifier: GPL-3.0
pragma solidity 0.8.29;

import { BasedAppWhitelisted } from "@ssv/src/middleware/modules/BasedAppWhitelisted.sol";
import { OwnableBasedApp } from "@ssv/src/middleware/modules/core+roles/OwnableBasedApp.sol";
import {
BasedAppWhitelisted
} from "@ssv/src/middleware/modules/BasedAppWhitelisted.sol";
import {
OwnableBasedApp
} from "@ssv/src/middleware/modules/core+roles/OwnableBasedApp.sol";

contract WhitelistExample is OwnableBasedApp, BasedAppWhitelisted {
constructor(
Expand Down
4 changes: 3 additions & 1 deletion src/middleware/modules/BasedAppWhitelisted.sol
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
// SPDX-License-Identifier: GPL-3.0
pragma solidity 0.8.29;

import { IBasedAppWhitelisted } from "@ssv/src/middleware/interfaces/IBasedAppWhitelisted.sol";
import {
IBasedAppWhitelisted
} from "@ssv/src/middleware/interfaces/IBasedAppWhitelisted.sol";

abstract contract BasedAppWhitelisted is IBasedAppWhitelisted {
mapping(uint32 => bool) public isWhitelisted;
Expand Down
12 changes: 9 additions & 3 deletions src/middleware/modules/core+roles/AccessControlBasedApp.sol
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
// SPDX-License-Identifier: GPL-3.0
pragma solidity 0.8.29;

import { AccessControl } from "@openzeppelin/contracts/access/AccessControl.sol";
import {
AccessControl
} from "@openzeppelin/contracts/access/AccessControl.sol";

import { IBasedApp } from "@ssv/src/middleware/interfaces/IBasedApp.sol";
import { BasedAppCore } from "@ssv/src/middleware/modules/core/BasedAppCore.sol";
import {
BasedAppCore
} from "@ssv/src/middleware/modules/core/BasedAppCore.sol";

import { IBasedAppManager } from "@ssv/src/core/interfaces/IBasedAppManager.sol";
import {
IBasedAppManager
} from "@ssv/src/core/interfaces/IBasedAppManager.sol";
import { ICore } from "@ssv/src/core/interfaces/ICore.sol";

abstract contract AccessControlBasedApp is BasedAppCore, AccessControl {
Expand Down
8 changes: 6 additions & 2 deletions src/middleware/modules/core+roles/OwnableBasedApp.sol
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@ pragma solidity 0.8.29;
import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";

import { IBasedApp } from "@ssv/src/middleware/interfaces/IBasedApp.sol";
import { BasedAppCore } from "@ssv/src/middleware/modules/core/BasedAppCore.sol";
import {
BasedAppCore
} from "@ssv/src/middleware/modules/core/BasedAppCore.sol";

import { IBasedAppManager } from "@ssv/src/core/interfaces/IBasedAppManager.sol";
import {
IBasedAppManager
} from "@ssv/src/core/interfaces/IBasedAppManager.sol";
import { ICore } from "@ssv/src/core/interfaces/ICore.sol";

abstract contract OwnableBasedApp is Ownable, BasedAppCore {
Expand Down
8 changes: 6 additions & 2 deletions src/middleware/modules/core/BasedAppCore.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@ pragma solidity 0.8.29;

import { IBasedApp } from "@ssv/src/middleware/interfaces/IBasedApp.sol";

import { IBasedAppManager } from "@ssv/src/core/interfaces/IBasedAppManager.sol";
import {
IBasedAppManager
} from "@ssv/src/core/interfaces/IBasedAppManager.sol";

import { IStrategyManager } from "@ssv/src/core/interfaces/IStrategyManager.sol";
import {
IStrategyManager
} from "@ssv/src/core/interfaces/IStrategyManager.sol";

import { ICore } from "@ssv/src/core/interfaces/ICore.sol";

Expand Down
20 changes: 15 additions & 5 deletions test/Config.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,26 @@ pragma solidity 0.8.29;

import { Test } from "forge-std/Test.sol";

import { ERC1967Proxy } from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
import {
ERC1967Proxy
} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";

import { BasedAppsManager } from "@ssv/src/core/modules/BasedAppsManager.sol";
import { IBasedAppManager } from "@ssv/src/core/interfaces/IBasedAppManager.sol";
import { IProtocolManager } from "@ssv/src/core/interfaces/IProtocolManager.sol";
import { IStrategyManager } from "@ssv/src/core/interfaces/IStrategyManager.sol";
import {
IBasedAppManager
} from "@ssv/src/core/interfaces/IBasedAppManager.sol";
import {
IProtocolManager
} from "@ssv/src/core/interfaces/IProtocolManager.sol";
import {
IStrategyManager
} from "@ssv/src/core/interfaces/IStrategyManager.sol";
import { SSVBasedApps } from "@ssv/src/core/SSVBasedApps.sol";
import { ProtocolManager } from "@ssv/src/core/modules/ProtocolManager.sol";
import { StrategyManager } from "@ssv/src/core/modules/StrategyManager.sol";
import { ProtocolStorageLib } from "@ssv/src/core/libraries/ProtocolStorageLib.sol";
import {
ProtocolStorageLib
} from "@ssv/src/core/libraries/ProtocolStorageLib.sol";
import { ISSVBasedApps } from "@ssv/src/core/interfaces/ISSVBasedApps.sol";

contract Config is Test {
Expand Down
14 changes: 11 additions & 3 deletions test/SSVBasedApps.t.sol
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
// SPDX-License-Identifier: GPL-3.0
pragma solidity 0.8.29;

import { Ownable2StepUpgradeable } from "@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol";

import { Setup, IStrategyManager, IBasedAppManager, IProtocolManager, SSVBasedApps } from "@ssv/test/helpers/Setup.t.sol";
import {
Ownable2StepUpgradeable
} from "@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol";

import {
Setup,
IStrategyManager,
IBasedAppManager,
IProtocolManager,
SSVBasedApps
} from "@ssv/test/helpers/Setup.t.sol";
import { ISSVBasedApps } from "@ssv/src/core/interfaces/ISSVBasedApps.sol";
import { SSVCoreModules } from "@ssv/src/core/libraries/CoreStorageLib.sol";

Expand Down
24 changes: 18 additions & 6 deletions test/helpers/Setup.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,36 @@ pragma solidity 0.8.29;

import { Test } from "forge-std/Test.sol";

import { ERC1967Proxy } from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
import {
ERC1967Proxy
} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";

import { BasedAppMock } from "@ssv/test/mocks/MockBApp.sol";
import { BasedAppMock2 } from "@ssv/test/mocks/MockBApp2.sol";
import { BasedAppMock3 } from "@ssv/test/mocks/MockBAppAccessControl.sol";
import { BasedAppMock4 } from "@ssv/test/mocks/MockBApp4RejectEth.sol";
import { BasedAppsManager } from "@ssv/src/core/modules/BasedAppsManager.sol";
import { IBasedAppManager } from "@ssv/src/core/interfaces/IBasedAppManager.sol";
import {
IBasedAppManager
} from "@ssv/src/core/interfaces/IBasedAppManager.sol";
import { IERC20, ERC20Mock } from "@ssv/test/mocks/MockERC20.sol";
import { IProtocolManager } from "@ssv/src/core/interfaces/IProtocolManager.sol";
import { IStrategyManager } from "@ssv/src/core/interfaces/IStrategyManager.sol";
import {
IProtocolManager
} from "@ssv/src/core/interfaces/IProtocolManager.sol";
import {
IStrategyManager
} from "@ssv/src/core/interfaces/IStrategyManager.sol";
import { NonCompliantBApp } from "@ssv/test/mocks/MockNonCompliantBApp.sol";
import { SSVBasedApps } from "@ssv/src/core/SSVBasedApps.sol";
import { ProtocolManager } from "@ssv/src/core/modules/ProtocolManager.sol";
import { StrategyManager } from "@ssv/src/core/modules/StrategyManager.sol";
import { ProtocolStorageLib } from "@ssv/src/core/libraries/ProtocolStorageLib.sol";
import {
ProtocolStorageLib
} from "@ssv/src/core/libraries/ProtocolStorageLib.sol";

import { WhitelistExample } from "@ssv/src/middleware/examples/WhitelistExample.sol";
import {
WhitelistExample
} from "@ssv/src/middleware/examples/WhitelistExample.sol";
import { IBasedApp } from "@ssv/src/middleware/interfaces/IBasedApp.sol";

contract Setup is Test {
Expand Down
4 changes: 3 additions & 1 deletion test/middleware/examples/WhitelistExample.t.sol
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
// SPDX-License-Identifier: GPL-3.0
pragma solidity 0.8.29;

import { IBasedAppWhitelisted } from "@ssv/src/middleware/interfaces/IBasedAppWhitelisted.sol";
import {
IBasedAppWhitelisted
} from "@ssv/src/middleware/interfaces/IBasedAppWhitelisted.sol";
import { IBasedApp } from "@ssv/test/helpers/Setup.t.sol";
import { UtilsTest } from "@ssv/test/helpers/Utils.t.sol";
import { ICore } from "@ssv/src/core/interfaces/ICore.sol";
Expand Down
Loading