Finished

Author: nlordell

contracts/common/Singleton.sol

@@ -11,7 +11,7 @@ pragma solidity >=0.7.0 <0.9.0;
 abstract contract Singleton {
     /**
      * @dev `singleton` must be the first declared variable to ensure it has the same storage location as in the {SafeProxy} contract.
-     * The address must be stored alone: it must use a full 32-byte word and cannot be packed with other storage variables.
+     *      The address must be stored alone: it must use a full 32-byte word and cannot be packed with other storage variables.
      */
     address private singleton;
 }

contracts/handler/ExtensibleFallbackHandler.sol

@@ -7,14 +7,15 @@ import {ERC1271, ISignatureVerifierMuxer, SignatureVerifierMuxer} from "./extens
 import {ERC721TokenReceiver, ERC1155TokenReceiver, TokenCallbacks} from "./extensible/TokenCallbacks.sol";
 
 /**
- * @title ExtensibleFallbackHandler - A fully extensible fallback handler for Safes
+ * @title Extensible Fallback Handler
+ * @notice A fully extensible fallback handler for Safes.
  * @dev Designed to be used with Safe >= 1.3.0.
  * @author mfw78 <mfw78@rndlabs.xyz>
  */
 contract ExtensibleFallbackHandler is FallbackHandler, SignatureVerifierMuxer, TokenCallbacks, ERC165Handler {
     /**
-     * Specify specific interfaces (ERC721 + ERC1155) that this contract supports.
-     * @param interfaceId The interface ID to check for support
+     * @notice Specify specific interfaces (ERC-721 + ERC-1155) that this contract supports.
+     * @param interfaceId The interface ID to check for support.
      */
     function _supportsInterface(bytes4 interfaceId) internal pure override returns (bool) {
         return

contracts/handler/HandlerContext.sol

@@ -2,16 +2,17 @@
 pragma solidity >=0.7.0 <0.9.0;
 
 /**
- * @title Handler Context - Allows the fallback handler to extract additional context from the calldata
+ * @title Handler Context
+ * @notice Allows the fallback handler to extract additional context from the calldata.
  * @dev The fallback manager appends the following context to the calldata:
  *      1. Fallback manager caller address (non-padded)
- * based on https://github.com/OpenZeppelin/openzeppelin-contracts/blob/f8cc8b844a9f92f63dc55aa581f7d643a1bc5ac1/contracts/metatx/ERC2771Context.sol
+ *      Based on <https://github.com/OpenZeppelin/openzeppelin-contracts/blob/f8cc8b844a9f92f63dc55aa581f7d643a1bc5ac1/contracts/metatx/ERC2771Context.sol>
  * @author Richard Meissner - @rmeissner
  */
 abstract contract HandlerContext {
     /**
      * @notice Allows fetching the original caller address.
-     * @dev This is only reliable with a FallbackManager supporting this (e.g. Safe contract >=1.3.0).
+     * @dev This is only reliable with a {FallbackManager} supporting this (e.g. Safe contract >=1.3.0).
      *      When using this functionality, ensure that the linked _manager (aka msg.sender) supports this.
      *      This function does not rely on a trusted forwarder. Use the returned value only to
      *      check information against the calling manager.
@@ -29,8 +30,8 @@ abstract contract HandlerContext {
     }
 
     /**
-     * @notice Returns the FallbackManager address
-     * @return Fallback manager address
+     * @notice Returns the FallbackManager address.
+     * @return Fallback manager address.
      */
     function _manager() internal view returns (address) {
         return msg.sender;

contracts/handler/TokenCallbackHandler.sol

@@ -7,21 +7,20 @@ import {ERC777TokensRecipient} from "../interfaces/ERC777TokensRecipient.sol";
 import {IERC165} from "../interfaces/IERC165.sol";
 
 /**
- * @title Default Callback Handler - Handles supported tokens' callbacks, allowing Safes to receive these tokens.
+ * @title Token Callback Handler
+ * @notice Handles supported tokens' callbacks, allowing Safes to receive these tokens.
  * @author Richard Meissner - @rmeissner
  */
 contract TokenCallbackHandler is ERC1155TokenReceiver, ERC777TokensRecipient, ERC721TokenReceiver, IERC165 {
     /**
-     * @notice Handles ERC1155 Token callback.
-     * @return Standardized onERC1155Received return value.
+     * @inheritdoc ERC1155TokenReceiver
      */
     function onERC1155Received(address, address, uint256, uint256, bytes calldata) external pure override returns (bytes4) {
         return 0xf23a6e61;
     }
 
     /**
-     * @notice Handles ERC1155 Token batch callback.
-     * @return Standardized onERC1155BatchReceived return value.
+     * @inheritdoc ERC1155TokenReceiver
      */
     function onERC1155BatchReceived(
         address,
@@ -34,15 +33,14 @@ contract TokenCallbackHandler is ERC1155TokenReceiver, ERC777TokensRecipient, ER
     }
 
     /**
-     * @notice Handles ERC721 Token callback.
-     * @return Standardized onERC721Received return value.
+     * @inheritdoc ERC721TokenReceiver
      */
     function onERC721Received(address, address, uint256, bytes calldata) external pure override returns (bytes4) {
         return 0x150b7a02;
     }
 
     /**
-     * @notice Handles ERC777 Token callback.
+     * @inheritdoc ERC777TokensRecipient
      * @dev Account that wishes to receive the tokens also needs to register the implementer (this contract) via the ERC-1820 interface registry.
      *      From the standard: "This is done by calling the setInterfaceImplementer function on the ERC-1820 registry with the holder address as
      *      the address, the keccak256 hash of ERC777TokensSender (0x29ddb589b1fb5fc7cf394961c1adf5f8c6454761adf795e67fe149f658abe895) as the
@@ -53,9 +51,7 @@ contract TokenCallbackHandler is ERC1155TokenReceiver, ERC777TokensRecipient, ER
     }
 
     /**
-     * @notice Implements ERC165 interface support for ERC1155TokenReceiver, ERC721TokenReceiver and IERC165.
-     * @param interfaceId Id of the interface.
-     * @return if the interface is supported.
+     * @inheritdoc IERC165
      */
     function supportsInterface(bytes4 interfaceId) external view virtual override returns (bool) {
         return

contracts/interfaces/ERC1155TokenReceiver.sol

@@ -1,11 +1,14 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 pragma solidity >=0.7.0 <0.9.0;
 
-// Note: The ERC-165 identifier for this interface is 0x4e2312e0.
+/**
+ * @title ERC-1155 Token Receiver Interface
+ * @dev The ERC-165 identifier for this interface is 0x4e2312e0.
+ */
 interface ERC1155TokenReceiver {
     /**
-     * @notice Handle the receipt of a single ERC1155 token type.
-     * @dev An ERC1155-compliant smart contract MUST call this function on the token recipient contract, at the end of a `safeTransferFrom` after the balance has been updated.
+     * @notice Handle the receipt of a single ERC-1155 token type.
+     * @dev An ERC-1155-compliant smart contract MUST call this function on the token recipient contract, at the end of a `safeTransferFrom` after the balance has been updated.
      *      This function MUST return `bytes4(keccak256("onERC1155Received(address,address,uint256,uint256,bytes)"))` (i.e. 0xf23a6e61) if it accepts the transfer.
      *      This function MUST revert if it rejects the transfer.
      *      Return of any other value than the prescribed keccak256 generated value MUST result in the transaction being reverted by the caller.
@@ -25,8 +28,8 @@ interface ERC1155TokenReceiver {
     ) external returns (bytes4);
 
     /**
-     * @notice Handle the receipt of multiple ERC1155 token types.
-     * @dev An ERC1155-compliant smart contract MUST call this function on the token recipient contract, at the end of a `safeBatchTransferFrom` after the balances have been updated.
+     * @notice Handle the receipt of multiple ERC-1155 token types.
+     * @dev An ERC-1155-compliant smart contract MUST call this function on the token recipient contract, at the end of a `safeBatchTransferFrom` after the balances have been updated.
      *      This function MUST return `bytes4(keccak256("onERC1155BatchReceived(address,address,uint256[],uint256[],bytes)"))` (i.e. 0xbc197c81) if it accepts the transfer(s).
      *      This function MUST revert if it rejects the transfer(s).
      *      Return of any other value than the prescribed keccak256 generated value MUST result in the transaction being reverted by the caller.

contracts/interfaces/ERC721TokenReceiver.sol

@@ -1,7 +1,10 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 pragma solidity >=0.7.0 <0.9.0;
 
-/// @dev Note: the ERC-165 identifier for this interface is 0x150b7a02.
+/**
+ * @title ERC-721 Token Receiver Interface
+ * @dev Note: the ERC-165 identifier for this interface is 0x150b7a02.
+ */
 interface ERC721TokenReceiver {
     /**
      * @notice Handle the receipt of an NFT

contracts/interfaces/ERC777TokensRecipient.sol

@@ -2,13 +2,13 @@
 pragma solidity >=0.7.0 <0.9.0;
 
 /**
- * @title ERC777TokensRecipient
- * @dev Interface for contracts that will be called with the ERC777 token's `tokensReceived` method.
- * The contract receiving the tokens must implement this interface to receive the tokens.
+ * @title ERC-777 Tokens Recipient Interface
+ * @dev Interface for contracts that will be called with the ERC-777 token's `tokensReceived` method.
+ *      The contract receiving the tokens must implement this interface to receive the tokens.
  */
 interface ERC777TokensRecipient {
     /**
-     * @dev Called by the ERC777 token contract after a successful transfer or a minting operation.
+     * @dev Called by the ERC-777 token contract after a successful transfer or a minting operation.
      * @param operator The address of the operator performing the transfer or minting operation.
      * @param from The address of the sender.
      * @param to The address of the recipient.

contracts/interfaces/IERC165.sol

@@ -1,15 +1,18 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 pragma solidity >=0.7.0 <0.9.0;
 
-/// @notice More details at https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/utils/introspection/IERC165.sol
+/**
+ * @title ERC-165 Inteface
+ * @dev More details at <https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/utils/introspection/IERC165.sol>
+ */
 interface IERC165 {
     /**
-     * @dev Returns true if this contract implements the interface defined by `interfaceId`.
-     * See the corresponding EIP section
-     * https://eips.ethereum.org/EIPS/eip-165#how-interfaces-are-identified
-     * to learn more about how these ids are created.
-     *
-     * This function call must use less than 30 000 gas.
+     * @notice Returns true if this contract implements the interface defined by `interfaceId`.
+     * @dev See the corresponding EIP section <https://eips.ethereum.org/EIPS/eip-165#how-interfaces-are-identified>
+     *      to learn more about how these ids are created.
+     *      This function call must use less than 30.000 gas.
+     * @param interfaceId The ID of the interface to check support for.
+     * @return Whether or not the interface is supported.
      */
     function supportsInterface(bytes4 interfaceId) external view returns (bool);
 }

contracts/interfaces/IFallbackManager.sol

@@ -2,20 +2,25 @@
 pragma solidity >=0.7.0 <0.9.0;
 
 /**
- * @title IFallbackManager - A contract interface managing fallback calls made to this contract.
+ * @title Fallback Manager Interface
+ * @notice Interface for managing how fallback calls made to this contract.
  * @author @safe-global/safe-protocol
  */
 interface IFallbackManager {
+    /**
+     * @notice The fallback handler has changed.
+     * @param handler The address of the new fallback handler.
+     */
     event ChangedFallbackHandler(address indexed handler);
 
     /**
      * @notice Set Fallback Handler to `handler` for the Safe.
      * @dev 1. Only fallback calls without value and with data will be forwarded.
      *      2. Changing the fallback handler can only be done via a Safe transaction.
      *      3. Cannot be set to the Safe itself.
-     *      4. IMPORTANT! SECURITY RISK! The fallback handler can be set to any address and all the calls will be forwarded to it,
+     *      4. ⚠️⚠️⚠️ IMPORTANT! SECURITY RISK! The fallback handler can be set to any address and all the calls will be forwarded to it,
      *         bypassing all the Safe's access control mechanisms. When setting the fallback handler, make sure to check the address
-     *         is a trusted contract and if it supports state changes, it implements the necessary checks.
+     *         is a trusted contract and if it supports state changes, it implements the necessary checks. ⚠️⚠️⚠️
      * @param handler contract to handle fallback calls.
      */
     function setFallbackHandler(address handler) external;

contracts/interfaces/IGuardManager.sol

@@ -7,15 +7,19 @@ pragma solidity >=0.7.0 <0.9.0;
  * @author @safe-global/safe-protocol
  */
 interface IGuardManager {
+    /**
+     * @notice Transaction guard changed.
+     * @param guard The address of the new transaction guard.
+     */
     event ChangedGuard(address indexed guard);
 
     /**
-     * @dev Set a guard that checks transactions before execution
-     *      This can only be done via a Safe transaction.
-     *      ⚠️ IMPORTANT: Since a guard has full power to block Safe transaction execution,
-     *        a broken guard can cause a denial of service for the Safe. Make sure to carefully
-     *        audit the guard code and design recovery mechanisms.
      * @notice Set Transaction Guard `guard` for the Safe. Make sure you trust the guard.
+     * @dev Set a guard that checks Safe transactions before and after execution.
+     *      This can only be done via a Safe transaction.
+     *      ⚠️⚠️⚠️ IMPORTANT: Since a guard has full power to block Safe transaction execution,
+     *      a broken guard can cause a denial of service for the Safe. Make sure to carefully
+     *      audit the guard code and design recovery mechanisms. ⚠️⚠️⚠️
      * @param guard The address of the guard to be used or the 0 address to disable the guard
      */
     function setGuard(address guard) external;