Non evm support and additional ccr functions integration

contracts/PushComm/PushCommEthStorageV2.sol

@@ -35,7 +35,6 @@ contract PushCommEthStorageV2 {
     // New State Variables
     address public PUSH_TOKEN_ADDRESS;
 
-    mapping(address => CommTypes.ChatDetails) public userChatData;
     mapping(bytes32 => string) public walletToPGP;
     uint256 FEE_AMOUNT;
 }

contracts/PushComm/PushCommStorageV2.sol

@@ -41,7 +41,6 @@ contract PushCommStorageV2 {
     // New State Variables
     IERC20 public PUSH_NTT;
 
-    mapping(address => CommTypes.ChatDetails) public userChatData;
     mapping(bytes32 => string) public walletToPGP;
 
     // WORMHOLE CROSS-CHAIN STATE VARIABLES

contracts/PushComm/PushCommV3.sol

@@ -579,7 +579,10 @@ contract PushCommV3 is Initializable, PushCommStorageV2, IPushCommV3, PausableUp
         whenNotPaused
     {
         // Implement restrictions based on functionType
-        if (functionType == CrossChainRequestTypes.CrossChainFunction.AddChannel) {
+
+        if (functionType == CrossChainRequestTypes.CrossChainFunction.AddChannel || 
+            functionType == CrossChainRequestTypes.CrossChainFunction.CreateChannelSettings ||
+            functionType == CrossChainRequestTypes.CrossChainFunction.ReactivateChannel ) {
             if (amount < ADD_CHANNEL_MIN_FEES) {
                 revert Errors.InvalidArg_LessThanExpected(ADD_CHANNEL_MIN_FEES, amount);
             }
@@ -591,10 +594,7 @@ contract PushCommV3 is Initializable, PushCommStorageV2, IPushCommV3, PausableUp
             if (amount == 0) {
                 revert Errors.InvalidArg_LessThanExpected(1, amount);
             }
-        } else {
-            revert Errors.Comm_InvalidCrossChain_Function();
         }
-
         bytes memory requestPayload = abi.encode(functionType, payload, amount, msg.sender);
 
         // Call the internal function to create the cross-chain request
@@ -614,25 +614,28 @@ contract PushCommV3 is Initializable, PushCommStorageV2, IPushCommV3, PausableUp
 
         uint256 messageBridgeCost = quoteMsgRelayCost(recipientChain, gasLimit);
         uint256 tokenBridgeCost = quoteTokenBridgingCost();
-        if (msg.value < (messageBridgeCost + tokenBridgeCost)) {
+        address coreAddress = EPNSCoreAddress;
+        if (amount != 0) {
+            if (msg.value < (messageBridgeCost + tokenBridgeCost)) {
+                revert Errors.InsufficientFunds();
+            }
+            IERC20 PushNtt = PUSH_NTT;
+            INttManager NttManager = NTT_MANAGER;
+
+            PushNtt.transferFrom(msg.sender, address(this), amount);
+            PushNtt.approve(address(NttManager), amount);
+            NttManager.transfer{ value: tokenBridgeCost }(
+                amount,
+                recipientChain,
+                BaseHelper.addressToBytes32(coreAddress),
+                BaseHelper.addressToBytes32(msg.sender),
+                false,
+                new bytes(1)
+            );
+        } else if (msg.value < (messageBridgeCost)) {
             revert Errors.InsufficientFunds();
         }
 
-        IERC20 PushNtt = PUSH_NTT;
-        INttManager NttManager = NTT_MANAGER;
-        address coreAddress = EPNSCoreAddress;
-
-        PushNtt.transferFrom(msg.sender, address(this), amount);
-        PushNtt.approve(address(NttManager), amount);
-        NttManager.transfer{ value: tokenBridgeCost }(
-            amount,
-            recipientChain,
-            BaseHelper.addressToBytes32(coreAddress),
-            BaseHelper.addressToBytes32(msg.sender),
-            false,
-            new bytes(1)
-        );
-
         // Relay the RequestData Payload
         WORMHOLE_RELAYER.sendPayloadToEvm{ value: messageBridgeCost }(
             recipientChain,

contracts/PushCore/PushCoreStorageV2.sol

@@ -11,7 +11,7 @@ contract PushCoreStorageV2 {
     );
 
     mapping(address => uint256) public nonces; // NOT IN USE Anymore
-    mapping(address => uint256) public channelUpdateCounter;
+    mapping(address => uint256) public oldChannelUpdateCounter;//NOT in use anymore
     /**
      * Staking V2 state variables *
      */
@@ -36,9 +36,6 @@ contract PushCoreStorageV2 {
      */
     mapping(address => uint256) public celebUserFunds;
 
-    /* *** v2.5 State variables *** */
-    address public feePoolStakingContract;
-
     /* *** V3 State variables *** */
     // WORMHOLE Cross-Chain State
 
@@ -48,5 +45,6 @@ contract PushCoreStorageV2 {
     mapping(address => uint256) public arbitraryReqFees; // ToDo: Could be replaced with nonces(unused) mapping instead
         // of adding new state
 
-    mapping(bytes32 => CoreTypes.Channel) public channelInfo;
+    mapping(bytes32 => CoreTypes.Channel) public channelInfo;    
+    mapping(bytes32 => uint256) public channelUpdateCounter;
 }