deploy stage v1.0.0.rc4

ssvlabs · Aug 31, 2023 · b8e03e7 · b8e03e7
1 parent 50db186
commit b8e03e7
Show file tree

Hide file tree

Showing 6 changed files with 113 additions and 5 deletions.
diff --git a/.openzeppelin/goerli.json b/.openzeppelin/goerli.json
@@ -7129,6 +7129,114 @@
           }
         }
       }
+    },
+    "1e550124c6e28f236ee8632b9abc9a68dac2f537aff421981b339520c87ad539": {
+      "address": "0x0097bBea812414d42D2AD6d76c7da1c794AA16A9",
+      "txHash": "0xf3a3e1c1742cd1d11b7271abf2768c6046122eb06a2f66971a931021b25763c5",
+      "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/contracts/SSVNetworkViews.sol b/contracts/SSVNetworkViews.sol
@@ -20,7 +20,7 @@ contract SSVNetworkViews is UUPSUpgradeable, Ownable2StepUpgradeable, ISSVViews
 
     // @dev reserve storage space for future new state variables in base contract
     // slither-disable-next-line shadowing-state
-    uint256[50] private __gap;
+    uint256[50] private__gap;
 
     function _authorizeUpgrade(address) internal override onlyOwner {}
 

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.rc3";
+        return "v1.0.0.rc4";
     }
 
     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.rc3";
+        return "v1.0.0.rc4";
     }
 
     function transfer(address to, uint256 amount) internal {

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.rc3");
+        expect(await ssvNetworkViews.getVersion()).to.equal("v1.0.0.rc4");
     });
 
 });
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.rc3",
+    initialVersion: "v1.0.0.rc4",
     operatorMaxFeeIncrease: 1000,
     declareOperatorFeePeriod: 3600, // HOUR
     executeOperatorFeePeriod: 86400, // DAY