forge fmt

fadeev · fadeev · commit 9e01eaef7129 · 2025-10-20T15:48:55.000+03:00
diff --git a/contracts/evm/Registry.sol b/contracts/evm/Registry.sol
@@ -176,7 +176,14 @@ contract Registry is BaseRegistry, IRegistry {
     /// @param chainId The ID of the chain where the contract is deployed
     /// @param contractType The type of the contract
     /// @param active Whether the contract should be active
-    function setContractActive(uint256 chainId, string calldata contractType, bool active) external onlyRegistry {
+    function setContractActive(
+        uint256 chainId,
+        string calldata contractType,
+        bool active
+    )
+        external
+        onlyRegistry
+    {
         _setContractActive(chainId, contractType, active);
         emit ContractStatusChanged(_contracts[chainId][contractType].addressBytes);
     }
diff --git a/contracts/evm/interfaces/IGatewayEVM.sol b/contracts/evm/interfaces/IGatewayEVM.sol
@@ -183,7 +183,13 @@ interface IGatewayEVM is IGatewayEVMErrors, IGatewayEVMEvents {
     /// @param amount Amount of tokens to deposit.
     /// @param asset Address of the ERC20 token.
     /// @param revertOptions Revert options.
-    function deposit(address receiver, uint256 amount, address asset, RevertOptions calldata revertOptions) external;
+    function deposit(
+        address receiver,
+        uint256 amount,
+        address asset,
+        RevertOptions calldata revertOptions
+    )
+        external;
 
     /// @notice Deposits ETH to the TSS address and calls an omnichain smart contract.
     /// @param receiver Address of the receiver.
@@ -227,5 +233,11 @@ struct MessageContext {
 
 /// @notice Interface implemented by contracts receiving authenticated calls.
 interface Callable {
-    function onCall(MessageContext calldata context, bytes calldata message) external payable returns (bytes memory);
+    function onCall(
+        MessageContext calldata context,
+        bytes calldata message
+    )
+        external
+        payable
+        returns (bytes memory);
 }
diff --git a/contracts/evm/legacy/ZetaConnector.base.sol b/contracts/evm/legacy/ZetaConnector.base.sol
@@ -174,8 +174,7 @@ contract ZetaConnectorBase is ConnectorErrors, Pausable {
         bytes32 internalSendHash
     )
         external
-        virtual
-    { }
+        virtual { }
 
     /**
      * @dev Handler to receive errors from other chain.
@@ -191,6 +190,5 @@ contract ZetaConnectorBase is ConnectorErrors, Pausable {
         bytes32 internalSendHash
     )
         external
-        virtual
-    { }
+        virtual { }
 }
diff --git a/contracts/evm/legacy/ZetaConnector.eth.sol b/contracts/evm/legacy/ZetaConnector.eth.sol
@@ -68,9 +68,12 @@ contract ZetaConnectorEth is ZetaConnectorBase {
         if (!success) revert ZetaTransferError();
 
         if (message.length > 0) {
-            ZetaReceiver(destinationAddress).onZetaMessage(
-                ZetaInterfaces.ZetaMessage(zetaTxSenderAddress, sourceChainId, destinationAddress, zetaValue, message)
-            );
+            ZetaReceiver(destinationAddress)
+                .onZetaMessage(
+                    ZetaInterfaces.ZetaMessage(
+                        zetaTxSenderAddress, sourceChainId, destinationAddress, zetaValue, message
+                    )
+                );
         }
 
         emit ZetaReceived(zetaTxSenderAddress, sourceChainId, destinationAddress, zetaValue, message, internalSendHash);
@@ -99,16 +102,17 @@ contract ZetaConnectorEth is ZetaConnectorBase {
         if (!success) revert ZetaTransferError();
 
         if (message.length > 0) {
-            ZetaReceiver(zetaTxSenderAddress).onZetaRevert(
-                ZetaInterfaces.ZetaRevert(
-                    zetaTxSenderAddress,
-                    sourceChainId,
-                    destinationAddress,
-                    destinationChainId,
-                    remainingZetaValue,
-                    message
-                )
-            );
+            ZetaReceiver(zetaTxSenderAddress)
+                .onZetaRevert(
+                    ZetaInterfaces.ZetaRevert(
+                        zetaTxSenderAddress,
+                        sourceChainId,
+                        destinationAddress,
+                        destinationChainId,
+                        remainingZetaValue,
+                        message
+                    )
+                );
         }
 
         emit ZetaReverted(
diff --git a/contracts/evm/legacy/ZetaConnector.non-eth.sol b/contracts/evm/legacy/ZetaConnector.non-eth.sol
@@ -77,9 +77,12 @@ contract ZetaConnectorNonEth is ZetaConnectorBase {
         IZetaNonEthInterface(zetaToken).mint(destinationAddress, zetaValue, internalSendHash);
 
         if (message.length > 0) {
-            ZetaReceiver(destinationAddress).onZetaMessage(
-                ZetaInterfaces.ZetaMessage(zetaTxSenderAddress, sourceChainId, destinationAddress, zetaValue, message)
-            );
+            ZetaReceiver(destinationAddress)
+                .onZetaMessage(
+                    ZetaInterfaces.ZetaMessage(
+                        zetaTxSenderAddress, sourceChainId, destinationAddress, zetaValue, message
+                    )
+                );
         }
 
         emit ZetaReceived(zetaTxSenderAddress, sourceChainId, destinationAddress, zetaValue, message, internalSendHash);
@@ -111,16 +114,17 @@ contract ZetaConnectorNonEth is ZetaConnectorBase {
         IZetaNonEthInterface(zetaToken).mint(zetaTxSenderAddress, remainingZetaValue, internalSendHash);
 
         if (message.length > 0) {
-            ZetaReceiver(zetaTxSenderAddress).onZetaRevert(
-                ZetaInterfaces.ZetaRevert(
-                    zetaTxSenderAddress,
-                    sourceChainId,
-                    destinationAddress,
-                    destinationChainId,
-                    remainingZetaValue,
-                    message
-                )
-            );
+            ZetaReceiver(zetaTxSenderAddress)
+                .onZetaRevert(
+                    ZetaInterfaces.ZetaRevert(
+                        zetaTxSenderAddress,
+                        sourceChainId,
+                        destinationAddress,
+                        destinationChainId,
+                        remainingZetaValue,
+                        message
+                    )
+                );
         }
 
         emit ZetaReverted(
diff --git a/contracts/helpers/BaseRegistry.sol b/contracts/helpers/BaseRegistry.sol
@@ -101,7 +101,14 @@ abstract contract BaseRegistry is
     /// @param gasZRC20 The address of the ZRC20 token that represents gas token for the chain.
     /// @param registry Address of the Registry contract on the connected chain.
     /// @param activation Whether activate or deactivate the chain
-    function _changeChainStatus(uint256 chainId, address gasZRC20, bytes calldata registry, bool activation) internal {
+    function _changeChainStatus(
+        uint256 chainId,
+        address gasZRC20,
+        bytes calldata registry,
+        bool activation
+    )
+        internal
+    {
         // In the case chain is already activated
         if (_chains[chainId].active && activation) revert ChainActive(chainId);
         // In the case chain is inactive
@@ -140,7 +147,13 @@ abstract contract BaseRegistry is
     /// @param chainId The ID of the chain where the contract is deployed.
     /// @param contractType The type of the contract (e.g., "connector", "gateway").
     /// @param addressBytes The bytes representation of the non-EVM address.
-    function _registerContract(uint256 chainId, string calldata contractType, bytes calldata addressBytes) internal {
+    function _registerContract(
+        uint256 chainId,
+        string calldata contractType,
+        bytes calldata addressBytes
+    )
+        internal
+    {
         // Validate inputs
         if (!_chains[chainId].active) revert ChainNonActive(chainId);
         if (bytes(contractType).length == 0) revert InvalidContractType(contractType);
diff --git a/contracts/helpers/interfaces/IBaseRegistry.sol b/contracts/helpers/interfaces/IBaseRegistry.sol
@@ -193,7 +193,13 @@ interface IBaseRegistry is IBaseRegistryErrors, IBaseRegistryEvents {
     /// @param chainId The ID of the chain to activate.
     /// @param gasZRC20 The address of the ZRC20 token that represents gas token for the chain.
     /// @param activation Whether activate or deactivate a chain
-    function changeChainStatus(uint256 chainId, address gasZRC20, bytes calldata registry, bool activation) external;
+    function changeChainStatus(
+        uint256 chainId,
+        address gasZRC20,
+        bytes calldata registry,
+        bool activation
+    )
+        external;
 
     /// @notice Updates chain metadata.
     /// @param chainId The ID of the chain.
@@ -209,7 +215,12 @@ interface IBaseRegistry is IBaseRegistryErrors, IBaseRegistryEvents {
     /// @param chainId The ID of the chain where the contract is deployed.
     /// @param contractType The type of the contract (e.g., "connector", "gateway").
     /// @param addressBytes The bytes representation of the non-EVM address.
-    function registerContract(uint256 chainId, string calldata contractType, bytes calldata addressBytes) external;
+    function registerContract(
+        uint256 chainId,
+        string calldata contractType,
+        bytes calldata addressBytes
+    )
+        external;
 
     /// @notice Updates contract configuration.
     /// @param chainId The ID of the chain where the contract is deployed.
diff --git a/contracts/zevm/CoreRegistry.sol b/contracts/zevm/CoreRegistry.sol
@@ -259,7 +259,13 @@ contract CoreRegistry is BaseRegistry {
     /// @param chainId The ID of the chain where the contract is deployed
     /// @notice contractType The type of the contract
     /// @notice active Whether the contract should be active
-    function _broadcastContractStatusUpdate(uint256 chainId, string calldata contractType, bool active) private {
+    function _broadcastContractStatusUpdate(
+        uint256 chainId,
+        string calldata contractType,
+        bool active
+    )
+        private
+    {
         // Encode the function call for the Registry contract on the target chain
         bytes memory message =
             abi.encodeWithSignature("setContractActive(uint256,string,bool)", chainId, contractType, active);
diff --git a/contracts/zevm/GatewayZEVM.sol b/contracts/zevm/GatewayZEVM.sol
@@ -107,7 +107,14 @@ contract GatewayZEVM is
     /// @param zrc20 The address of the ZRC20 token.
     /// @param gasLimit Gas limit.
     /// @return The gas fee for the withdrawal.
-    function _withdrawZRC20WithGasLimit(uint256 amount, address zrc20, uint256 gasLimit) private returns (uint256) {
+    function _withdrawZRC20WithGasLimit(
+        uint256 amount,
+        address zrc20,
+        uint256 gasLimit
+    )
+        private
+        returns (uint256)
+    {
         (address gasZRC20, uint256 gasFee) = IZRC20(zrc20).withdrawGasFeeWithGasLimit(gasLimit);
         if (!IZRC20(gasZRC20).transferFrom(msg.sender, PROTOCOL_ADDRESS, gasFee)) {
             revert GasFeeTransferFailed();
diff --git a/contracts/zevm/legacy/ZetaConnectorZEVM.sol b/contracts/zevm/legacy/ZetaConnectorZEVM.sol
@@ -137,7 +137,9 @@ contract ZetaConnectorZEVM {
      */
     function send(ZetaInterfaces.SendInput calldata input) external {
         // Transfer wzeta to "fungible" module, which will be burnt by the protocol post processing via hooks.
-        if (!IWETH9(wzeta).transferFrom(msg.sender, address(this), input.zetaValueAndGas)) revert WZETATransferFailed();
+        if (!IWETH9(wzeta).transferFrom(msg.sender, address(this), input.zetaValueAndGas)) {
+            revert WZETATransferFailed();
+        }
         IWETH9(wzeta).withdraw(input.zetaValueAndGas);
         (bool sent,) = FUNGIBLE_MODULE_ADDRESS.call{ value: input.zetaValueAndGas }("");
         if (!sent) revert FailedZetaSent();
@@ -176,9 +178,12 @@ contract ZetaConnectorZEVM {
         if (!IWETH9(wzeta).transferFrom(address(this), destinationAddress, zetaValue)) revert WZETATransferFailed();
 
         if (message.length > 0) {
-            ZetaReceiver(destinationAddress).onZetaMessage(
-                ZetaInterfaces.ZetaMessage(zetaTxSenderAddress, sourceChainId, destinationAddress, zetaValue, message)
-            );
+            ZetaReceiver(destinationAddress)
+                .onZetaMessage(
+                    ZetaInterfaces.ZetaMessage(
+                        zetaTxSenderAddress, sourceChainId, destinationAddress, zetaValue, message
+                    )
+                );
         }
 
         emit ZetaReceived(zetaTxSenderAddress, sourceChainId, destinationAddress, zetaValue, message, internalSendHash);
@@ -209,16 +214,17 @@ contract ZetaConnectorZEVM {
         }
 
         if (message.length > 0) {
-            ZetaReceiver(zetaTxSenderAddress).onZetaRevert(
-                ZetaInterfaces.ZetaRevert(
-                    zetaTxSenderAddress,
-                    sourceChainId,
-                    destinationAddress,
-                    destinationChainId,
-                    remainingZetaValue,
-                    message
-                )
-            );
+            ZetaReceiver(zetaTxSenderAddress)
+                .onZetaRevert(
+                    ZetaInterfaces.ZetaRevert(
+                        zetaTxSenderAddress,
+                        sourceChainId,
+                        destinationAddress,
+                        destinationChainId,
+                        remainingZetaValue,
+                        message
+                    )
+                );
         }
 
         emit ZetaReverted(
diff --git a/test/CoreRegistry.t.sol b/test/CoreRegistry.t.sol
@@ -53,12 +53,10 @@ contract CoreRegistryTest is Test, IBaseRegistryErrors, IBaseRegistryEvents {
 
         mockGateway = new MockGatewayZEVM();
 
-        proxy = payable(
-            Upgrades.deployUUPSProxy(
+        proxy = payable(Upgrades.deployUUPSProxy(
                 "CoreRegistry.sol",
                 abi.encodeCall(CoreRegistry.initialize, (admin, registryManager, address(mockGateway)))
-            )
-        );
+            ));
         registry = CoreRegistry(proxy);
 
         protocolAddress = mockGateway.PROTOCOL_ADDRESS();
diff --git a/test/ERC20Custody.t.sol b/test/ERC20Custody.t.sol
@@ -308,8 +308,9 @@ contract ERC20CustodyTest is Test, IGatewayEVMErrors, IGatewayEVMEvents, IReceiv
 
     function testForwardCallToReceiveERC20PartialThroughCustody() public {
         uint256 amount = 100_000;
-        bytes memory data =
-            abi.encodeWithSignature("receiveERC20Partial(uint256,address,address)", amount, address(token), destination);
+        bytes memory data = abi.encodeWithSignature(
+            "receiveERC20Partial(uint256,address,address)", amount, address(token), destination
+        );
         uint256 balanceBefore = token.balanceOf(destination);
         assertEq(balanceBefore, 0);
         uint256 balanceBeforeCustody = token.balanceOf(address(custody));
@@ -394,8 +395,9 @@ contract ERC20CustodyTest is Test, IGatewayEVMErrors, IGatewayEVMEvents, IReceiv
 
     function testForwardCallToReceiveERC20PartialThroughCustodyFailsIfSenderIsNotWithdrawer() public {
         uint256 amount = 100_000;
-        bytes memory data =
-            abi.encodeWithSignature("receiveERC20Partial(uint256,address,address)", amount, address(token), destination);
+        bytes memory data = abi.encodeWithSignature(
+            "receiveERC20Partial(uint256,address,address)", amount, address(token), destination
+        );
 
         vm.prank(owner);
         vm.expectRevert(abi.encodeWithSelector(AccessControlUnauthorizedAccount.selector, owner, WITHDRAWER_ROLE));
@@ -404,8 +406,9 @@ contract ERC20CustodyTest is Test, IGatewayEVMErrors, IGatewayEVMEvents, IReceiv
 
     function testForwardCallToReceiveERC20PartialThroughCustodyFailsIfAmountIs0() public {
         uint256 amount = 0;
-        bytes memory data =
-            abi.encodeWithSignature("receiveERC20Partial(uint256,address,address)", amount, address(token), destination);
+        bytes memory data = abi.encodeWithSignature(
+            "receiveERC20Partial(uint256,address,address)", amount, address(token), destination
+        );
 
         vm.prank(tssAddress);
         vm.expectRevert(InsufficientERC20Amount.selector);
diff --git a/test/GatewayEVM.t.sol b/test/GatewayEVM.t.sol
@@ -440,13 +440,7 @@ contract GatewayEVMTest is Test, IGatewayEVMErrors, IGatewayEVMEvents, IReceiver
     }
 }
 
-contract GatewayEVMInboundTest is
-    Test,
-    IGatewayEVMErrors,
-    IGatewayEVMEvents,
-    IReceiverEVMEvents,
-    INotSupportedMethods
-{
+contract GatewayEVMInboundTest is Test, IGatewayEVMErrors, IGatewayEVMEvents, IReceiverEVMEvents, INotSupportedMethods {
     using SafeERC20 for IERC20;
 
     address proxy;
diff --git a/test/GatewayEVMZEVM.t.sol b/test/GatewayEVMZEVM.t.sol
@@ -102,11 +102,9 @@ contract GatewayEVMZEVMTest is
         receiverEVM = new ReceiverEVM();
 
         // zevm
-        proxyZEVM = payable(
-            Upgrades.deployUUPSProxy(
+        proxyZEVM = payable(Upgrades.deployUUPSProxy(
                 "GatewayZEVM.sol", abi.encodeCall(GatewayZEVM.initialize, (address(zeta), ownerZEVM))
-            )
-        );
+            ));
         gatewayZEVM = GatewayZEVM(proxyZEVM);
 
         senderZEVM = new SenderZEVM(address(gatewayZEVM));
diff --git a/test/GatewayZEVM.t.sol b/test/GatewayZEVM.t.sol
diff --git a/test/Registry.t.sol b/test/Registry.t.sol
diff --git a/test/ZRC20.t.sol b/test/ZRC20.t.sol
diff --git a/test/utils/SenderZEVM.sol b/test/utils/SenderZEVM.sol
diff --git a/test/utils/upgrades/GatewayZEVMUpgradeTest.sol b/test/utils/upgrades/GatewayZEVMUpgradeTest.sol

Original file line number	Diff line number	Diff line change
`@@ -174,8 +174,7 @@ contract ZetaConnectorBase is ConnectorErrors, Pausable {`
`174`	`174`	`bytes32 internalSendHash`
`175`	`175`	`)`
`176`	`176`	`external`
`177`		`- virtual`
`178`		`- { }`
	`177`	`+ virtual { }`
`179`	`178`
`180`	`179`	`/**`
`181`	`180`	`* @dev Handler to receive errors from other chain.`
`@@ -191,6 +190,5 @@ contract ZetaConnectorBase is ConnectorErrors, Pausable {`
`191`	`190`	`bytes32 internalSendHash`
`192`	`191`	`)`
`193`	`192`	`external`
`194`		`- virtual`
`195`		`- { }`
	`193`	`+ virtual { }`
`196`	`194`	`}`