@hyperlane-xyz/core 0.5.5 → 1.0.0-beta1

package/contracts/Router.sol

@@ -2,13 +2,12 @@
 pragma solidity >=0.6.11;
 
 // ============ Internal Imports ============
-import {AbacusConnectionClient} from "./AbacusConnectionClient.sol";
-import {IAbacusConnectionManager} from "../interfaces/IAbacusConnectionManager.sol";
+import {HyperlaneConnectionClient} from "./HyperlaneConnectionClient.sol";
 import {IInterchainGasPaymaster} from "../interfaces/IInterchainGasPaymaster.sol";
 import {IMessageRecipient} from "../interfaces/IMessageRecipient.sol";
-import {IOutbox} from "../interfaces/IOutbox.sol";
+import {IMailbox} from "../interfaces/IMailbox.sol";
 
-abstract contract Router is AbacusConnectionClient, IMessageRecipient {
+abstract contract Router is HyperlaneConnectionClient, IMessageRecipient {
     string constant NO_ROUTER_ENROLLED_REVERT_MESSAGE =
         "No router enrolled for domain. Did you specify the right domain ID?";
 
@@ -41,19 +40,16 @@ abstract contract Router is AbacusConnectionClient, IMessageRecipient {
     }
 
     // ======== Initializer =========
-    function __Router_initialize(address _abacusConnectionManager)
-        internal
-        onlyInitializing
-    {
-        __AbacusConnectionClient_initialize(_abacusConnectionManager);
+    function __Router_initialize(address _mailbox) internal onlyInitializing {
+        __HyperlaneConnectionClient_initialize(_mailbox);
     }
 
     function __Router_initialize(
-        address _abacusConnectionManager,
+        address _mailbox,
         address _interchainGasPaymaster
     ) internal onlyInitializing {
-        __AbacusConnectionClient_initialize(
-            _abacusConnectionManager,
+        __HyperlaneConnectionClient_initialize(
+            _mailbox,
             _interchainGasPaymaster
         );
     }
@@ -73,6 +69,21 @@ abstract contract Router is AbacusConnectionClient, IMessageRecipient {
         _enrollRemoteRouter(_domain, _router);
     }
 
+    /**
+     * @notice Batch version of `enrollRemoteRouter`
+     * @param _domains The domaisn of the remote Application Routers
+     * @param _routers The addresses of the remote Application Routers
+     */
+    function enrollRemoteRouters(
+        uint32[] calldata _domains,
+        bytes32[] calldata _routers
+    ) external virtual onlyOwner {
+        require(_domains.length == _routers.length, "!length");
+        for (uint256 i = 0; i < _domains.length; i += 1) {
+            _enrollRemoteRouter(_domains[i], _routers[i]);
+        }
+    }
+
     /**
      * @notice Handles an incoming message
      * @param _origin The origin domain
@@ -83,7 +94,7 @@ abstract contract Router is AbacusConnectionClient, IMessageRecipient {
         uint32 _origin,
         bytes32 _sender,
         bytes calldata _message
-    ) external virtual override onlyInbox onlyRemoteRouter(_origin, _sender) {
+    ) external virtual override onlyMailbox onlyRemoteRouter(_origin, _sender) {
         // TODO: callbacks on success/failure
         _handle(_origin, _sender, _message);
     }
@@ -135,60 +146,46 @@ abstract contract Router is AbacusConnectionClient, IMessageRecipient {
     }
 
     /**
-     * @notice Dispatches a message to an enrolled router via the local router's Outbox.
-     * @notice Does not pay interchain gas.
-     * @dev Reverts if there is no enrolled router for _destinationDomain.
-     * @param _destinationDomain The domain of the chain to which to send the message.
-     * @param _msg The message to dispatch.
-     */
-    function _dispatch(uint32 _destinationDomain, bytes memory _msg)
-        internal
-        returns (uint256)
-    {
-        return _dispatch(_outbox(), _destinationDomain, _msg);
-    }
-
-    /**
-     * @notice Dispatches a message to an enrolled router via the local router's Outbox
+     * @notice Dispatches a message to an enrolled router via the local router's Mailbox
      * and pays for it to be relayed to the destination.
      * @dev Reverts if there is no enrolled router for _destinationDomain.
      * @param _destinationDomain The domain of the chain to which to send the message.
-     * @param _msg The message to dispatch.
+     * @param _messageBody Raw bytes content of message.
+     * @param _gasAmount The amount of destination gas for the message that is requested via the InterchainGasPaymaster.
      * @param _gasPayment The amount of native tokens to pay for the message to be relayed.
+     * @param _gasPaymentRefundAddress The address to refund any gas overpayment to.
      */
     function _dispatchWithGas(
         uint32 _destinationDomain,
-        bytes memory _msg,
-        uint256 _gasPayment
-    ) internal {
-        IOutbox _outbox = _outbox();
-        uint256 _leafIndex = _dispatch(_outbox, _destinationDomain, _msg);
-        if (_gasPayment > 0) {
-            interchainGasPaymaster.payGasFor{value: _gasPayment}(
-                address(_outbox),
-                _leafIndex,
-                _destinationDomain
-            );
-        }
+        bytes memory _messageBody,
+        uint256 _gasAmount,
+        uint256 _gasPayment,
+        address _gasPaymentRefundAddress
+    ) internal returns (bytes32 _messageId) {
+        _messageId = _dispatch(_destinationDomain, _messageBody);
+        // Call the IGP even if the gas payment is zero. This is to support on-chain
+        // fee quoting in IGPs, which should always revert if gas payment is insufficient.
+        interchainGasPaymaster.payForGas{value: _gasPayment}(
+            _messageId,
+            _destinationDomain,
+            _gasAmount,
+            _gasPaymentRefundAddress
+        );
     }
 
-    // ============ Private functions ============
-
     /**
-     * @notice Dispatches a message to an enrolled router via the provided Outbox.
+     * @notice Dispatches a message to an enrolled router via the provided Mailbox.
      * @dev Does not pay interchain gas.
      * @dev Reverts if there is no enrolled router for _destinationDomain.
-     * @param _outbox The outbox contract to dispatch the message through.
      * @param _destinationDomain The domain of the chain to which to send the message.
-     * @param _msg The message to dispatch.
+     * @param _messageBody Raw bytes content of message.
      */
-    function _dispatch(
-        IOutbox _outbox,
-        uint32 _destinationDomain,
-        bytes memory _msg
-    ) private returns (uint256) {
+    function _dispatch(uint32 _destinationDomain, bytes memory _messageBody)
+        internal
+        returns (bytes32)
+    {
         // Ensure that destination chain has an enrolled router.
         bytes32 _router = _mustHaveRemoteRouter(_destinationDomain);
-        return _outbox.dispatch(_destinationDomain, _router, _msg);
+        return mailbox.dispatch(_destinationDomain, _router, _messageBody);
     }
 }

package/contracts/isms/MultisigIsm.sol

@@ -0,0 +1,373 @@
+// SPDX-License-Identifier: MIT OR Apache-2.0
+pragma solidity >=0.8.0;
+
+// ============ External Imports ============
+import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
+import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
+import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
+
+// ============ Internal Imports ============
+import {IMultisigIsm} from "../../interfaces/IMultisigIsm.sol";
+import {Message} from "../libs/Message.sol";
+import {MultisigIsmMetadata} from "../libs/MultisigIsmMetadata.sol";
+import {MerkleLib} from "../libs/Merkle.sol";
+
+/**
+ * @title MultisigIsm
+ * @notice Manages an ownable set of validators that ECDSA sign checkpoints to
+ * reach a quorum.
+ */
+contract MultisigIsm is IMultisigIsm, Ownable {
+    // ============ Libraries ============
+
+    using EnumerableSet for EnumerableSet.AddressSet;
+    using Message for bytes;
+    using MultisigIsmMetadata for bytes;
+    using MerkleLib for MerkleLib.Tree;
+
+    // ============ Mutable Storage ============
+
+    /// @notice The validator threshold for each remote domain.
+    mapping(uint32 => uint8) public threshold;
+
+    /// @notice The validator set for each remote domain.
+    mapping(uint32 => EnumerableSet.AddressSet) private validatorSet;
+
+    /// @notice A succinct commitment to the validator set and threshold for each remote
+    /// domain.
+    mapping(uint32 => bytes32) public commitment;
+
+    // ============ Events ============
+
+    /**
+     * @notice Emitted when a validator is enrolled in a validator set.
+     * @param domain The remote domain of the validator set.
+     * @param validator The address of the validator.
+     * @param validatorCount The number of enrolled validators in the validator set.
+     */
+    event ValidatorEnrolled(
+        uint32 indexed domain,
+        address indexed validator,
+        uint256 validatorCount
+    );
+
+    /**
+     * @notice Emitted when a validator is unenrolled from a validator set.
+     * @param domain The remote domain of the validator set.
+     * @param validator The address of the validator.
+     * @param validatorCount The number of enrolled validators in the validator set.
+     */
+    event ValidatorUnenrolled(
+        uint32 indexed domain,
+        address indexed validator,
+        uint256 validatorCount
+    );
+
+    /**
+     * @notice Emitted when the quorum threshold is set.
+     * @param domain The remote domain of the validator set.
+     * @param threshold The new quorum threshold.
+     */
+    event ThresholdSet(uint32 indexed domain, uint8 threshold);
+
+    /**
+     * @notice Emitted when the validator set or threshold changes.
+     * @param domain The remote domain of the validator set.
+     * @param commitment A commitment to the validator set and threshold.
+     */
+    event CommitmentUpdated(uint32 domain, bytes32 commitment);
+
+    // ============ Constructor ============
+
+    // solhint-disable-next-line no-empty-blocks
+    constructor() Ownable() {}
+
+    // ============ External Functions ============
+
+    /**
+     * @notice Enrolls multiple validators into a validator set.
+     * @dev Reverts if `_validator` is already in the validator set.
+     * @param _domains The remote domains of the validator sets.
+     * @param _validators The validators to add to the validator sets.
+     * @dev _validators[i] are the validators to enroll for _domains[i].
+     */
+    function enrollValidators(
+        uint32[] calldata _domains,
+        address[][] calldata _validators
+    ) external onlyOwner {
+        require(_domains.length == _validators.length, "!length");
+        for (uint256 i = 0; i < _domains.length; i += 1) {
+            address[] calldata _domainValidators = _validators[i];
+            for (uint256 j = 0; j < _domainValidators.length; j += 1) {
+                _enrollValidator(_domains[i], _domainValidators[j]);
+            }
+            _updateCommitment(_domains[i]);
+        }
+    }
+
+    /**
+     * @notice Enrolls a validator into a validator set.
+     * @dev Reverts if `_validator` is already in the validator set.
+     * @param _domain The remote domain of the validator set.
+     * @param _validator The validator to add to the validator set.
+     */
+    function enrollValidator(uint32 _domain, address _validator)
+        external
+        onlyOwner
+    {
+        _enrollValidator(_domain, _validator);
+        _updateCommitment(_domain);
+    }
+
+    /**
+     * @notice Unenrolls a validator from a validator set.
+     * @dev Reverts if `_validator` is not in the validator set.
+     * @param _domain The remote domain of the validator set.
+     * @param _validator The validator to remove from the validator set.
+     */
+    function unenrollValidator(uint32 _domain, address _validator)
+        external
+        onlyOwner
+    {
+        require(validatorSet[_domain].remove(_validator), "!enrolled");
+        uint256 _validatorCount = validatorCount(_domain);
+        require(
+            _validatorCount >= threshold[_domain],
+            "violates quorum threshold"
+        );
+        _updateCommitment(_domain);
+        emit ValidatorUnenrolled(_domain, _validator, _validatorCount);
+    }
+
+    /**
+     * @notice Sets the quorum threshold for multiple domains.
+     * @param _domains The remote domains of the validator sets.
+     * @param _thresholds The new quorum thresholds.
+     */
+    function setThresholds(
+        uint32[] calldata _domains,
+        uint8[] calldata _thresholds
+    ) external onlyOwner {
+        require(_domains.length == _thresholds.length, "!length");
+        for (uint256 i = 0; i < _domains.length; i += 1) {
+            setThreshold(_domains[i], _thresholds[i]);
+        }
+    }
+
+    /**
+     * @notice Returns whether an address is enrolled in a validator set.
+     * @param _domain The remote domain of the validator set.
+     * @param _address The address to test for set membership.
+     * @return True if the address is enrolled, false otherwise.
+     */
+    function isEnrolled(uint32 _domain, address _address)
+        external
+        view
+        returns (bool)
+    {
+        EnumerableSet.AddressSet storage _validatorSet = validatorSet[_domain];
+        return _validatorSet.contains(_address);
+    }
+
+    // ============ Public Functions ============
+
+    /**
+     * @notice Sets the quorum threshold.
+     * @param _domain The remote domain of the validator set.
+     * @param _threshold The new quorum threshold.
+     */
+    function setThreshold(uint32 _domain, uint8 _threshold) public onlyOwner {
+        require(
+            _threshold > 0 && _threshold <= validatorCount(_domain),
+            "!range"
+        );
+        threshold[_domain] = _threshold;
+        emit ThresholdSet(_domain, _threshold);
+
+        _updateCommitment(_domain);
+    }
+
+    /**
+     * @notice Verifies that a quorum of the origin domain's validators signed
+     * a checkpoint, and verifies the merkle proof of `_message` against that
+     * checkpoint.
+     * @param _metadata ABI encoded module metadata (see MultisigIsmMetadata.sol)
+     * @param _message Formatted Hyperlane message (see Message.sol).
+     */
+    function verify(bytes calldata _metadata, bytes calldata _message)
+        public
+        view
+        returns (bool)
+    {
+        require(_verifyMerkleProof(_metadata, _message), "!merkle");
+        require(_verifyValidatorSignatures(_metadata, _message), "!sigs");
+        return true;
+    }
+
+    /**
+     * @notice Gets the current validator set
+     * @param _domain The remote domain of the validator set.
+     * @return The addresses of the validator set.
+     */
+    function validators(uint32 _domain) public view returns (address[] memory) {
+        EnumerableSet.AddressSet storage _validatorSet = validatorSet[_domain];
+        uint256 _validatorCount = _validatorSet.length();
+        address[] memory _validators = new address[](_validatorCount);
+        for (uint256 i = 0; i < _validatorCount; i++) {
+            _validators[i] = _validatorSet.at(i);
+        }
+        return _validators;
+    }
+
+    /**
+     * @notice Returns the number of validators enrolled in the validator set.
+     * @param _domain The remote domain of the validator set.
+     * @return The number of validators enrolled in the validator set.
+     */
+    function validatorCount(uint32 _domain) public view returns (uint256) {
+        return validatorSet[_domain].length();
+    }
+
+    // ============ Internal Functions ============
+
+    /**
+     * @notice Enrolls a validator into a validator set.
+     * @dev Reverts if `_validator` is already in the validator set.
+     * @param _domain The remote domain of the validator set.
+     * @param _validator The validator to add to the validator set.
+     */
+    function _enrollValidator(uint32 _domain, address _validator) internal {
+        require(_validator != address(0), "zero address");
+        require(validatorSet[_domain].add(_validator), "already enrolled");
+        emit ValidatorEnrolled(_domain, _validator, validatorCount(_domain));
+    }
+
+    /**
+     * @notice Updates the commitment to the validator set for `_domain`.
+     * @param _domain The remote domain of the validator set.
+     * @return The commitment to the validator set for `_domain`.
+     */
+    function _updateCommitment(uint32 _domain) internal returns (bytes32) {
+        address[] memory _validators = validators(_domain);
+        uint8 _threshold = threshold[_domain];
+        bytes32 _commitment = keccak256(
+            abi.encodePacked(_threshold, _validators)
+        );
+        commitment[_domain] = _commitment;
+        emit CommitmentUpdated(_domain, _commitment);
+        return _commitment;
+    }
+
+    /**
+     * @notice Verifies the merkle proof of `_message` against the provided
+     * checkpoint.
+     * @param _metadata ABI encoded module metadata (see MultisigIsmMetadata.sol)
+     * @param _message Formatted Hyperlane message (see Message.sol).
+     */
+    function _verifyMerkleProof(
+        bytes calldata _metadata,
+        bytes calldata _message
+    ) internal pure returns (bool) {
+        // calculate the expected root based on the proof
+        bytes32 _calculatedRoot = MerkleLib.branchRoot(
+            _message.id(),
+            _metadata.proof(),
+            _message.nonce()
+        );
+        return _calculatedRoot == _metadata.root();
+    }
+
+    /**
+     * @notice Verifies that a quorum of the origin domain's validators signed
+     * the provided checkpoint.
+     * @param _metadata ABI encoded module metadata (see MultisigIsmMetadata.sol)
+     * @param _message Formatted Hyperlane message (see Message.sol).
+     */
+    function _verifyValidatorSignatures(
+        bytes calldata _metadata,
+        bytes calldata _message
+    ) internal view returns (bool) {
+        uint8 _threshold = _metadata.threshold();
+        bytes32 _digest;
+        {
+            uint32 _origin = _message.origin();
+
+            bytes32 _commitment = keccak256(
+                abi.encodePacked(_threshold, _metadata.validators())
+            );
+            // Ensures the validator set encoded in the metadata matches
+            // what we've stored on chain.
+            // NB: An empty validator set in `_metadata` will result in a
+            // non-zero computed commitment, and this check will fail
+            // as the commitment in storage will be zero.
+            require(_commitment == commitment[_origin], "!commitment");
+            _digest = _getCheckpointDigest(_metadata, _origin);
+        }
+        uint256 _validatorCount = _metadata.validatorCount();
+        uint256 _validatorIndex = 0;
+        // Assumes that signatures are ordered by validator
+        for (uint256 i = 0; i < _threshold; ++i) {
+            address _signer = ECDSA.recover(_digest, _metadata.signatureAt(i));
+            // Loop through remaining validators until we find a match
+            for (
+                ;
+                _validatorIndex < _validatorCount &&
+                    _signer != _metadata.validatorAt(_validatorIndex);
+                ++_validatorIndex
+            ) {}
+            // Fail if we never found a match
+            require(_validatorIndex < _validatorCount, "!threshold");
+            ++_validatorIndex;
+        }
+        return true;
+    }
+
+    /**
+     * @notice Returns the domain hash that validators are expected to use
+     * when signing checkpoints.
+     * @param _origin The origin domain of the checkpoint.
+     * @param _originMailbox The address of the origin mailbox as bytes32.
+     * @return The domain hash.
+     */
+    function _getDomainHash(uint32 _origin, bytes32 _originMailbox)
+        internal
+        pure
+        returns (bytes32)
+    {
+        // Including the origin mailbox address in the signature allows the slashing
+        // protocol to enroll multiple mailboxes. Otherwise, a valid signature for
+        // mailbox A would be indistinguishable from a fraudulent signature for mailbox
+        // B.
+        // The slashing protocol should slash if validators sign attestations for
+        // anything other than a whitelisted mailbox.
+        return
+            keccak256(abi.encodePacked(_origin, _originMailbox, "HYPERLANE"));
+    }
+
+    /**
+     * @notice Returns the digest validators are expected to sign when signing checkpoints.
+     * @param _metadata ABI encoded module metadata (see MultisigIsmMetadata.sol)
+     * @param _origin The origin domain of the checkpoint.
+     * @return The digest of the checkpoint.
+     */
+    function _getCheckpointDigest(bytes calldata _metadata, uint32 _origin)
+        internal
+        pure
+        returns (bytes32)
+    {
+        bytes32 _domainHash = _getDomainHash(
+            _origin,
+            _metadata.originMailbox()
+        );
+        return
+            ECDSA.toEthSignedMessageHash(
+                keccak256(
+                    abi.encodePacked(
+                        _domainHash,
+                        _metadata.root(),
+                        _metadata.index()
+                    )
+                )
+            );
+    }
+}