chore: Add prettier check to CI (#1303)

tbwebb22 · web-flow · commit 3e53c5755997 · 2026-02-25T16:22:17.000-07:00
* add prettier to ci

Signed-off-by: Taylor Webb &lt;tbwebb22@gmail.com&gt;

* format contracts

Signed-off-by: Taylor Webb &lt;tbwebb22@gmail.com&gt;

* update prettier versions

Signed-off-by: Taylor Webb &lt;tbwebb22@gmail.com&gt;

* reformat ts and js files

Signed-off-by: Taylor Webb &lt;tbwebb22@gmail.com&gt;

* trailing comma

---------

Signed-off-by: Taylor Webb &lt;tbwebb22@gmail.com&gt;
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -96,6 +96,9 @@ jobs:
       - name: Lint solidity
         shell: bash
         run: yarn lint-solidity
+      - name: Check Solidity formatting
+        shell: bash
+        run: yarn check-format-contracts
       - name: Lint rust
         shell: bash
         run: yarn lint-rust
diff --git a/.prettierrc b/.prettierrc
@@ -1,16 +1,15 @@
 {
   "printWidth": 120,
   "bracketSpacing": true,
-  "explicitTypes": "preserve",
+  "trailingComma": "es5",
   "tabWidth": 2,
   "overrides": [
     {
       "files": "*.sol",
       "options": {
         "tabWidth": 4,
         "useTabs": false,
-        "singleQuote": false,
-        "explicitTypes": "always"
+        "singleQuote": false
       }
     },
     {
@@ -29,8 +28,5 @@
       }
     }
   ],
-  "plugins": [
-    "prettier-plugin-rust",
-    "prettier-plugin-solidity"
-  ]
-}
+  "plugins": ["prettier-plugin-rust", "prettier-plugin-solidity"]
+}
diff --git a/contracts/chain-adapters/Arbitrum_CustomGasToken_Adapter.sol b/contracts/chain-adapters/Arbitrum_CustomGasToken_Adapter.sol
@@ -7,7 +7,11 @@ import { IERC20 } from "@openzeppelin/contracts-v4/token/ERC20/IERC20.sol";
 import { SafeERC20 } from "@openzeppelin/contracts-v4/token/ERC20/utils/SafeERC20.sol";
 import { ITokenMessenger as ICCTPTokenMessenger } from "../external/interfaces/CCTPInterfaces.sol";
 import { CircleCCTPAdapter, CircleDomainIds } from "../libraries/CircleCCTPAdapter.sol";
-import { ArbitrumERC20Bridge as ArbitrumL1ERC20Bridge, ArbitrumCustomGasTokenInbox as ArbitrumL1InboxLike, ArbitrumL1ERC20GatewayLike } from "../interfaces/ArbitrumBridge.sol";
+import {
+    ArbitrumERC20Bridge as ArbitrumL1ERC20Bridge,
+    ArbitrumCustomGasTokenInbox as ArbitrumL1InboxLike,
+    ArbitrumL1ERC20GatewayLike
+} from "../interfaces/ArbitrumBridge.sol";
 
 /**
  * @notice Interface for funder contract that this contract pulls from to pay for relayMessage()/relayTokens()
diff --git a/contracts/chain-adapters/CrossDomainEnabled.sol b/contracts/chain-adapters/CrossDomainEnabled.sol
@@ -38,11 +38,7 @@ contract CrossDomainEnabled {
      * @param _message The data to send to the target (usually calldata to a function with
      *  onlyFromCrossDomainAccount())
      */
-    function sendCrossDomainMessage(
-        address _crossDomainTarget,
-        uint32 _gasLimit,
-        bytes calldata _message
-    ) internal {
+    function sendCrossDomainMessage(address _crossDomainTarget, uint32 _gasLimit, bytes calldata _message) internal {
         // slither-disable-next-line reentrancy-events, reentrancy-benign
         getCrossDomainMessenger().sendMessage(_crossDomainTarget, _message, _gasLimit);
     }
diff --git a/contracts/chain-adapters/Router_Adapter.sol b/contracts/chain-adapters/Router_Adapter.sol
@@ -93,12 +93,7 @@ contract Router_Adapter is AdapterInterface {
      * @dev When sending tokens, we follow-up with a message describing the amount of tokens we wish to continue bridging.
      * This allows forwarders to know how much of some token to allocate to a certain target.
      */
-    function relayTokens(
-        address l1Token,
-        address l3Token,
-        uint256 amount,
-        address target
-    ) external payable override {
+    function relayTokens(address l1Token, address l3Token, uint256 amount, address target) external payable override {
         // Fetch the address of the L2 token, as defined in the Hub Pool. This is to complete a proper token bridge from L1 to L2.
         address l2Token = HUB_POOL.poolRebalanceRoute(L2_CHAIN_ID, l1Token);
         // If l2Token is the zero address, then this means that the L2 token is not enabled as a pool rebalance route. This is similar
diff --git a/contracts/chain-adapters/Universal_Adapter.sol b/contracts/chain-adapters/Universal_Adapter.sol
@@ -78,12 +78,7 @@ contract Universal_Adapter is AdapterInterface, CircleCCTPAdapter, OFTTransportA
      * @param amount Amount of tokens to relay.
      * @param to Address to receive the tokens on L2. Should be SpokePool address.
      */
-    function relayTokens(
-        address l1Token,
-        address l2Token,
-        uint256 amount,
-        address to
-    ) external payable override {
+    function relayTokens(address l1Token, address l2Token, uint256 amount, address to) external payable override {
         address oftMessenger = _getOftMessenger(l1Token);
         if (_isCCTPEnabled() && l1Token == address(usdcToken)) {
             _transferUsdc(to, amount);
diff --git a/contracts/chain-adapters/interfaces/AdapterInterface.sol b/contracts/chain-adapters/interfaces/AdapterInterface.sol
@@ -31,10 +31,5 @@ interface AdapterInterface {
      * @param amount Amount of `l1Token` to bridge.
      * @param to Bridge recipient.
      */
-    function relayTokens(
-        address l1Token,
-        address l2Token,
-        uint256 amount,
-        address to
-    ) external payable;
+    function relayTokens(address l1Token, address l2Token, uint256 amount, address to) external payable;
 }
diff --git a/contracts/chain-adapters/interfaces/ForwarderInterface.sol b/contracts/chain-adapters/interfaces/ForwarderInterface.sol
@@ -36,11 +36,7 @@ interface ForwarderInterface {
      * @param destinationChainId Chain ID of the L3 network.
      * @param message Message to send to `target`.
      */
-    function relayMessage(
-        address target,
-        uint256 destinationChainId,
-        bytes calldata message
-    ) external payable;
+    function relayMessage(address target, uint256 destinationChainId, bytes calldata message) external payable;
 
     /**
      * @notice Send `amount` of `l2Token` to `to` on L3. `l3oken` is the L3 address equivalent of `l2Token`.
diff --git a/contracts/chain-adapters/utilities/HubPoolStore.sol b/contracts/chain-adapters/utilities/HubPoolStore.sol
@@ -52,11 +52,7 @@ contract HubPoolStore {
      * @param data Data to send to Universal SpokePool.
      * @param isAdminSender True if the data is an admin function call, false otherwise.
      */
-    function storeRelayMessageCalldata(
-        address target,
-        bytes calldata data,
-        bool isAdminSender
-    ) external onlyHubPool {
+    function storeRelayMessageCalldata(address target, bytes calldata data, bool isAdminSender) external onlyHubPool {
         if (isAdminSender) {
             _storeData(target, dataUuid++, data);
         } else {
@@ -73,11 +69,7 @@ contract HubPoolStore {
         _storeData(address(0), IHubPool(hubPool).rootBundleProposal().challengePeriodEndTimestamp, data);
     }
 
-    function _storeData(
-        address target,
-        uint256 nonce,
-        bytes calldata data
-    ) internal {
+    function _storeData(address target, uint256 nonce, bytes calldata data) internal {
         if (relayMessageCallData[nonce] != bytes32(0)) {
             // Data is already stored, do nothing.
             return;
diff --git a/contracts/erc7683/ERC7683.sol b/contracts/erc7683/ERC7683.sol
@@ -122,10 +122,10 @@ interface IOriginSettler {
     /// @param order The GaslessCrossChainOrder definition
     /// @param originFillerData Any filler-defined data required by the settler
     /// @return ResolvedCrossChainOrder hydrated order data including the inputs and outputs of the order
-    function resolveFor(GaslessCrossChainOrder calldata order, bytes calldata originFillerData)
-        external
-        view
-        returns (ResolvedCrossChainOrder memory);
+    function resolveFor(
+        GaslessCrossChainOrder calldata order,
+        bytes calldata originFillerData
+    ) external view returns (ResolvedCrossChainOrder memory);
 
     /// @notice Resolves a specific OnchainCrossChainOrder into a generic ResolvedCrossChainOrder
     /// @dev Intended to improve standardized integration of various order types and settlement contracts
@@ -141,9 +141,5 @@ interface IDestinationSettler {
     /// @param orderId Unique order identifier for this order
     /// @param originData Data emitted on the origin to parameterize the fill
     /// @param fillerData Data provided by the filler to inform the fill or express their preferences
-    function fill(
-        bytes32 orderId,
-        bytes calldata originData,
-        bytes calldata fillerData
-    ) external;
+    function fill(bytes32 orderId, bytes calldata originData, bytes calldata fillerData) external;
 }
diff --git a/contracts/erc7683/ERC7683OrderDepositor.sol b/contracts/erc7683/ERC7683OrderDepositor.sol
@@ -7,8 +7,20 @@ import "@openzeppelin/contracts-v4/utils/math/SafeCast.sol";
 import "@openzeppelin/contracts-v4/token/ERC20/IERC20.sol";
 import "@openzeppelin/contracts-v4/token/ERC20/utils/SafeERC20.sol";
 
-import { Output, GaslessCrossChainOrder, OnchainCrossChainOrder, ResolvedCrossChainOrder, IOriginSettler, FillInstruction } from "./ERC7683.sol";
-import { AcrossOrderData, AcrossOriginFillerData, ERC7683Permit2Lib, ACROSS_ORDER_DATA_TYPE_HASH } from "./ERC7683Permit2Lib.sol";
+import {
+    Output,
+    GaslessCrossChainOrder,
+    OnchainCrossChainOrder,
+    ResolvedCrossChainOrder,
+    IOriginSettler,
+    FillInstruction
+} from "./ERC7683.sol";
+import {
+    AcrossOrderData,
+    AcrossOriginFillerData,
+    ERC7683Permit2Lib,
+    ACROSS_ORDER_DATA_TYPE_HASH
+} from "./ERC7683Permit2Lib.sol";
 import { AddressToBytes32, Bytes32ToAddress } from "../libraries/AddressConverters.sol";
 
 /**
diff --git a/contracts/external/Multicall3.sol b/contracts/external/Multicall3.sol
@@ -65,11 +65,10 @@ contract Multicall3 {
     /// @param requireSuccess If true, require all calls to succeed
     /// @param calls An array of Call structs
     /// @return returnData An array of Result structs
-    function tryAggregate(bool requireSuccess, Call[] calldata calls)
-        public
-        payable
-        returns (Result[] memory returnData)
-    {
+    function tryAggregate(
+        bool requireSuccess,
+        Call[] calldata calls
+    ) public payable returns (Result[] memory returnData) {
         uint256 length = calls.length;
         returnData = new Result[](length);
         Call calldata call;
@@ -90,15 +89,10 @@ contract Multicall3 {
     /// @return blockNumber The block number where the calls were executed
     /// @return blockHash The hash of the block where the calls were executed
     /// @return returnData An array of Result structs
-    function tryBlockAndAggregate(bool requireSuccess, Call[] calldata calls)
-        public
-        payable
-        returns (
-            uint256 blockNumber,
-            bytes32 blockHash,
-            Result[] memory returnData
-        )
-    {
+    function tryBlockAndAggregate(
+        bool requireSuccess,
+        Call[] calldata calls
+    ) public payable returns (uint256 blockNumber, bytes32 blockHash, Result[] memory returnData) {
         blockNumber = block.number;
         blockHash = blockhash(block.number);
         returnData = tryAggregate(requireSuccess, calls);
@@ -110,15 +104,9 @@ contract Multicall3 {
     /// @return blockNumber The block number where the calls were executed
     /// @return blockHash The hash of the block where the calls were executed
     /// @return returnData An array of Result structs
-    function blockAndAggregate(Call[] calldata calls)
-        public
-        payable
-        returns (
-            uint256 blockNumber,
-            bytes32 blockHash,
-            Result[] memory returnData
-        )
-    {
+    function blockAndAggregate(
+        Call[] calldata calls
+    ) public payable returns (uint256 blockNumber, bytes32 blockHash, Result[] memory returnData) {
         (blockNumber, blockHash, returnData) = tryBlockAndAggregate(true, calls);
     }
 
diff --git a/contracts/external/WETH9.sol b/contracts/external/WETH9.sol
@@ -77,11 +77,7 @@ contract WETH9 {
     /**
      * @dev Local change: marked virtual to allow overriding.
      */
-    function transferFrom(
-        address src,
-        address dst,
-        uint256 wad
-    ) public virtual returns (bool) {
+    function transferFrom(address src, address dst, uint256 wad) public virtual returns (bool) {
         require(balanceOf[src] >= wad);
 
         if (src != msg.sender && allowance[src][msg.sender] != type(uint256).max) {
diff --git a/contracts/external/interfaces/IOpUSDCBridgeAdapter.sol b/contracts/external/interfaces/IOpUSDCBridgeAdapter.sol
@@ -12,9 +12,5 @@ interface IOpUSDCBridgeAdapter {
      * @param _amount The amount of tokens to send
      * @param _minGasLimit Minimum gas limit that the message can be executed with
      */
-    function sendMessage(
-        address _to,
-        uint256 _amount,
-        uint32 _minGasLimit
-    ) external;
+    function sendMessage(address _to, uint256 _amount, uint32 _minGasLimit) external;
 }
diff --git a/contracts/external/interfaces/LineaInterfaces.sol b/contracts/external/interfaces/LineaInterfaces.sol
@@ -13,11 +13,7 @@ interface IMessageService {
      * @param _fee The message service fee on the origin chain.
      * @param _calldata The calldata used by the destination message service to call the destination contract.
      */
-    function sendMessage(
-        address _to,
-        uint256 _fee,
-        bytes calldata _calldata
-    ) external payable;
+    function sendMessage(address _to, uint256 _fee, bytes calldata _calldata) external payable;
 
     /**
      * @notice Returns the original sender of the message on the origin layer.
@@ -54,11 +50,7 @@ interface ITokenBridge {
      * @param _amount The amount of the token to be bridged.
      * @param _recipient The address that will receive the tokens on the other chain.
      */
-    function bridgeToken(
-        address _token,
-        uint256 _amount,
-        address _recipient
-    ) external payable;
+    function bridgeToken(address _token, uint256 _amount, address _recipient) external payable;
 }
 
 interface IUSDCBridge {
diff --git a/contracts/external/uma/core/contracts/merkle-distributor/implementation/MerkleDistributor.sol b/contracts/external/uma/core/contracts/merkle-distributor/implementation/MerkleDistributor.sol
@@ -196,8 +196,7 @@ contract MerkleDistributor is MerkleDistributorInterface, Ownable {
         uint256 claimedWordIndex = accountIndex / 256;
         uint256 claimedBitIndex = accountIndex % 256;
         claimedBitMap[windowIndex][claimedWordIndex] =
-            claimedBitMap[windowIndex][claimedWordIndex] |
-            (1 << claimedBitIndex);
+            claimedBitMap[windowIndex][claimedWordIndex] | (1 << claimedBitIndex);
     }
 
     // Store new Merkle root at `windowindex`. Pull `rewardsDeposited` from caller to seed distribution for this root.
diff --git a/contracts/interfaces/SpokePoolMessageHandler.sol b/contracts/interfaces/SpokePoolMessageHandler.sol
@@ -3,10 +3,5 @@ pragma solidity ^0.8.0;
 
 // This interface is expected to be implemented by any contract that expects to receive messages from the SpokePool.
 interface AcrossMessageHandler {
-    function handleV3AcrossMessage(
-        address tokenSent,
-        uint256 amount,
-        address relayer,
-        bytes memory message
-    ) external;
+    function handleV3AcrossMessage(address tokenSent, uint256 amount, address relayer, bytes memory message) external;
 }
diff --git a/contracts/interfaces/ZkStackBridgeHub.sol b/contracts/interfaces/ZkStackBridgeHub.sol
@@ -25,10 +25,9 @@ interface BridgeHubInterface {
      * allowance of the base Token.
      * @param _request the direct request.
      */
-    function requestL2TransactionDirect(L2TransactionRequestDirect calldata _request)
-        external
-        payable
-        returns (bytes32 canonicalTxHash);
+    function requestL2TransactionDirect(
+        L2TransactionRequestDirect calldata _request
+    ) external payable returns (bytes32 canonicalTxHash);
 
     struct L2TransactionRequestTwoBridgesOuter {
         uint256 chainId;
@@ -51,10 +50,9 @@ interface BridgeHubInterface {
      * This function is great for contract calls to L2, the secondBridge can be any contract.
      * @param _request the two bridges request.
      */
-    function requestL2TransactionTwoBridges(L2TransactionRequestTwoBridgesOuter calldata _request)
-        external
-        payable
-        returns (bytes32 canonicalTxHash);
+    function requestL2TransactionTwoBridges(
+        L2TransactionRequestTwoBridgesOuter calldata _request
+    ) external payable returns (bytes32 canonicalTxHash);
 
     /**
      * @notice Gets the shared bridge.
diff --git a/contracts/periphery/mintburn/ArbitraryEVMFlowExecutor.sol b/contracts/periphery/mintburn/ArbitraryEVMFlowExecutor.sol
@@ -171,8 +171,7 @@ abstract contract ArbitraryEVMFlowExecutor {
         // Apply the bps to sponsor to the final amount to get the amount to sponsor, ceiling division.
         uint256 bpsToSponsorAdjusted = BPS_PRECISION_SCALAR - bpsToSponsor;
         extraFeesToSponsorFinalToken =
-            (((finalAmount * BPS_PRECISION_SCALAR) + bpsToSponsorAdjusted - 1) / bpsToSponsorAdjusted) -
-            finalAmount;
+            (((finalAmount * BPS_PRECISION_SCALAR) + bpsToSponsorAdjusted - 1) / bpsToSponsorAdjusted) - finalAmount;
     }
 
     /// @notice Allow contract to receive native tokens for arbitrary action execution
diff --git a/contracts/permit2-order/Permit2OrderLib.sol b/contracts/permit2-order/Permit2OrderLib.sol
@@ -93,10 +93,10 @@ library Permit2OrderLib {
         return keccak256(abi.encodePacked(part1, part2));
     }
 
-    function _processPermit2Order(IPermit2 permit2, SignedOrder calldata signedOrder)
-        internal
-        returns (CrossChainLimitOrder memory)
-    {
+    function _processPermit2Order(
+        IPermit2 permit2,
+        SignedOrder calldata signedOrder
+    ) internal returns (CrossChainLimitOrder memory) {
         CrossChainLimitOrder memory limitOrder = abi.decode(signedOrder.order, (CrossChainLimitOrder));
 
         if (address(this) != limitOrder.info.settlerContract) revert WrongSettlerContract();
diff --git a/contracts/test/MockHubPool.sol b/contracts/test/MockHubPool.sol
@@ -59,12 +59,7 @@ contract MockHubPool {
     /// @param l2Token The address of the L2 token to receive.
     /// @param amount The amount of tokens to relay.
     /// @param to The address on L2 to receive the tokens.
-    function relayTokens(
-        address l1Token,
-        address l2Token,
-        uint256 amount,
-        address to
-    ) external {
+    function relayTokens(address l1Token, address l2Token, uint256 amount, address to) external {
         (bool success, ) = adapter.delegatecall(
             abi.encodeWithSignature(
                 "relayTokens(address,address,uint256,address)",
diff --git a/contracts/test/MockOptimism_SpokePool.sol b/contracts/test/MockOptimism_SpokePool.sol
diff --git a/contracts/test/MockZkStackBridgeHub.sol b/contracts/test/MockZkStackBridgeHub.sol
diff --git a/package.json b/package.json
diff --git a/script/DeployArbitrumAdapter.s.sol b/script/DeployArbitrumAdapter.s.sol
diff --git a/src/types/svm.ts b/src/types/svm.ts
diff --git a/test/svm/utils.ts b/test/svm/utils.ts
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,15 @@`
`1`	`1`	`{`
`2`	`2`	`"printWidth": 120,`
`3`	`3`	`"bracketSpacing": true,`
`4`		`- "explicitTypes": "preserve",`
	`4`	`+ "trailingComma": "es5",`
`5`	`5`	`"tabWidth": 2,`
`6`	`6`	`"overrides": [`
`7`	`7`	`{`
`8`	`8`	`"files": "*.sol",`
`9`	`9`	`"options": {`
`10`	`10`	`"tabWidth": 4,`
`11`	`11`	`"useTabs": false,`
`12`		`- "singleQuote": false,`
`13`		`- "explicitTypes": "always"`
	`12`	`+ "singleQuote": false`
`14`	`13`	`}`
`15`	`14`	`},`
`16`	`15`	`{`
`@@ -29,8 +28,5 @@`
`29`	`28`	`}`
`30`	`29`	`}`
`31`	`30`	`],`
`32`		`- "plugins": [`
`33`		`- "prettier-plugin-rust",`
`34`		`- "prettier-plugin-solidity"`
`35`		`- ]`
`36`		`-}`
	`31`	`+ "plugins": ["prettier-plugin-rust", "prettier-plugin-solidity"]`
	`32`	`+}`