feat: add solhint to makefile

feat: block funds by mev committee

feat: tests

feat: more tests

fix: required

fix: remarks

Update blocked bond retention and management
periods

Check onRewardsMinted call from the staking router

forge install: openzeppelin-contracts-v4.4

v4.4.1

build: import oracle contracts from lido-dao

feat: CSFeeOracle based on HashConsensus

refactor: deploy script

docs: udate READMEs

lint: add compiler-version solhint rule

fix: some remarks

refactor: integration tests addresses

[CS-93] locking bond funds by mev committee (#35)

* feat: add solhint to makefile

* feat: block funds by mev committee

* feat: tests

* feat: more tests

* fix: required

* fix: remarks

* Update blocked bond retention and management
periods

* fix: some remarks

.env.sample

@@ -1,9 +1,4 @@
 RPC_URL=
-LIDO_LOCATOR_ADDRESS=
-WSTETH_ADDRESS=
 # For deployment
 DEPLOYER_PRIVATE_KEY=
-INITIALIZATION_EPOCH=
-## mainnet
-CL_GENESIS_TIME=1606824023
 KEEP_ANVIL_AFTER_LOCAL_DEPLOY=false

.github/workflows/test.yml

@@ -60,5 +60,3 @@ jobs:
           forge test -vvv
         env:
           RPC_URL: ${{ secrets.RPC_URL }}
-          LIDO_LOCATOR_ADDRESS: "0xC1d0b3DE6792Bf6b4b37EccdcC24e45978Cfd2Eb"
-          WSTETH_ADDRESS: "0x7f39c581f595b53c5cb19bd0b3f8da6c935e2ca0"

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "lib/openzeppelin-contracts"]
 	path = lib/openzeppelin-contracts
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
+[submodule "lib/openzeppelin-contracts-v4.4"]
+	path = lib/openzeppelin-contracts-v4.4
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts

.solhint.json

@@ -2,6 +2,7 @@
   "extends": "solhint:recommended",
   "plugins": ["lido-csm"],
   "rules": {
+    "compiler-version": ["error", "0.8.21"],
     "no-inline-assembly": "off",
     "no-unused-import": "error",
     "func-named-parameters": "error",

Makefile

@@ -1,14 +1,21 @@
 include .env
 
-.PHONY: artifacts clean test deploy-prod deploy-local anvil-fork anvil-kill
+.PHONY: build clean test deploy-prod deploy-local anvil-fork anvil-kill
 
-DEPLOY_SCRIPT_PATH := script/Deploy.s.sol:Deploy
+CHAIN ?= mainnet
 
-artifacts:
-	forge compile --force
+DEPLOY_SCRIPT_PATH_mainnet := script/DeployMainnetish.s.sol:DeployMainnetish
+DEPLOY_SCRIPT_PATH_holesky := script/DeployHolesky.s.sol:DeployHolesky
+DEPLOY_SCRIPT_PATH_goerli := script/DeployGoerli.s.sol:DeployGoerli
+DEPLOY_SCRIPT_PATH := ${DEPLOY_SCRIPT_PATH_${CHAIN}}
+
+build:
+	forge build --force
 clean:
 	forge clean
 	rm -rf cache broadcast out
+lint-solhint:
+	yarn lint:solhint
 lint-check:
 	yarn lint:check
 lint-fix:
@@ -48,6 +55,7 @@ endif
 
 # aliases
 a: artifacts
+ls: lint-solhint
 lc: lint-check
 lf: lint-fix
 t: test

README.md

@@ -11,9 +11,11 @@ forge install
 ```
 
 - Config environment variables
+
 ```bash
-cp .env.example .env
+cp .env.sample .env
 ```
+
 Fill vars in the `.env` file with your own values
 
 ### Features
@@ -38,6 +40,12 @@ forge install rari-capital/solmate
 make deploy-local
 ```
 
+- Deploy to local fork of non-mainnet chain
+
+```bash
+CHAIN=holesky make deploy-local
+```
+
 ### Notes
 
 Whenever you install new libraries using Foundry, make sure to update your

lib/base-oracle/README.md

@@ -0,0 +1,3 @@
+This is an extraction from [lidofinance/lido-dao@v2.0.0](https://github.com/lidofinance/lido-dao/releases/tag/v2.0.0) codebase.
+Patched to use ^0.8.9 solidity compiler version.
+@openzeppelin/contracts-v4.4 mapped to v4.4.1.

lib/base-oracle/lib/Math.sol

@@ -0,0 +1,31 @@
+// SPDX-FileCopyrightText: 2023 Lido <info@lido.fi>
+// SPDX-License-Identifier: MIT
+
+// See contracts/COMPILERS.md
+pragma solidity ^0.8.9;
+
+library Math {
+    function max(uint256 a, uint256 b) internal pure returns (uint256) {
+        return a > b ? a : b;
+    }
+
+    function min(uint256 a, uint256 b) internal pure returns (uint256) {
+        return a < b ? a : b;
+    }
+
+    /// @notice Tests if x ∈ [a, b) (mod n)
+    ///
+    function pointInHalfOpenIntervalModN(uint256 x, uint256 a, uint256 b, uint256 n)
+        internal pure returns (bool)
+    {
+        return (x + n - a) % n < (b - a) % n;
+    }
+
+    /// @notice Tests if x ∈ [a, b] (mod n)
+    ///
+    function pointInClosedIntervalModN(uint256 x, uint256 a, uint256 b, uint256 n)
+        internal pure returns (bool)
+    {
+        return (x + n - a) % n <= (b - a) % n;
+    }
+}

lib/base-oracle/lib/UnstructuredStorage.sol

@@ -0,0 +1,43 @@
+/*
+ * SPDX-License-Identifier: MIT
+ */
+
+pragma solidity ^0.8.9;
+
+
+/**
+ * @notice Aragon Unstructured Storage library
+ */
+library UnstructuredStorage {
+    function getStorageBool(bytes32 position) internal view returns (bool data) {
+        assembly { data := sload(position) }
+    }
+
+    function getStorageAddress(bytes32 position) internal view returns (address data) {
+        assembly { data := sload(position) }
+    }
+
+    function getStorageBytes32(bytes32 position) internal view returns (bytes32 data) {
+        assembly { data := sload(position) }
+    }
+
+    function getStorageUint256(bytes32 position) internal view returns (uint256 data) {
+        assembly { data := sload(position) }
+    }
+
+    function setStorageBool(bytes32 position, bool data) internal {
+        assembly { sstore(position, data) }
+    }
+
+    function setStorageAddress(bytes32 position, address data) internal {
+        assembly { sstore(position, data) }
+    }
+
+    function setStorageBytes32(bytes32 position, bytes32 data) internal {
+        assembly { sstore(position, data) }
+    }
+
+    function setStorageUint256(bytes32 position, uint256 data) internal {
+        assembly { sstore(position, data) }
+    }
+}