ERC7984Freezable extension behave like ERC7984

contracts/mocks/token/ERC7984FreezableMock.sol

@@ -28,7 +28,7 @@ contract ERC7984FreezableMock is ERC7984Mock, ERC7984Freezable, AccessControl, H
         address from,
         address to,
         euint64 amount
-    ) internal virtual override(ERC7984Mock, ERC7984Freezable) returns (euint64) {
+    ) internal virtual override(ERC7984, ERC7984Freezable) returns (euint64) {
         return super._update(from, to, amount);
     }
 

contracts/mocks/token/ERC7984Mock.sol

@@ -17,9 +17,9 @@ contract ERC7984Mock is ERC7984, SepoliaConfig {
         _OWNER = msg.sender;
     }
 
-    function _update(address from, address to, euint64 amount) internal virtual override returns (euint64 transferred) {
-        transferred = super._update(from, to, amount);
-        FHE.allow(confidentialTotalSupply(), _OWNER);
+    function confidentialTotalSupplyAccess() public {
+        require(msg.sender == _OWNER);
+        FHE.allow(confidentialTotalSupply(), msg.sender);
     }
 
     function $_mint(

contracts/mocks/token/ERC7984ObserverAccessMock.sol

@@ -4,6 +4,7 @@ pragma solidity ^0.8.27;
 
 import {SepoliaConfig} from "@fhevm/solidity/config/ZamaConfig.sol";
 import {FHE, euint64, externalEuint64} from "@fhevm/solidity/lib/FHE.sol";
+import {ERC7984} from "../../token/ERC7984/ERC7984.sol";
 import {ERC7984ObserverAccess} from "../../token/ERC7984/extensions/ERC7984ObserverAccess.sol";
 import {ERC7984Mock} from "./ERC7984Mock.sol";
 
@@ -18,7 +19,7 @@ contract ERC7984ObserverAccessMock is ERC7984ObserverAccess, ERC7984Mock {
         address from,
         address to,
         euint64 amount
-    ) internal virtual override(ERC7984ObserverAccess, ERC7984Mock) returns (euint64) {
+    ) internal virtual override(ERC7984ObserverAccess, ERC7984) returns (euint64) {
         return super._update(from, to, amount);
     }
 }

contracts/mocks/token/ERC7984VotesMock.sol

@@ -30,11 +30,16 @@ abstract contract ERC7984VotesMock is ERC7984Mock, ERC7984Votes {
         return super.confidentialTotalSupply();
     }
 
+    function getPastTotalSupplyAccess(uint256 timepoint) public {
+        require(msg.sender == _OWNER);
+        FHE.allow(getPastTotalSupply(timepoint), msg.sender);
+    }
+
     function _update(
         address from,
         address to,
         euint64 amount
-    ) internal virtual override(ERC7984Mock, ERC7984Votes) returns (euint64) {
+    ) internal virtual override(ERC7984, ERC7984Votes) returns (euint64) {
         return super._update(from, to, amount);
     }
 

contracts/token/ERC7984/extensions/ERC7984Freezable.sol

@@ -7,7 +7,7 @@ import {FHESafeMath} from "../../../utils/FHESafeMath.sol";
 import {ERC7984} from "../ERC7984.sol";
 
 /**
- * @dev Extension of {ERC7984} that implements a confidential
+ * @dev Extension of {ERC7984} that allows to implement a confidential
  * freezing mechanism that can be managed by an authorized account with
  * {setConfidentialFrozen} functions.
  *
@@ -31,12 +31,8 @@ abstract contract ERC7984Freezable is ERC7984 {
     }
 
     /// @dev Returns the confidential available (unfrozen) balance of an account. Up to {confidentialBalanceOf}.
-    function confidentialAvailable(address account) public virtual returns (euint64) {
-        (ebool success, euint64 unfrozen) = FHESafeMath.tryDecrease(
-            confidentialBalanceOf(account),
-            confidentialFrozen(account)
-        );
-        return FHE.select(success, unfrozen, FHE.asEuint64(0));
+    function confidentialAvailable(address account) public virtual returns (euint64 unfrozen) {
+        (, unfrozen) = FHESafeMath.tryDecrease(confidentialBalanceOf(account), confidentialFrozen(account));
     }
 
     /// @dev Freezes a confidential amount of tokens for an account with a proof.

contracts/utils/FHESafeMath.sol

@@ -31,7 +31,15 @@ library FHESafeMath {
      * and `updated` will be the original value.
      */
     function tryDecrease(euint64 oldValue, euint64 delta) internal returns (ebool success, euint64 updated) {
-        success = FHE.ge(oldValue, delta);
-        updated = FHE.select(success, FHE.sub(oldValue, delta), oldValue);
+        if (!FHE.isInitialized(oldValue)) {
+            success = FHE.asEbool(false);
+            updated = FHE.asEuint64(0);
+        } else if (!FHE.isInitialized(delta)) {
+            success = FHE.asEbool(true);
+            updated = oldValue;
+        } else {
+            success = FHE.ge(oldValue, delta);
+            updated = FHE.select(success, FHE.sub(oldValue, delta), oldValue);
+        }
     }
 }