fix: refactor to separate Endpoint and Manager contracts

Makefile

@@ -14,6 +14,10 @@ build-evm:
 check-format:
 	cd evm && forge fmt --check
 
+.PHONY: fix-format
+fix-format:
+	cd evm && forge fmt
+
 .PHONY: test
 test-evm:
 	cd evm && forge test -vvv

evm/src/Endpoint.sol

@@ -3,8 +3,94 @@ pragma solidity >=0.8.8 <0.9.0;
 
 import "./libraries/EndpointStructs.sol";
 import "./libraries/PausableOwnable.sol";
+import "./interfaces/IManager.sol";
+import "./interfaces/IEndpoint.sol";
+import "./libraries/external/ReentrancyGuardUpgradeable.sol";
+import "./libraries/Implementation.sol";
+
+abstract contract Endpoint is
+    IEndpoint,
+    PausableOwnable,
+    ReentrancyGuardUpgradeable,
+    Implementation
+{
+    /// @dev updating bridgeManager requires a new Endpoint deployment.
+    /// Projects should implement their own governance to remove the old Endpoint contract address and then add the new one.
+    address public immutable manager;
+    address public immutable managerToken;
+
+    constructor(address _manager) {
+        manager = _manager;
+        managerToken = IManager(manager).token();
+    }
+
+    /// =============== MODIFIERS ===============================================
+
+    modifier onlyManager() {
+        if (msg.sender != manager) {
+            revert CallerNotManager(msg.sender);
+        }
+        _;
+    }
+
+    /// =============== ADMIN ===============================================
+
+    function _initialize() internal override {
+        __ReentrancyGuard_init();
+        // owner of the endpoint is set to the owner of the manager
+        __PausedOwnable_init(msg.sender, getManagerOwner());
+    }
+
+    /// @dev transfer the ownership of the endpoint to a new address
+    /// the manager should be able to update endpoint ownership.
+    function transferEndpointOwnership(address newOwner) external onlyManager {
+        _transferOwnership(newOwner);
+    }
+
+    /// @dev pause the endpoint.
+    function _pauseEndpoint() internal {
+        _pause();
+    }
+
+    function upgrade(address newImplementation) external onlyOwner {
+        _upgrade(newImplementation);
+    }
+
+    function _migrate() internal virtual override {}
+
+    /// @dev This method checks that the the referecnes to the manager and its corresponding function are correct
+    /// When new immutable variables are added, this function should be updated.
+    function _checkImmutables() internal view override {
+        assert(this.manager() == manager);
+        assert(this.managerToken() == managerToken);
+    }
+
+    /// =============== GETTERS & SETTERS ===============================================
+
+    function getManagerOwner() public view returns (address) {
+        return IOwnableUpgradeable(manager).owner();
+    }
+
+    function getManagerToken() public view virtual returns (address) {
+        return managerToken;
+    }
+
+    /// =============== TRANSCEIVING LOGIC ===============================================
+    /**
+     *   @dev send a message to another chain.
+     *   @param recipientChain The chain id of the recipient.
+     *   @param instruction An additional Instruction provided by the Endpoint to be
+     *          executed on the recipient chain.
+     *   @param managerMessage A message to be sent to the manager on the recipient chain.
+     */
+    function sendMessage(
+        uint16 recipientChain,
+        EndpointStructs.EndpointInstruction memory instruction,
+        bytes memory managerMessage
+    ) external payable nonReentrant onlyManager {
+        _sendMessage(recipientChain, msg.value, msg.sender, instruction, managerMessage);
+    }
 
-abstract contract Endpoint is PausableOwnable {
     function _sendMessage(
         uint16 recipientChain,
         uint256 deliveryPayment,
@@ -13,21 +99,30 @@ abstract contract Endpoint is PausableOwnable {
         bytes memory managerMessage
     ) internal virtual;
 
+    /**
+     * @dev      This method is called by the BridgeManager contract to send a cross-chain message.
+     *           Forwards the VAA payload to the endpoint manager contract.
+     * @param    sourceChainId The chain id of the sender.
+     * @param    sourceManagerAddress The address of the sender's manager contract.
+     * @param    payload The VAA payload.
+     */
     function _deliverToManager(
         uint16 sourceChainId,
         bytes32 sourceManagerAddress,
         EndpointStructs.ManagerMessage memory payload
-    ) internal virtual;
+    ) internal virtual {
+        IManager(manager).attestationReceived(sourceChainId, sourceManagerAddress, payload);
+    }
+
+    function quoteDeliveryPrice(
+        uint16 targetChain,
+        EndpointStructs.EndpointInstruction memory instruction
+    ) external view returns (uint256) {
+        return _quoteDeliveryPrice(targetChain, instruction);
+    }
 
     function _quoteDeliveryPrice(
         uint16 targetChain,
         EndpointStructs.EndpointInstruction memory endpointInstruction
     ) internal view virtual returns (uint256);
-
-    function getManagerToken() public view virtual returns (address);
-
-    /// @notice pause the endpoint
-    function _pauseEndpoint() internal {
-        _pause();
-    }
 }

evm/src/EndpointRegistry.sol

@@ -30,7 +30,6 @@ abstract contract EndpointRegistry {
         uint8 num;
     }
 
-    // TODO: should we just increase this to 255?
     uint8 constant MAX_ENDPOINTS = 64;
 
     error CallerNotEndpoint(address caller);
@@ -214,7 +213,6 @@ abstract contract EndpointRegistry {
     /// Checking these invariants is somewhat costly, but we only need to do it
     /// when modifying the endpoints, which happens infrequently.
     function _checkEndpointsInvariants() internal view {
-        // TODO: add custom errors for each invariant
         _NumRegisteredEndpoints storage _numRegisteredEndpoints =
             _getNumRegisteredEndpointsStorage();
         address[] storage _enabledEndpoints = _getEnabledEndpointsStorage();