Merge branch 'main' of https://github.com/bloxapp/ssv-network

ssvlabs · Nov 15, 2023 · 61fd8ed · 61fd8ed
2 parents 2d2a608 + 6064417
commit 61fd8ed
Show file tree

Hide file tree

Showing 10 changed files with 140 additions and 6 deletions.
diff --git a/.openzeppelin/unknown-17000.json b/.openzeppelin/unknown-17000.json
@@ -258,6 +258,114 @@
           }
         }
       }
+    },
+    "6cbab0be5caec362fa591f99e9ab60ab2ec706c3cb7d8437dff9b7e9a204232e": {
+      "address": "0x58EabC62cC2c254AC43E35Edbb0D1f74f3DAd508",
+      "txHash": "0xd28b5d89a5f212ac291259398cbc79d035ef497bf8f42099edb229e8800aae6e",
+      "layout": {
+        "solcVersion": "0.8.18",
+        "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": "ERC1967UpgradeUpgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:169"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "51",
+            "type": "t_array(t_uint256)50_storage",
+            "contract": "UUPSUpgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:111"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "101",
+            "type": "t_array(t_uint256)50_storage",
+            "contract": "ContextUpgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36"
+          },
+          {
+            "label": "_owner",
+            "offset": 0,
+            "slot": "151",
+            "type": "t_address",
+            "contract": "OwnableUpgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:22"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "152",
+            "type": "t_array(t_uint256)49_storage",
+            "contract": "OwnableUpgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:94"
+          },
+          {
+            "label": "_pendingOwner",
+            "offset": 0,
+            "slot": "201",
+            "type": "t_address",
+            "contract": "Ownable2StepUpgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol:27"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "202",
+            "type": "t_array(t_uint256)49_storage",
+            "contract": "Ownable2StepUpgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol:70"
+          }
+        ],
+        "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_uint256": {
+            "label": "uint256",
+            "numberOfBytes": "32"
+          },
+          "t_uint8": {
+            "label": "uint8",
+            "numberOfBytes": "1"
+          }
+        }
+      }
     }
   }
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,21 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ## [Unreleased]
 
-## [v1.0.0.rc5] - 2023-10-02
+## [v1.0.2] 2023-11-08
+- [8f5df42](https://github.com/bloxapp/ssv-network/commit/8f5df42633d2b92c6bb70253a41e6afa80b9f111) - Change ValidatorExited signature: owner indexed.
+
+## [v1.0.1] 2023-11-08
+
+### Added
+- [0ab954e](https://github.com/bloxapp/ssv-network/commit/0ab954ec24fc0b32b51c278958c3d51480940f1a) - Permissionless audited version.
+
+
+## [v1.0.0-rc3-permissionless-validators] 2023-11-08
+Takes v1.0.0-rc3 as the base tag.
+- [8878241](https://github.com/bloxapp/ssv-network/commit/88782410ad3223c75f205484811a010231c64152) Enable permissionless validator registration.
+
+
+## [v1.0.0] - 2023-10-30
 
 ### Fixed
 

diff --git a/contracts/audits/2023-30-10_Quantstamp_v1.0.0.pdf b/contracts/audits/2023-30-10_Quantstamp_v1.0.0.pdf
diff --git a/contracts/audits/2023-30-10_Quantstamp_v1.0.2.pdf b/contracts/audits/2023-30-10_Quantstamp_v1.0.2.pdf
diff --git a/contracts/libraries/CoreLib.sol b/contracts/libraries/CoreLib.sol
@@ -7,7 +7,7 @@ library CoreLib {
     event ModuleUpgraded(SSVModules indexed moduleId, address moduleAddress);
 
     function getVersion() internal pure returns (string memory) {
-        return "v1.0.0.rc5";
+        return "v1.0.2";
     }
 
     function transferBalance(address to, uint256 amount) internal {

diff --git a/contracts/test/libraries/CoreLibT.sol b/contracts/test/libraries/CoreLibT.sol
@@ -6,7 +6,7 @@ import "../../libraries/SSVStorage.sol";
 library CoreLibT {
 
     function getVersion() internal pure returns (string memory) {
-        return "v1.0.0.rc5";
+        return "v1.0.2";
     }
 
     function transfer(address to, uint256 amount) internal {

diff --git a/...stage/SSVNetworkValidatorsPerOperator.sol → ...oerli/SSVNetworkValidatorsPerOperator.sol b/...stage/SSVNetworkValidatorsPerOperator.sol → ...oerli/SSVNetworkValidatorsPerOperator.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity 0.8.18;
 
-import "../../SSVNetwork.sol";
+import "../../../SSVNetwork.sol";
 
 
 contract SSVNetworkValidatorsPerOperator is SSVNetwork {

diff --git a/contracts/upgrades/stage/holesky/SSVNetworkUpgradeValidatorsPerOperator.sol b/contracts/upgrades/stage/holesky/SSVNetworkUpgradeValidatorsPerOperator.sol
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity 0.8.18;
+
+import "../../../SSVNetwork.sol";
+
+
+contract SSVNetworkUpgradeValidatorsPerOperator is SSVNetwork {
+
+    function initializev2(uint32 validatorsPerOperatorLimit_) external reinitializer(_getInitializedVersion() + 1) {
+        SSVStorageProtocol.load().validatorsPerOperatorLimit = validatorsPerOperatorLimit_;
+    }
+}
diff --git a/test/deployment/version.ts b/test/deployment/version.ts
@@ -20,7 +20,7 @@ describe('Version upgrade tests', () => {
 
         await ssvNetworkContract.updateModule(helpers.SSV_MODULES.SSV_VIEWS, viewsContract.address)
 
-        expect(await ssvNetworkViews.getVersion()).to.equal("v1.0.0.rc5");
+        expect(await ssvNetworkViews.getVersion()).to.equal("v1.0.2");
     });
 
 });
diff --git a/test/helpers/contract-helpers.ts b/test/helpers/contract-helpers.ts
@@ -65,7 +65,7 @@ export const DataGenerator = {
 
 export const initializeContract = async () => {
   CONFIG = {
-    initialVersion: "v1.0.0.rc5",
+    initialVersion: "v1.0.2",
     operatorMaxFeeIncrease: 1000,
     declareOperatorFeePeriod: 3600, // HOUR
     executeOperatorFeePeriod: 86400, // DAY