@coti-io/coti-contracts 1.2.0 → 1.3.1

package/contracts/privacyBridge/PrivacyBridgeCotiNative.sol

@@ -1,201 +1,217 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.20;
 
 import "./PrivacyBridge.sol";
+import "@openzeppelin/contracts/utils/math/Math.sol";
 import "../token/PrivateERC20/tokens/PrivateCOTI.sol";
-import "../token/PrivateERC20/ITokenReceiver.sol";
-import "../utils/mpc/MpcCore.sol";
 
 /**
  * @title PrivacyBridgeCotiNative
  * @notice Bridge contract for converting between native COTI and privacy-preserving COTI.p tokens
+ * @dev Withdraw pulls private balance via `IPrivateERC20(address(privateCoti)).transferFrom` so the call matches
+ *      the canonical {IPrivateERC20} surface (`contracts/token/PrivateERC20/IPrivateERC20.sol`) while `privateCoti`
+ *      remains the concrete {PrivateCOTI} type for mint/burn. Deploy `_privateCoti` as that implementation (or a
+ *      fully ABI-compatible successor); do not point at arbitrary ERC-20s.
+ *
+ *      **Two native deposit paths (document for wallets / indexers):**
+ *      - {deposit(uint256,uint256)}: user passes `cotiOracleTimestamp` and `tokenOracleTimestamp` (same value
+ *        twice for `"COTI"`); {_validateOracleTimestamps} enforces they match the on-chain Band row—same quote row
+ *        as {estimateDepositFee}. Use this when you need binding between off-chain estimate and execution.
+ *      - {receive} / plain ETH send: uses {_directDeposit}; fee still uses {_computeCotiFee} with staleness
+ *        ({_requireOracleFreshness}) but **does not** require equality to estimate timestamps—no prior estimate row
+ *        is pinned. Prefer explicit {deposit} for predictable “what I quoted is what executes.”
+ *
+ *      **Unsolicited native:** balance can increase via `selfdestruct` or other forced transfers without invoking
+ *      {receive}; that ETH does not mint private tokens and does not update {PrivacyBridge.totalUserLiability}.
  */
-contract PrivacyBridgeCotiNative is PrivacyBridge, ITokenReceiver {
+contract PrivacyBridgeCotiNative is PrivacyBridge {
     PrivateCOTI public privateCoti;
 
-    error ExceedsRescueableAmount();
+    event NativeRescued(address indexed to, uint256 amount);
 
     // Scaling factor removed (using native 18 decimals due to uint256 upgrade)
 
     /**
      * @notice Initialize the Native Bridge
      * @param _privateCoti Address of the PrivateCoti token contract
+     * @param _priceOracle Non-zero price oracle (see {PrivacyBridge}'s constructor)
      */
-    constructor(address _privateCoti) PrivacyBridge() {
+    constructor(address _privateCoti, address _feeRecipient, address _rescueRecipient, address _priceOracle) PrivacyBridge(_feeRecipient, _rescueRecipient, _priceOracle) {
         if (_privateCoti == address(0)) revert InvalidAddress();
         privateCoti = PrivateCOTI(_privateCoti);
     }
 
     /**
-     * @notice Internal function to handle deposits
-     * @param sender Address of the depositor
+     * @dev Native COTI fee math + one {getPriceWithMeta("COTI")} read. Used by {_computeCotiFee} and
+     *      {estimateDepositFee}/{estimateWithdrawFee}. Each {Math.mulDiv} truncates toward zero (see
+     *      {PrivacyBridge.FEE_DIVISOR} NatSpec). Extreme `cotiAmount`×`cotiUsdRate` values can make {Math.mulDiv}
+     *      revert—keep amounts within configured max deposit/withdraw limits.
+     * @param cotiAmount Amount in COTI wei the fee is computed for
+     * @param fixedFee Minimum fee floor in COTI wei
+     * @param percentageBps Percentage parameter scaled by {PrivacyBridge.FEE_DIVISOR}
+     * @param maxFee Maximum fee cap in COTI wei
+     * @return fee Computed fee in COTI wei
+     * @return cotiLastUpdated COTI oracle row `lastUpdated`
+     * @return blockTimestamp Third field from the COTI oracle row
      */
-    function _deposit(
-        address sender,
-        bool isEncrypted,
-        itUint256 memory encryptedAmount
-    ) internal {
-        if (!isDepositEnabled) revert DepositDisabled();
-        if (msg.value == 0) revert AmountZero();
-
-        _checkDepositLimits(msg.value);
-
-        // Calculate and deduct deposit fee
-        uint256 feeAmount = _calculateFeeAmount(
-            msg.value,
-            depositFeeBasisPoints
-        );
-        uint256 amountAfterFee = msg.value - feeAmount;
-        accumulatedFees += feeAmount;
-
-        if (isEncrypted) {
-            // Verify parity between msg.value and encrypted amount
-            gtUint256 gtAmount = MpcCore.validateCiphertext(encryptedAmount);
-            gtBool amountMatch = MpcCore.eq(
-                gtAmount,
-                MpcCore.setPublic256(amountAfterFee)
-            );
-            require(MpcCore.decrypt(amountMatch), "Encrypted amount mismatch");
-
-            privateCoti.mintGt(sender, gtAmount);
-        } else {
-            privateCoti.mint(sender, amountAfterFee);
-        }
+    function _computeCotiFeeAndMeta(
+        uint256 cotiAmount,
+        uint256 fixedFee,
+        uint256 percentageBps,
+        uint256 maxFee
+    ) internal view returns (uint256 fee, uint256 cotiLastUpdated, uint256 blockTimestamp) {
+        _requirePriceOracle();
+        (uint256 cotiUsdRate, uint256 cotiLU, uint256 cotiBts) = ICotiPriceConsumer(priceOracle).getPriceWithMeta("COTI");
+        _requirePositiveOracleRate(cotiUsdRate);
+        _requireOracleFreshness(cotiLU);
+        uint256 txValueUsd = Math.mulDiv(cotiAmount, cotiUsdRate, 1e18);
+        uint256 percentageFeeUsd = Math.mulDiv(txValueUsd, percentageBps, FEE_DIVISOR);
+        uint256 percentageFeeCoti = Math.mulDiv(percentageFeeUsd, 1e18, cotiUsdRate);
+        fee = _calculateDynamicFee(percentageFeeCoti, fixedFee, maxFee);
+        cotiLastUpdated = cotiLU;
+        blockTimestamp = cotiBts;
+    }
 
-        // Emit gross deposit amount and net private tokens minted
-        emit Deposit(sender, msg.value, amountAfterFee);
+    function _computeCotiFee(
+        uint256 cotiAmount,
+        uint256 fixedFee,
+        uint256 percentageBps,
+        uint256 maxFee
+    ) internal view returns (uint256) {
+        (uint256 f,,) = _computeCotiFeeAndMeta(cotiAmount, fixedFee, percentageBps, maxFee);
+        return f;
     }
 
     /**
-     * @notice Deposit native COTI to receive private COTI (COTI.p)
-     * @dev User sends native COTI with the transaction
+     * @notice Simulate fee calculation for native COTI with arbitrary parameters.
+     * @dev Public view — allows frontends/operators to preview fees with custom fee params.
+     *      Reads live COTI oracle price but accepts custom fee configuration.
+     * @param cotiAmount The COTI amount to compute fee for (wei; very large values can revert in fee math)
+     * @param fixedFee The minimum fee floor in COTI wei
+     * @param percentageBps The percentage in basis points (relative to {FEE_DIVISOR})
+     * @param maxFee The maximum fee cap in COTI wei
+     * @return The computed fee in COTI wei
      */
-    function deposit() external payable nonReentrant whenNotPaused {
-        _deposit(
-            msg.sender,
-            false,
-            itUint256(ctUint256(ctUint128.wrap(0), ctUint128.wrap(0)), "")
-        );
+    function computeCotiFee(
+        uint256 cotiAmount,
+        uint256 fixedFee,
+        uint256 percentageBps,
+        uint256 maxFee
+    ) external view returns (uint256) {
+        return _computeCotiFee(cotiAmount, fixedFee, percentageBps, maxFee);
     }
 
     /**
-     * @notice Deposit native COTI with an encrypted amount for the private minting event
-     * @param encryptedAmount Encrypted amount to mint
+     * @notice Estimate the deposit fee in COTI for a given COTI amount
+     * @param cotiAmount The amount of native COTI to deposit (wei; very large values can revert in fee math)
+     * @return fee                The estimated fee in COTI wei
+     * @return cotiLastUpdated    COTI oracle data last update timestamp
+     * @return blockTimestamp     Third field from the COTI oracle row (same as pre-refactor behavior)
+     * @dev Use `cotiLastUpdated` for **both** `cotiOracleTimestamp` and `tokenOracleTimestamp` on {deposit}/{withdraw}
+     *      (native bridge validates `"COTI"` twice). See {PrivacyBridge._validateOracleTimestamps}.
      */
-    function deposit(itUint256 calldata encryptedAmount) external payable nonReentrant whenNotPaused {
-        _deposit(msg.sender, true, encryptedAmount);
+    function estimateDepositFee(uint256 cotiAmount) external view returns (uint256 fee, uint256 cotiLastUpdated, uint256 blockTimestamp) {
+        (fee, cotiLastUpdated, blockTimestamp) = _computeCotiFeeAndMeta(
+            cotiAmount,
+            depositFixedFee,
+            depositPercentageBps,
+            depositMaxFee
+        );
     }
 
     /**
-     * @notice Withdraw native COTI by burning private COTI
-     * @param amount Amount of private COTI to burn
-     * @dev User must have approved the bridge to spend their private tokens.
+     * @notice Estimate the withdrawal fee in COTI for a given COTI amount
+     * @param cotiAmount The amount of native COTI to withdraw (wei; very large values can revert in fee math)
+     * @return fee                The estimated fee in COTI wei
+     * @return cotiLastUpdated    COTI oracle data last update timestamp
+     * @return blockTimestamp     Third field from the COTI oracle row (same as pre-refactor behavior)
+     * @dev Same timestamp usage as {estimateDepositFee} for the subsequent {withdraw}.
      */
+    function estimateWithdrawFee(uint256 cotiAmount) external view returns (uint256 fee, uint256 cotiLastUpdated, uint256 blockTimestamp) {
+        (fee, cotiLastUpdated, blockTimestamp) = _computeCotiFeeAndMeta(
+            cotiAmount,
+            withdrawFixedFee,
+            withdrawPercentageBps,
+            withdrawMaxFee
+        );
+    }
+
     /**
-     * @notice Handle callback from PrivateCoti.transferAndCall
-     * @dev Called when user transfers tokens to the bridge to withdraw. Third parameter (data) is required by ITokenReceiver but unused.
-     * @param from Address of the sender
-     * @param amount Amount of tokens received
+     * @notice Internal function to handle deposits
+     * @param sender Address of the depositor
      */
-    function onTokenReceived(
-        address from,
-        uint256 amount,
-        bytes calldata
-    ) external nonReentrant whenNotPaused returns (bool) {
-        if (msg.sender != address(privateCoti)) revert InvalidAddress();
-        if (amount == 0) revert AmountZero();
-
-        _checkWithdrawLimits(amount);
+    function _deposit(address sender, uint256 cotiOracleTimestamp, uint256 tokenOracleTimestamp) internal {
+        if (!isDepositEnabled) revert DepositDisabled();
+        if (msg.value == 0) revert AmountZero();
 
-        // Calculate fee
-        uint256 feeAmount = _calculateFeeAmount(amount, withdrawFeeBasisPoints);
-        uint256 publicAmount = amount - feeAmount;
-        accumulatedFees += feeAmount;
+        _checkDepositLimits(msg.value);
+        _validateOracleTimestamps(cotiOracleTimestamp, tokenOracleTimestamp, "COTI");
 
-        if (address(this).balance < publicAmount)
-            revert InsufficientEthBalance();
+        // Compute dynamic fee in COTI
+        uint256 fee = _computeCotiFee(msg.value, depositFixedFee, depositPercentageBps, depositMaxFee);
+        uint256 netAmount = msg.value - fee;
+        if (netAmount == 0) revert AmountZero();
 
-        // Private tokens are already transferred to this contract by transferAndCall
-        // We just need to burn them.
-        privateCoti.burn(amount);
+        accumulatedCotiFees += fee;
 
-        (bool success, ) = from.call{value: publicAmount}("");
-        if (!success) revert EthTransferFailed();
+        totalUserLiability += netAmount;
+        privateCoti.mint(sender, netAmount);
 
-        // Emit gross private amount burned and net native COTI sent
-        emit Withdraw(from, amount, publicAmount);
-        return true;
+        // Emit gross deposit amount and net private tokens minted
+        emit Deposit(sender, msg.value, netAmount);
     }
 
     /**
-     * @notice Withdraw native COTI by burning private COTI
-     * @param amount Amount of private COTI to burn
-     * @dev User must have approved the bridge to spend their private tokens.
+     * @notice Deposit native COTI to receive private COTI (COTI.p)
+     * @param cotiOracleTimestamp COTI `lastUpdated` from the latest `estimateDepositFee` (must still equal on-chain at execution).
+     * @param tokenOracleTimestamp Same value as `cotiOracleTimestamp` for this bridge (both checks use `"COTI"`).
+     * @dev User sends native COTI with the transaction. Oracle races: {OracleTimestampMismatch} — re-estimate; see {_validateOracleTimestamps}.
      */
-    function withdraw(uint256 amount) external nonReentrant whenNotPaused {
-        _withdraw(
-            msg.sender,
-            amount,
-            false,
-            itUint256(ctUint256(ctUint128.wrap(0), ctUint128.wrap(0)), "")
-        );
+    function deposit(uint256 cotiOracleTimestamp, uint256 tokenOracleTimestamp) external payable nonReentrant whenNotPaused notBlacklisted {
+        _deposit(msg.sender, cotiOracleTimestamp, tokenOracleTimestamp);
     }
 
     /**
-     * @notice Withdraw native COTI by burning private COTI with an encrypted amount
-     * @param amount Public amount to release
-     * @param encryptedAmount Encrypted amount to burn
+     * @notice Withdraw native COTI by burning private COTI
+     * @param amount Amount of private COTI to burn
+     * @param cotiOracleTimestamp COTI `lastUpdated` from the latest `estimateWithdrawFee` (must still equal on-chain at execution).
+     * @param tokenOracleTimestamp Same value as `cotiOracleTimestamp` for this bridge.
+     * @dev User must have approved the bridge to spend their private tokens. Oracle rules: {_validateOracleTimestamps}.
      */
-    function withdraw(
-        uint256 amount,
-        itUint256 calldata encryptedAmount
-    ) external nonReentrant whenNotPaused {
-        _withdraw(msg.sender, amount, true, encryptedAmount);
+    function withdraw(uint256 amount, uint256 cotiOracleTimestamp, uint256 tokenOracleTimestamp) external nonReentrant whenNotPaused notBlacklisted {
+        _withdraw(msg.sender, amount, cotiOracleTimestamp, tokenOracleTimestamp);
     }
 
     function _withdraw(
         address to,
         uint256 amount,
-        bool isEncrypted,
-        itUint256 memory encryptedAmount
+        uint256 cotiOracleTimestamp,
+        uint256 tokenOracleTimestamp
     ) internal {
         if (amount == 0) revert AmountZero();
         _checkWithdrawLimits(amount);
+        _validateOracleTimestamps(cotiOracleTimestamp, tokenOracleTimestamp, "COTI");
 
-        // Calculate fee on the public side
-        uint256 feeAmount = _calculateFeeAmount(amount, withdrawFeeBasisPoints);
-        uint256 publicAmount = amount - feeAmount;
-        accumulatedFees += feeAmount;
+        // Compute dynamic withdrawal fee in COTI
+        uint256 fee = _computeCotiFee(amount, withdrawFixedFee, withdrawPercentageBps, withdrawMaxFee);
+        uint256 publicAmount = amount - fee;
+        if (publicAmount == 0) revert AmountZero();
+
+        accumulatedCotiFees += fee;
 
         if (address(this).balance < publicAmount)
             revert InsufficientEthBalance();
 
-        if (isEncrypted) {
-            // Verify parity
-            gtUint256 gtAmount = MpcCore.validateCiphertext(encryptedAmount);
-            gtBool amountMatch = MpcCore.eq(
-                gtAmount,
-                MpcCore.setPublic256(amount)
-            );
-            require(MpcCore.decrypt(amountMatch), "Encrypted amount mismatch");
-
-            // Use already-validated gt handle so PrivateCOTI does not re-call
-            // validateCiphertext with a different contract context (signature mismatch)
-            IPrivateERC20(address(privateCoti)).transferFromGT(
-                msg.sender,
-                address(this),
-                gtAmount
-            );
-            privateCoti.burnGt(gtAmount);
-        } else {
-            // Standard withdrawal (public amount)
-            IPrivateERC20(address(privateCoti)).transferFrom(
-                msg.sender,
-                address(this),
-                amount
-            );
-            privateCoti.burn(amount);
-        }
+        // Extinguish liability for the full private amount burned (fee stays with bridge as native revenue).
+        totalUserLiability -= amount;
+
+        // Pull and burn private tokens
+        IPrivateERC20(address(privateCoti)).transferFrom(
+            msg.sender,
+            address(this),
+            amount
+        );
+        privateCoti.burn(amount);
 
         (bool success, ) = to.call{value: publicAmount}("");
         if (!success) revert EthTransferFailed();
@@ -204,14 +220,38 @@ contract PrivacyBridgeCotiNative is PrivacyBridge, ITokenReceiver {
     }
 
     /**
-     * @notice Fallback function to handle direct COTI transfers as deposits
+     * @notice Internal deposit without binding to a prior estimate’s oracle `lastUpdated` snapshot.
+     * @dev Used by {receive}. Fee uses {_computeCotiFee}, which still enforces: oracle configured
+     *      ({PriceOracleNotSet}), non-zero COTI/USD rate ({InvalidOraclePrice}), and max age of
+     *      `lastUpdated` when {PrivacyBridge.maxOracleAge} is set ({OraclePriceStale} /
+     *      {OracleLastUpdatedInFuture}). What plain sends do **not** do is equality to timestamps
+     *      passed into {deposit} from an off-chain estimate—users who need that binding should call {deposit}.
      */
-    receive() external payable nonReentrant whenNotPaused {
-        _deposit(
-            msg.sender,
-            false,
-            itUint256(ctUint256(ctUint128.wrap(0), ctUint128.wrap(0)), "")
-        );
+    function _directDeposit(address sender) internal {
+        if (!isDepositEnabled) revert DepositDisabled();
+        if (msg.value == 0) revert AmountZero();
+
+        _checkDepositLimits(msg.value);
+
+        uint256 fee = _computeCotiFee(msg.value, depositFixedFee, depositPercentageBps, depositMaxFee);
+        uint256 netAmount = msg.value - fee;
+        if (netAmount == 0) revert AmountZero();
+
+        accumulatedCotiFees += fee;
+
+        totalUserLiability += netAmount;
+        privateCoti.mint(sender, netAmount);
+
+        emit Deposit(sender, msg.value, netAmount);
+    }
+
+    /**
+     * @notice Fallback for plain native transfers: same fee path as {_directDeposit}.
+     * @dev See {_directDeposit}: zero/stale oracle rates are rejected via {_computeCotiFee}; use {deposit}
+     *      when you must match `lastUpdated` from {estimateDepositFee} to the on-chain row (see {_validateOracleTimestamps}).
+     */
+    receive() external payable nonReentrant whenNotPaused notBlacklisted {
+        _directDeposit(msg.sender);
     }
 
     /**
@@ -223,46 +263,54 @@ contract PrivacyBridgeCotiNative is PrivacyBridge, ITokenReceiver {
     }
 
     /**
-     * @notice Withdraw accumulated fees (Native implementation)
-     * @param to Address to send fees to
+     * @notice Withdraw accumulated fees to feeRecipient (Native implementation)
      * @param amount Amount of fees to withdraw
      * @dev Only the owner can call this function
      */
     function withdrawFees(
-        address to,
         uint256 amount
-    ) external override onlyOperator {
-        if (to == address(0)) revert InvalidAddress();
+    ) external onlyOwner nonReentrant {
+        if (feeRecipient == address(0)) revert FeeRecipientNotSet();
         if (amount == 0) revert AmountZero();
-        if (amount > accumulatedFees) revert InsufficientAccumulatedFees();
+        if (amount > accumulatedCotiFees) revert InsufficientAccumulatedFees();
         if (amount > address(this).balance) revert InsufficientEthBalance();
 
-        accumulatedFees -= amount;
+        accumulatedCotiFees -= amount;
 
-        // Transfer native COTI tokens
-        (bool success, ) = to.call{value: amount}("");
+        // Transfer native COTI tokens to feeRecipient
+        (bool success, ) = feeRecipient.call{value: amount}("");
         if (!success) revert EthTransferFailed();
 
-        emit FeesWithdrawn(to, amount);
+        emit FeesWithdrawn(feeRecipient, amount);
     }
 
     /**
-     * @dev Rescue native COTI coins mistakenly sent to the contract.
-     *      Only excess over the accumulated fee reserve can be rescued.
-     *      Owner must NOT rescue amounts that would remove liquidity needed for user withdrawals;
-     *      doing so would break withdraw() and onTokenReceived() until new deposits restore balance.
-     * @param to Address to send the coins to
-     * @param amount Amount of coins to rescue
-     * @notice Only the owner can call this function
+     * @notice Move native COTI from this bridge to {rescueRecipient} while the bridge is paused.
+     * @dev Emergency / migration path: sends up to `amount` (typically the full {address(this).balance}) to
+     *      {rescueRecipient}. That balance can include all user-deposited native liquidity and unswept fee
+     *      float—there is no on-chain carve-out that keeps “user principal” behind. Intended for bug recovery
+     *      or handover to a new bridge; a malicious or compromised owner who has paused can drain TVL to
+     *      {rescueRecipient} in one or more calls. See {PrivacyBridge} contract-level @dev (3) for governance
+     *      mitigations (multisig, timelock, monitoring). After a partial rescue, {accumulatedCotiFees} is capped
+     *      to the remaining balance so fee accounting cannot exceed what is still on the contract. {totalUserLiability}
+     *      is **not** adjusted: rescue only moves native to {rescueRecipient}; it does not burn private tokens or
+     *      reduce user obligations on this contract, so the counter may exceed {address(this).balance} until a
+     *      separate migration makes users whole.
+     * @param amount Amount of native currency to send (often the full balance for migration).
      */
-    function rescueNative(address to, uint256 amount) external onlyOwner {
-        if (to == address(0)) revert InvalidAddress();
+    function rescueNative(uint256 amount) external onlyOwner nonReentrant whenPaused {
         if (amount == 0) revert AmountZero();
         if (amount > address(this).balance) revert InsufficientEthBalance();
-        if (address(this).balance < accumulatedFees) revert InsufficientEthBalance();
-        if (amount > address(this).balance - accumulatedFees) revert ExceedsRescueableAmount();
 
-        (bool success, ) = to.call{value: amount}("");
+        (bool success, ) = rescueRecipient.call{value: amount}("");
         if (!success) revert EthTransferFailed();
+
+        uint256 remaining = address(this).balance;
+        if (accumulatedCotiFees > remaining) {
+            accumulatedCotiFees = remaining;
+        }
+
+        emit NativeRescued(rescueRecipient, amount);
     }
+
 }