Extract CommonPredicates lib into its own file (#142)

Closes #111 

Some automatic prettier reformatting seems to have taken place

Author: DefiCake

.changeset/tame-seals-bake.md

@@ -0,0 +1,5 @@
+---
+'@fuel-bridge/solidity-contracts': minor
+---
+
+Extract CommonPredicates lib into its own file

packages/solidity-contracts/contracts/fuelchain/FuelMessagePortal.sol

@@ -11,6 +11,7 @@ import {FuelChainState} from "./FuelChainState.sol";
 import {FuelBlockHeader, FuelBlockHeaderLib} from "./types/FuelBlockHeader.sol";
 import {FuelBlockHeaderLite, FuelBlockHeaderLiteLib} from "./types/FuelBlockHeaderLite.sol";
 import {CryptographyLib} from "../lib/Cryptography.sol";
+import {CommonPredicates} from "../lib/CommonPredicates.sol";
 
 /// @notice Structure for proving an element in a merkle tree
 struct MerkleProof {
@@ -27,12 +28,6 @@ struct Message {
     bytes data;
 }
 
-/// @notice Common predicates for Fuel inputs
-library CommonPredicates {
-    bytes32 public constant CONTRACT_MESSAGE_PREDICATE =
-        0xb12658c759d8bae2cdc523ebd7aa8637912f32b1763d242ad3618448057b79cd;
-}
-
 /// @title FuelMessagePortal
 /// @notice The Fuel Message Portal contract sends messages to and from Fuel
 contract FuelMessagePortal is

packages/solidity-contracts/contracts/lib/CommonPredicates.sol

@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: Apache 2.0
+
+pragma solidity 0.8.9;
+
+/// @notice Common predicates for Fuel inputs
+library CommonPredicates {
+    bytes32 public constant CONTRACT_MESSAGE_PREDICATE =
+        0xb12658c759d8bae2cdc523ebd7aa8637912f32b1763d242ad3618448057b79cd;
+}

packages/solidity-contracts/contracts/messaging/gateway/FuelERC20Gateway.sol

@@ -33,7 +33,10 @@ contract FuelERC20Gateway is
 
     /// @dev Emitted when tokens are withdrawn from Fuel to Ethereum
     event Withdrawal(
-        bytes32 indexed recipient, address indexed tokenAddress, bytes32 indexed fuelContractId, uint256 amount
+        bytes32 indexed recipient,
+        address indexed tokenAddress,
+        bytes32 indexed fuelContractId,
+        uint256 amount
     );
 
     ///////////////
@@ -108,12 +111,12 @@ contract FuelERC20Gateway is
     /// @param fuelContractId ID of the contract on Fuel that manages the deposited tokens
     /// @param amount Amount of tokens to deposit
     /// @dev Made payable to reduce gas costs
-    function deposit(bytes32 to, address tokenAddress, bytes32 fuelContractId, uint256 amount)
-        external
-        payable
-        virtual
-        whenNotPaused
-    {
+    function deposit(
+        bytes32 to,
+        address tokenAddress,
+        bytes32 fuelContractId,
+        uint256 amount
+    ) external payable virtual whenNotPaused {
         bytes memory messageData = abi.encodePacked(
             fuelContractId,
             bytes32(uint256(uint160(tokenAddress))), // OFFSET_TOKEN_ADDRESS = 32
@@ -158,14 +161,12 @@ contract FuelERC20Gateway is
     /// @param amount Amount of tokens to withdraw
     /// @param tokenId Discriminator for ERC721 / ERC1155 tokens. For ERC20, it must be 0
     /// @dev Made payable to reduce gas costs
-    function finalizeWithdrawal(address to, address tokenAddress, uint256 amount, uint256 tokenId)
-        external
-        payable
-        virtual
-        override
-        whenNotPaused
-        onlyFromPortal
-    {
+    function finalizeWithdrawal(
+        address to,
+        address tokenAddress,
+        uint256 amount,
+        uint256 tokenId
+    ) external payable virtual override whenNotPaused onlyFromPortal {
         require(amount > 0, "Cannot withdraw zero");
         require(tokenId == 0, "Fungible tokens cannot have a tokenId");
         bytes32 fuelContractId = messageSender();
@@ -181,7 +182,7 @@ contract FuelERC20Gateway is
     /// @notice Allows the admin to rescue ETH sent to this contract by accident
     /// @dev Made payable to reduce gas costs
     function rescueETH() external payable virtual onlyRole(DEFAULT_ADMIN_ROLE) {
-        (bool success,) = address(msg.sender).call{value: address(this).balance}("");
+        (bool success, ) = address(msg.sender).call{value: address(this).balance}("");
         require(success);
     }
 
@@ -194,10 +195,12 @@ contract FuelERC20Gateway is
     /// @param fuelContractId ID of the contract on Fuel that manages the deposited tokens
     /// @param amount Amount of tokens to deposit
     /// @param messageData The data of the message to send for deposit
-    function _deposit(address tokenAddress, bytes32 fuelContractId, uint256 amount, bytes memory messageData)
-        internal
-        virtual
-    {
+    function _deposit(
+        address tokenAddress,
+        bytes32 fuelContractId,
+        uint256 amount,
+        bytes memory messageData
+    ) internal virtual {
         require(amount > 0, "Cannot deposit zero");
 
         //transfer tokens to this contract and update deposit balance