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/PushComm/PushCommETHV3.sol

@@ -12,7 +12,7 @@ pragma solidity ^0.8.20;
  * @dev   Some imperative functionalities that the Push Communicator Protocol allows
  *        are Subscribing to a particular channel, Unsubscribing a channel, Sending
  *        Notifications to a particular recipient or all subscribers of a Channel etc.
- *
+ * @Custom:security-contact https://push.org/
  */
 import { PushCommEthStorageV2 } from "./PushCommEthStorageV2.sol";
 import { Errors } from "../libraries/Errors.sol";
@@ -78,11 +78,11 @@ contract PushCommETHV3 is Initializable, PushCommEthStorageV2, IPushCommV3 {
     ***************************** */
 
     function verifyChannelAlias(string memory _channelAddress) external {
-        emit ChannelAlias(chainName, chainID, msg.sender, _channelAddress);
+        emit ChannelAlias(chainName, block.chainid, msg.sender, _channelAddress);
     }
 
     function removeChannelAlias(string memory _channelAddress) external {
-        emit RemoveChannelAlias(chainName, chainID, msg.sender, _channelAddress);
+        emit RemoveChannelAlias(chainName, block.chainid, msg.sender, _channelAddress);
     }
 
     // function completeMigration() external onlyPushChannelAdmin {
@@ -123,21 +123,19 @@ contract PushCommETHV3 is Initializable, PushCommEthStorageV2, IPushCommV3 {
     }
 
     /// @inheritdoc  IPushCommV3
-    function subscribe(address _channel) external returns (bool) {
+    function subscribe(address _channel) external {
         _subscribe(_channel, msg.sender);
-        return true;
     }
 
     /// @inheritdoc  IPushCommV3
-    function batchSubscribe(address[] calldata _channelList) external returns (bool) {
+    function batchSubscribe(address[] calldata _channelList) external {
         uint256 channelListLength = _channelList.length;
         for (uint256 i = 0; i < channelListLength;) {
             _subscribe(_channelList[i], msg.sender);
             unchecked {
                 i++;
             }
         }
-        return true;
     }
 
     /**
@@ -213,9 +211,8 @@ contract PushCommETHV3 is Initializable, PushCommEthStorageV2, IPushCommV3 {
     }
 
     /// @inheritdoc  IPushCommV3
-    function subscribeViaCore(address _channel, address _user) external onlyPushCore returns (bool) {
+    function subscribeViaCore(address _channel, address _user) external onlyPushCore {
         _subscribe(_channel, _user);
-        return true;
     }
 
     /* *****************************
@@ -225,22 +222,20 @@ contract PushCommETHV3 is Initializable, PushCommEthStorageV2, IPushCommV3 {
     ***************************** */
 
     /// @inheritdoc  IPushCommV3
-    function unsubscribe(address _channel) external returns (bool) {
+    function unsubscribe(address _channel) external {
         // Call actual unsubscribe
         _unsubscribe(_channel, msg.sender);
-        return true;
     }
 
     /// @inheritdoc  IPushCommV3
-    function batchUnsubscribe(address[] calldata _channelList) external returns (bool) {
+    function batchUnsubscribe(address[] calldata _channelList) external {
         uint256 channelListLength = _channelList.length;
         for (uint256 i = 0; i < channelListLength;) {
             _unsubscribe(_channelList[i], msg.sender);
             unchecked {
                 i++;
             }
         }
-        return true;
     }
 
     /**
@@ -314,9 +309,8 @@ contract PushCommETHV3 is Initializable, PushCommEthStorageV2, IPushCommV3 {
     }
 
     /// @inheritdoc  IPushCommV3
-    function unSubscribeViaCore(address _channel, address _user) external onlyPushCore returns (bool) {
+    function unSubscribeViaCore(address _channel, address _user) external onlyPushCore {
         _unsubscribe(_channel, _user);
-        return true;
     }
 
     /**
@@ -354,6 +348,7 @@ contract PushCommETHV3 is Initializable, PushCommEthStorageV2, IPushCommV3 {
     /// @inheritdoc  IPushCommV3
     function removeDelegate(address _delegate) external {
         delegatedNotificationSenders[msg.sender][_delegate] = false;
+        _unsubscribe(msg.sender, _delegate);
         emit RemoveDelegate(msg.sender, _delegate);
     }
 

contracts/PushComm/PushCommEthStorageV2.sol

@@ -17,7 +17,7 @@ contract PushCommEthStorageV2 {
      */
     address public governance;
     address public pushChannelAdmin;
-    uint256 public chainID;
+    uint256 public chainID; // Unused Variable
     uint256 public usersCount;
     bool public isMigrationComplete;
     address public PushCoreAddress;

contracts/PushComm/PushCommStorageV2.sol

@@ -22,7 +22,7 @@ contract PushCommStorageV2 {
      */
     address public governance;
     address public pushChannelAdmin;
-    uint256 public chainID;
+    uint256 public chainID; //Unused Variable
     uint256 public usersCount;
     bool public isMigrationComplete;
     address public PushCoreAddress;

contracts/PushComm/PushCommV3.sol

@@ -12,7 +12,7 @@ pragma solidity ^0.8.20;
  * @dev   Some imperative functionalities that the Push Communicator Protocol allows
  *        are Subscribing to a particular channel, Unsubscribing a channel, Sending
  *        Notifications to a particular recipient or all subscribers of a Channel etc.
- *
+ * @Custom:security-contact https://immunefi.com/bug-bounty/pushprotocol/information/
  */
 import { PushCommStorageV2 } from "./PushCommStorageV2.sol";
 import { Errors } from "../libraries/Errors.sol";
@@ -84,7 +84,7 @@ contract PushCommV3 is Initializable, PushCommStorageV2, IPushCommV3, PausableUp
     ***************************** */
 
     function verifyChannelAlias(string memory _channelAddress) external {
-        emit ChannelAlias(chainName, chainID, msg.sender, _channelAddress);
+        emit ChannelAlias(chainName, block.chainid, msg.sender, _channelAddress);
     }
 
 
@@ -130,21 +130,19 @@ contract PushCommV3 is Initializable, PushCommStorageV2, IPushCommV3, PausableUp
     }
 
     /// @inheritdoc IPushCommV3
-    function subscribe(address _channel) external returns (bool) {
+    function subscribe(address _channel) external {
         _subscribe(_channel, msg.sender);
-        return true;
     }
 
     /// @inheritdoc IPushCommV3
-    function batchSubscribe(address[] calldata _channelList) external returns (bool) {
+    function batchSubscribe(address[] calldata _channelList) external {
         uint256 channelListLength = _channelList.length;
         for (uint256 i = 0; i < channelListLength;) {
             _subscribe(_channelList[i], msg.sender);
             unchecked {
                 i++;
             }
         }
-        return true;
     }
 
     /**
@@ -220,9 +218,8 @@ contract PushCommV3 is Initializable, PushCommStorageV2, IPushCommV3, PausableUp
     }
 
     /// @inheritdoc IPushCommV3
-    function subscribeViaCore(address _channel, address _user) external onlyPushCore returns (bool) {
+    function subscribeViaCore(address _channel, address _user) external onlyPushCore {
         _subscribe(_channel, _user);
-        return true;
     }
 
     /* *****************************
@@ -232,22 +229,20 @@ contract PushCommV3 is Initializable, PushCommStorageV2, IPushCommV3, PausableUp
     ***************************** */
 
     /// @inheritdoc IPushCommV3
-    function unsubscribe(address _channel) external returns (bool) {
+    function unsubscribe(address _channel) external {
         // Call actual unsubscribe
         _unsubscribe(_channel, msg.sender);
-        return true;
     }
 
     /// @inheritdoc IPushCommV3
-    function batchUnsubscribe(address[] calldata _channelList) external returns (bool) {
+    function batchUnsubscribe(address[] calldata _channelList) external {
         uint256 channelListLength = _channelList.length;
         for (uint256 i = 0; i < channelListLength;) {
             _unsubscribe(_channelList[i], msg.sender);
             unchecked {
                 i++;
             }
         }
-        return true;
     }
 
     /**
@@ -321,9 +316,8 @@ contract PushCommV3 is Initializable, PushCommStorageV2, IPushCommV3, PausableUp
     }
 
     /// @inheritdoc IPushCommV3
-    function unSubscribeViaCore(address _channel, address _user) external onlyPushCore returns (bool) {
+    function unSubscribeViaCore(address _channel, address _user) external onlyPushCore {
         _unsubscribe(_channel, _user);
-        return true;
     }
 
     /**
@@ -353,15 +347,20 @@ contract PushCommV3 is Initializable, PushCommStorageV2, IPushCommV3, PausableUp
 
     /// @inheritdoc IPushCommV3
     function addDelegate(address _delegate) external {
-        delegatedNotificationSenders[msg.sender][_delegate] = true;
-        _subscribe(msg.sender, _delegate);
-        emit AddDelegate(msg.sender, _delegate);
+        if(delegatedNotificationSenders[msg.sender][_delegate] == false){
+            delegatedNotificationSenders[msg.sender][_delegate] = true;
+            _subscribe(msg.sender, _delegate);
+            emit AddDelegate(msg.sender, _delegate);
+        }
     }
 
     /// @inheritdoc IPushCommV3
     function removeDelegate(address _delegate) external {
-        delegatedNotificationSenders[msg.sender][_delegate] = false;
-        emit RemoveDelegate(msg.sender, _delegate);
+        if(delegatedNotificationSenders[msg.sender][_delegate] == true){
+            delegatedNotificationSenders[msg.sender][_delegate] = false;
+            _unsubscribe(msg.sender, _delegate);
+            emit RemoveDelegate(msg.sender, _delegate);
+        }
     }
 
     /**

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 *** */
@@ -15,6 +15,9 @@ contract PushCoreStorageV2 {
     /**
      * Staking V2 state variables *
      */
+
+    //UNUSED STATE VARIABLES START HERE
+
     mapping(address => uint256) public usersRewardsClaimed;
 
     uint256 public genesisEpoch; // Block number at which Stakig starts
@@ -25,11 +28,13 @@ contract PushCoreStorageV2 {
     uint256 public constant epochDuration = 21 * 7156; // 21 * number of blocks per day(7156) ~ 20 day approx
 
     /// @notice Stores all the individual epoch rewards
-    mapping(uint256 => uint256) public epochRewards;
+    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;
+    mapping(uint256 => uint256) public epochToTotalStakedWeight; 
+
+    //UNUSED STATE VARIABLES END HERE
 
     /**
      * Handling bridged information *
@@ -47,4 +52,5 @@ contract PushCoreStorageV2 {
 
     mapping(bytes32 => CoreTypes.Channel) public channelInfo;    
     mapping(bytes32 => uint256) public channelUpdateCounter;
+    GenericTypes.Percentage public SPLIT_PERCENTAGE_FOR_HOLDER;
 }