C4 QA fixes for #699

cli/commands/bridge/to-l2.ts

@@ -163,7 +163,7 @@ export const sendToL2Command = {
         description: 'Receiving address in L2. Same to L1 address if empty',
       })
       .positional('calldata', {
-        description: 'Calldata to pass to the recipient. Must be whitelisted in the bridge',
+        description: 'Calldata to pass to the recipient. Must be allowlisted in the bridge',
       })
       .coerce({
         maxGas: toBN,

contracts/curation/Curation.sol

@@ -2,17 +2,20 @@
 
 pragma solidity ^0.7.6;
 
-import "@openzeppelin/contracts/utils/Address.sol";
-import "@openzeppelin/contracts/math/SafeMath.sol";
-import "@openzeppelin/contracts/proxy/Clones.sol";
-
-import "../bancor/BancorFormula.sol";
-import "../upgrades/GraphUpgradeable.sol";
-import "../utils/TokenUtils.sol";
-
-import "./CurationStorage.sol";
-import "./ICuration.sol";
-import "./GraphCurationToken.sol";
+import { Address } from "@openzeppelin/contracts/utils/Address.sol";
+import { SafeMath } from "@openzeppelin/contracts/math/SafeMath.sol";
+import { Clones } from "@openzeppelin/contracts/proxy/Clones.sol";
+
+import { BancorFormula } from "../bancor/BancorFormula.sol";
+import { GraphUpgradeable } from "../upgrades/GraphUpgradeable.sol";
+import { TokenUtils } from "../utils/TokenUtils.sol";
+import { IRewardsManager } from "../rewards/IRewardsManager.sol";
+import { Managed } from "../governance/Managed.sol";
+import { IGraphToken } from "../token/IGraphToken.sol";
+import { CurationV1Storage } from "./CurationStorage.sol";
+import { ICuration } from "./ICuration.sol";
+import { IGraphCurationToken } from "./IGraphCurationToken.sol";
+import { GraphCurationToken } from "./GraphCurationToken.sol";
 
 /**
  * @title Curation contract

contracts/curation/CurationStorage.sol

@@ -2,7 +2,9 @@
 
 pragma solidity ^0.7.6;
 
-import "../governance/Managed.sol";
+import { ICuration } from "./ICuration.sol";
+import { IGraphCurationToken } from "./IGraphCurationToken.sol";
+import { Managed } from "../governance/Managed.sol";
 
 abstract contract CurationV1Storage is Managed, ICuration {
     // -- Pool --

contracts/gateway/BridgeEscrow.sol

@@ -4,9 +4,9 @@ pragma solidity ^0.7.6;
 
 import { Initializable } from "@openzeppelin/contracts-upgradeable/proxy/Initializable.sol";
 
-import "../upgrades/GraphUpgradeable.sol";
-import "../governance/Managed.sol";
-import "../token/IGraphToken.sol";
+import { GraphUpgradeable } from "../upgrades/GraphUpgradeable.sol";
+import { Managed } from "../governance/Managed.sol";
+import { IGraphToken } from "../token/IGraphToken.sol";
 
 /**
  * @title Bridge Escrow
@@ -16,23 +16,23 @@ import "../token/IGraphToken.sol";
  */
 contract BridgeEscrow is Initializable, GraphUpgradeable, Managed {
     /**
-     * @dev Initialize this contract.
+     * @notice Initialize the BridgeEscrow contract.
      * @param _controller Address of the Controller that manages this contract
      */
     function initialize(address _controller) external onlyImpl initializer {
         Managed._initialize(_controller);
     }
 
     /**
-     * @dev Approve a spender (i.e. a bridge that manages the GRT funds held by the escrow)
+     * @notice Approve a spender (i.e. a bridge that manages the GRT funds held by the escrow)
      * @param _spender Address of the spender that will be approved
      */
     function approveAll(address _spender) external onlyGovernor {
         graphToken().approve(_spender, type(uint256).max);
     }
 
     /**
-     * @dev Revoke a spender (i.e. a bridge that will no longer manage the GRT funds held by the escrow)
+     * @notice Revoke a spender (i.e. a bridge that will no longer manage the GRT funds held by the escrow)
      * @param _spender Address of the spender that will be revoked
      */
     function revokeAll(address _spender) external onlyGovernor {

contracts/gateway/GraphTokenGateway.sol

@@ -2,17 +2,17 @@
 
 pragma solidity ^0.7.6;
 
-import "../upgrades/GraphUpgradeable.sol";
-import "../arbitrum/ITokenGateway.sol";
-import "../governance/Pausable.sol";
-import "../governance/Managed.sol";
+import { GraphUpgradeable } from "../upgrades/GraphUpgradeable.sol";
+import { ITokenGateway } from "../arbitrum/ITokenGateway.sol";
+import { Pausable } from "../governance/Pausable.sol";
+import { Managed } from "../governance/Managed.sol";
 
 /**
  * @title L1/L2 Graph Token Gateway
  * @dev This includes everything that's shared between the L1 and L2 sides of the bridge.
  */
 abstract contract GraphTokenGateway is GraphUpgradeable, Pausable, Managed, ITokenGateway {
-    // Storage gap added in case we need to add state variables to this contract
+    /// @dev Storage gap added in case we need to add state variables to this contract
     uint256[50] private __gap;
 
     /**
@@ -35,14 +35,6 @@ abstract contract GraphTokenGateway is GraphUpgradeable, Pausable, Managed, ITok
         _setPauseGuardian(_newPauseGuardian);
     }
 
-    /**
-     * @dev Override the default pausing from Managed to allow pausing this
-     * particular contract instead of pausing from the Controller.
-     */
-    function _notPaused() internal view override {
-        require(!_paused, "Paused (contract)");
-    }
-
     /**
      * @notice Change the paused state of the contract
      * @param _newPaused New value for the pause state (true means the transfers will be paused)
@@ -56,11 +48,20 @@ abstract contract GraphTokenGateway is GraphUpgradeable, Pausable, Managed, ITok
 
     /**
      * @notice Getter to access paused state of this contract
+     * @return True if the contract is paused, false otherwise
      */
     function paused() external view returns (bool) {
         return _paused;
     }
 
+    /**
+     * @dev Override the default pausing from Managed to allow pausing this
+     * particular contract instead of pausing from the Controller.
+     */
+    function _notPaused() internal view override {
+        require(!_paused, "Paused (contract)");
+    }
+
     /**
      * @dev Runs state validation before unpausing, reverts if
      * something is not set properly

contracts/gateway/ICallhookReceiver.sol

@@ -3,14 +3,14 @@
 /**
  * @title Interface for contracts that can receive callhooks through the Arbitrum GRT bridge
  * @dev Any contract that can receive a callhook on L2, sent through the bridge from L1, must
- * be whitelisted by the governor, but also implement this interface that contains
+ * be allowlisted by the governor, but also implement this interface that contains
  * the function that will actually be called by the L2GraphTokenGateway.
  */
 pragma solidity ^0.7.6;
 
 interface ICallhookReceiver {
     /**
-     * @dev Receive tokens with a callhook from the bridge
+     * @notice Receive tokens with a callhook from the bridge
      * @param _from Token sender in L1
      * @param _amount Amount of tokens that were transferred
      * @param _data ABI-encoded callhook data