New staking v3 dev

contracts/PushComm/EPNSCommAdmin.sol

@@ -4,6 +4,4 @@ pragma solidity ^0.8.20;
 
 import "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
 
-contract EPNSCommAdmin is ProxyAdmin {
-    constructor(address _pushChannelAdmin) public ProxyAdmin() { }
-}
+contract EPNSCommAdmin is ProxyAdmin {}

contracts/PushCore/EPNSCoreAdmin.sol

@@ -4,6 +4,4 @@ pragma solidity ^0.8.20;
 
 import "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
 
-contract EPNSCoreAdmin is ProxyAdmin {
-    constructor(address _pushChannelAdmin) public ProxyAdmin() { }
-}
+contract EPNSCoreAdmin is ProxyAdmin {}

contracts/PushCore/PushCoreStorageV1_5.sol

@@ -20,7 +20,7 @@ contract PushCoreStorageV1_5 {
 
     address public pushChannelAdmin;
     address public governance;
-    address public daiAddress;
+    address public STAKING_CONTRACT; //TODO Re-Using Dai's address slot
     address public aDaiAddress;
     address public WETH_ADDRESS;
     address public pushCommunicator;
@@ -33,14 +33,14 @@ contract PushCoreStorageV1_5 {
     uint256 public channelsCount;
 
     ///  @notice Helper Variables for FSRatio Calculation | GROUPS = CHANNELS -> NOT IN USE
-    uint256 public groupNormalizedWeight;
-    uint256 public groupHistoricalZ;
+    uint256 public HOLDER_FEE_POOL;//TODO Re-Using groupNormalizedWeight slot
+    uint256 public WALLET_FEE_POOL;   //TODO Re-Using groupHistoricalZ slot
     uint256 public groupLastUpdate;
     uint256 public groupFairShareCount;
 
     /// @notice Necessary variables for Keeping track of Funds and Fees
     uint256 public CHANNEL_POOL_FUNDS;
-    uint256 public PROTOCOL_POOL_FEES;
+    uint256 public PROTOCOL_POOL_FEES; //unused storage
     uint256 public ADD_CHANNEL_MIN_FEES;
     uint256 public FEE_AMOUNT;
     uint256 public MIN_POOL_CONTRIBUTION;

contracts/PushCore/PushCoreStorageV2.sol

@@ -1,6 +1,6 @@
 pragma solidity ^0.8.20;
 
-import { CoreTypes, StakingTypes } from "../libraries/DataTypes.sol";
+import { CoreTypes, StakingTypes, GenericTypes } from "../libraries/DataTypes.sol";
 
 contract PushCoreStorageV2 {
     /* *** V2 State variables *** */
@@ -27,7 +27,7 @@ contract PushCoreStorageV2 {
     /// @notice Stores all the individual epoch rewards
     mapping(uint256 => uint256) public epochRewards;
     /// @notice Stores User's Fees Details
-    mapping(address => StakingTypes.UserFessInfo) public userFeesInfo;
+    mapping(address => StakingTypes.UserFeesInfo) public userFeesInfo;
     /// @notice Stores the total staked weight at a specific epoch.
     mapping(uint256 => uint256) public epochToTotalStakedWeight;
 
@@ -47,4 +47,5 @@ contract PushCoreStorageV2 {
 
     mapping(bytes32 => CoreTypes.Channel) public channelInfo;    
     mapping(bytes32 => uint256) public channelUpdateCounter;
+    GenericTypes.Percentage public SPLIT_PERCENTAGE_FOR_HOLDER;
 }