chore: release v15 (#608)

Co-authored-by: Lucas Bertrand <lucas.bertrand.22@gmail.com>
Co-authored-by: Christopher Fuka <97121270+CryptoFewka@users.noreply.github.com>
Co-authored-by: Denis Fadeev <denis@fadeev.org>

Author: 4 people

README.md

@@ -70,4 +70,4 @@ This guide covers all steps required to deploy the contracts, including environm
 
 ## Community
 
-[X](https://x.com/zetablockchain) | [Discord](https://discord.com/invite/zetachain) | [Telegram](https://t.me/zetachainofficial) | [Website](https://zetachain.com)
+[X](https://x.com/zetachain) | [Discord](https://discord.com/invite/zetachain) | [Telegram](https://t.me/zetachainofficial) | [Website](https://zetachain.com)

contracts/Revert.sol

@@ -54,7 +54,7 @@ struct AbortContext {
 interface Revertable {
     /// @notice Called when a revertable call is made.
     /// @param revertContext Revert context to pass to onRevert.
-    function onRevert(RevertContext calldata revertContext) external payable;
+    function onRevert(RevertContext calldata revertContext) external;
 }
 
 /// @title Abortable

contracts/evm/GatewayEVM.sol

@@ -38,6 +38,11 @@ contract GatewayEVM is
     /// @notice The address of the Zeta token contract.
     address public zetaToken;
 
+    /// @notice Fee charged for additional cross-chain actions within the same transaction.
+    /// @dev The first action in a transaction is free, subsequent actions incur this fee.
+    /// @dev This is configurable by the admin role to allow for fee adjustments.
+    uint256 public additionalActionFeeWei;
+
     /// @notice New role identifier for tss role.
     bytes32 public constant TSS_ROLE = keccak256("TSS_ROLE");
     /// @notice New role identifier for asset handler role.
@@ -47,6 +52,11 @@ contract GatewayEVM is
     /// @notice Max size of payload + revertOptions revert message.
     uint256 public constant MAX_PAYLOAD_SIZE = 2880;
 
+    /// @notice Storage slot key for tracking transaction action count.
+    /// @dev Uses transient storage (tload/tstore) for gas efficiency.
+    /// @dev Value 0x01 is used as a unique identifier for this storage slot.
+    uint256 private constant _TRANSACTION_ACTION_COUNT_KEY = 0x01;
+
     /// @custom:oz-upgrades-unsafe-allow constructor
     constructor() {
         _disableInitializers();
@@ -99,6 +109,17 @@ contract GatewayEVM is
         _unpause();
     }
 
+    /// @notice Update the additional action fee.
+    /// @dev Only callable by admin role. This allows for fee adjustments based on network conditions.
+    /// @dev Setting fee to 0 disables additional action fees entirely.
+    /// @param newFeeWei The new fee amount in wei for additional actions in the same transaction.
+    /// @dev Fee should be adjusted based on the chain's native token decimals.
+    function updateAdditionalActionFee(uint256 newFeeWei) external onlyRole(DEFAULT_ADMIN_ROLE) {
+        uint256 oldFee = additionalActionFeeWei;
+        additionalActionFeeWei = newFeeWei;
+        emit UpdatedAdditionalActionFee(oldFee, newFeeWei);
+    }
+
     /// @notice Transfers msg.value to destination contract and executes it's onRevert function.
     /// @dev This function can only be called by the TSS address and it is payable.
     /// @param destination Address to call.
@@ -234,18 +255,55 @@ contract GatewayEVM is
     /// @notice Deposits ETH to the TSS address.
     /// @param receiver Address of the receiver.
     /// @param revertOptions Revert options.
+    /// @dev This function only works for the first action in a transaction (backward compatibility).
+    /// @dev For subsequent actions, use the overloaded version with amount parameter.
     function deposit(address receiver, RevertOptions calldata revertOptions) external payable whenNotPaused {
         if (msg.value == 0) revert InsufficientETHAmount();
         if (receiver == address(0)) revert ZeroAddress();
         if (revertOptions.revertMessage.length > MAX_PAYLOAD_SIZE) revert PayloadSizeExceeded();
 
+        // Check if this is a subsequent action (action index > 0)
+        uint256 currentIndex = _getNextActionIndex();
+        if (currentIndex > 0) {
+            revert AdditionalActionDisabled();
+        }
+
+        // Legacy behavior: transfer entire msg.value to TSS (no fee processing)
         (bool deposited,) = tssAddress.call{ value: msg.value }("");
 
         if (!deposited) revert DepositFailed();
 
         emit Deposited(msg.sender, receiver, msg.value, address(0), "", revertOptions);
     }
 
+    /// @notice Deposits ETH to the TSS address with specified amount.
+    /// @param receiver Address of the receiver.
+    /// @param amount Amount of ETH to deposit (excluding fees).
+    /// @param revertOptions Revert options.
+    /// @dev msg.value must equal amount + required fee for the action.
+    function deposit(
+        address receiver,
+        uint256 amount,
+        RevertOptions calldata revertOptions
+    )
+        external
+        payable
+        whenNotPaused
+    {
+        if (amount == 0) revert InsufficientETHAmount();
+        if (receiver == address(0)) revert ZeroAddress();
+        if (revertOptions.revertMessage.length > MAX_PAYLOAD_SIZE) revert PayloadSizeExceeded();
+
+        uint256 feeCharged = _processFee();
+        _validateChargedFeeForETHWithAmount(amount, feeCharged);
+
+        (bool deposited,) = tssAddress.call{ value: amount }("");
+
+        if (!deposited) revert DepositFailed();
+
+        emit Deposited(msg.sender, receiver, amount, address(0), "", revertOptions);
+    }
+
     /// @notice Deposits ERC20 tokens to the custody or connector contract.
     /// @param receiver Address of the receiver.
     /// @param amount Amount of tokens to deposit.
@@ -258,12 +316,16 @@ contract GatewayEVM is
         RevertOptions calldata revertOptions
     )
         external
+        payable
         whenNotPaused
     {
         if (amount == 0) revert InsufficientERC20Amount();
         if (receiver == address(0)) revert ZeroAddress();
         if (revertOptions.revertMessage.length > MAX_PAYLOAD_SIZE) revert PayloadSizeExceeded();
 
+        uint256 feeCharged = _processFee();
+        _validateChargedFeeForERC20(feeCharged);
+
         _transferFromToAssetHandler(msg.sender, asset, amount);
 
         emit Deposited(msg.sender, receiver, amount, asset, "", revertOptions);
@@ -273,6 +335,8 @@ contract GatewayEVM is
     /// @param receiver Address of the receiver.
     /// @param payload Calldata to pass to the call.
     /// @param revertOptions Revert options.
+    /// @dev This function only works for the first action in a transaction (backward compatibility).
+    /// @dev For subsequent actions, use the overloaded version with amount parameter.
     function depositAndCall(
         address receiver,
         bytes calldata payload,
@@ -286,13 +350,50 @@ contract GatewayEVM is
         if (receiver == address(0)) revert ZeroAddress();
         if (payload.length + revertOptions.revertMessage.length > MAX_PAYLOAD_SIZE) revert PayloadSizeExceeded();
 
+        // Check if this is a subsequent action (action index > 0)
+        uint256 currentIndex = _getNextActionIndex();
+        if (currentIndex > 0) {
+            revert AdditionalActionDisabled();
+        }
+
+        // Legacy behavior: transfer entire msg.value to TSS (no fee processing)
         (bool deposited,) = tssAddress.call{ value: msg.value }("");
 
         if (!deposited) revert DepositFailed();
 
         emit DepositedAndCalled(msg.sender, receiver, msg.value, address(0), payload, revertOptions);
     }
 
+    /// @notice Deposits ETH to the TSS address and calls an omnichain smart contract with specified amount.
+    /// @param receiver Address of the receiver.
+    /// @param amount Amount of ETH to deposit (excluding fees).
+    /// @param payload Calldata to pass to the call.
+    /// @param revertOptions Revert options.
+    /// @dev msg.value must equal amount + required fee for the action.
+    function depositAndCall(
+        address receiver,
+        uint256 amount,
+        bytes calldata payload,
+        RevertOptions calldata revertOptions
+    )
+        external
+        payable
+        whenNotPaused
+    {
+        if (amount == 0) revert InsufficientETHAmount();
+        if (receiver == address(0)) revert ZeroAddress();
+        if (payload.length + revertOptions.revertMessage.length > MAX_PAYLOAD_SIZE) revert PayloadSizeExceeded();
+
+        uint256 feeCharged = _processFee();
+        _validateChargedFeeForETHWithAmount(amount, feeCharged);
+
+        (bool deposited,) = tssAddress.call{ value: amount }("");
+
+        if (!deposited) revert DepositFailed();
+
+        emit DepositedAndCalled(msg.sender, receiver, amount, address(0), payload, revertOptions);
+    }
+
     /// @notice Deposits ERC20 tokens to the custody or connector contract and calls an omnichain smart contract.
     /// @param receiver Address of the receiver.
     /// @param amount Amount of tokens to deposit.
@@ -307,12 +408,16 @@ contract GatewayEVM is
         RevertOptions calldata revertOptions
     )
         external
+        payable
         whenNotPaused
     {
         if (amount == 0) revert InsufficientERC20Amount();
         if (receiver == address(0)) revert ZeroAddress();
         if (payload.length + revertOptions.revertMessage.length > MAX_PAYLOAD_SIZE) revert PayloadSizeExceeded();
 
+        uint256 feeCharged = _processFee();
+        _validateChargedFeeForERC20(feeCharged);
+
         _transferFromToAssetHandler(msg.sender, asset, amount);
 
         emit DepositedAndCalled(msg.sender, receiver, amount, asset, payload, revertOptions);
@@ -328,12 +433,16 @@ contract GatewayEVM is
         RevertOptions calldata revertOptions
     )
         external
+        payable
         whenNotPaused
     {
         if (revertOptions.callOnRevert) revert CallOnRevertNotSupported();
         if (receiver == address(0)) revert ZeroAddress();
         if (payload.length + revertOptions.revertMessage.length > MAX_PAYLOAD_SIZE) revert PayloadSizeExceeded();
 
+        uint256 feeCharged = _processFee();
+        _validateChargedFeeForERC20(feeCharged);
+
         emit Called(msg.sender, receiver, payload, revertOptions);
     }
 
@@ -390,7 +499,7 @@ contract GatewayEVM is
     function _transferFromToAssetHandler(address from, address token, uint256 amount) private {
         if (token == zetaToken) {
             // TODO: remove error and comment out code once ZETA supported back
-            // https://github.com/zeta-chain/protocol-contracts/issues/394
+            // https://github.com/zeta-chain/protocol-contracts-evm/issues/394
             // ZETA token is currently not supported for deposit
             revert ZETANotSupported();
 
@@ -472,4 +581,70 @@ contract GatewayEVM is
             }
         }
     }
+
+    /// @notice Processes fee collection for cross-chain actions within a transaction.
+    /// @dev The first action in a transaction is free, subsequent actions incur ADDITIONAL_ACTION_FEE_WEI.
+    /// @dev If fee is 0, the entire functionality is disabled and will revert.
+    /// @return The fee amount actually charged (0 for first action, ADDITIONAL_ACTION_FEE_WEI for
+    /// subsequent actions).
+    function _processFee() internal returns (uint256) {
+        uint256 actionIndex = _getNextActionIndex();
+
+        // First action is free
+        if (actionIndex == 0) {
+            return 0;
+        }
+
+        // If fee is 0, functionality is disabled
+        if (additionalActionFeeWei == 0) {
+            revert AdditionalActionDisabled();
+        }
+
+        // Subsequent actions require fee payment
+        if (msg.value < additionalActionFeeWei) {
+            revert InsufficientFee(additionalActionFeeWei, msg.value);
+        }
+
+        // Transfer fee to TSS address
+        (bool success,) = tssAddress.call{ value: additionalActionFeeWei }("");
+        if (!success) {
+            revert FeeTransferFailed();
+        }
+
+        return additionalActionFeeWei;
+    }
+
+    /// @notice Validates fee payment for ERC20 operations (deposit, depositAndCall, call).
+    /// @dev Validates that msg.value equals the required fee (no excess ETH allowed).
+    /// @param feeCharged The fee amount that was charged.
+    function _validateChargedFeeForERC20(uint256 feeCharged) internal view {
+        // For ERC20 operations, msg.value must equal the required fee
+        if (msg.value > feeCharged) {
+            revert ExcessETHProvided(feeCharged, msg.value);
+        }
+    }
+
+    /// @notice Validates fee payment for ETH operations with specified amount.
+    /// @dev Validates that msg.value equals amount + feeCharged.
+    /// @param amount The amount to deposit (excluding fees).
+    /// @param feeCharged The fee amount that was charged.
+    function _validateChargedFeeForETHWithAmount(uint256 amount, uint256 feeCharged) internal view {
+        uint256 expectedValue = amount + feeCharged;
+        if (msg.value != expectedValue) {
+            revert IncorrectValueProvided(expectedValue, msg.value);
+        }
+    }
+
+    /// @notice Gets and increments the transaction action counter using transient storage.
+    /// @dev Uses assembly for gas efficiency with tload/tstore operations.
+    /// @dev Transient storage is transaction-scoped and automatically cleared after each transaction.
+    /// @return currentIndex The current action index within the transaction (0-based).
+    function _getNextActionIndex() internal returns (uint256 currentIndex) {
+        assembly {
+            // Load current count from transient storage
+            currentIndex := tload(_TRANSACTION_ACTION_COUNT_KEY)
+            // Increment and store back to transient storage
+            tstore(_TRANSACTION_ACTION_COUNT_KEY, add(currentIndex, 1))
+        }
+    }
 }

contracts/evm/ZetaConnectorNative.sol

@@ -28,7 +28,7 @@ contract ZetaConnectorNative is ZetaConnectorBase {
     /// @param to The address to withdraw tokens to.
     /// @param amount The amount of tokens to withdraw.
     //// @param internalSendHash A hash used for internal tracking of the transaction (not used currently
-    // https://github.com/zeta-chain/protocol-contracts/issues/398)
+    // https://github.com/zeta-chain/protocol-contracts-evm/issues/398)
     /// @dev This function can only be called by the TSS address.
     function withdraw(
         address to,
@@ -51,7 +51,7 @@ contract ZetaConnectorNative is ZetaConnectorBase {
     /// @param amount The amount of tokens to withdraw.
     /// @param data The calldata to pass to the contract call.
     //// @param internalSendHash A hash used for internal tracking of the transaction (not used currently
-    // https://github.com/zeta-chain/protocol-contracts/issues/398)
+    // https://github.com/zeta-chain/protocol-contracts-evm/issues/398)
     /// @dev This function can only be called by the TSS address.
     function withdrawAndCall(
         MessageContext calldata messageContext,
@@ -80,7 +80,7 @@ contract ZetaConnectorNative is ZetaConnectorBase {
     /// @param amount The amount of tokens to withdraw.
     /// @param data The calldata to pass to the contract call.
     //// @param internalSendHash A hash used for internal tracking of the transaction (not used currently
-    // https://github.com/zeta-chain/protocol-contracts/issues/398)
+    // https://github.com/zeta-chain/protocol-contracts-evm/issues/398)
     /// @dev This function can only be called by the TSS address.
     /// @param revertContext Revert context to pass to onRevert.
     function withdrawAndRevert(