updated from extension to module

Author: GWSzeto

src/module/token/transferable/BridgeAndCallERC721.sol

@@ -1,19 +1,19 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {ModularExtension} from "../../../ModularExtension.sol";
+import {ModularModule} from "../../../ModularModule.sol";
 import {Role} from "../../../Role.sol";
 import {BeforeTransferCallbackERC721} from "../../../callback/BeforeTransferCallbackERC721.sol";
 import {IBridgeAndCall} from "@lxly-bridge-and-call/IBridgeAndCall.sol";
 
 library BridgeAndCallStorage {
+
     /// @custom:storage-location erc7201:token.bridgeAndCall
     bytes32 public constant BRIDGE_AND_CALL_STORAGE_POSITION =
-        keccak256(abi.encode(uint256(keccak256("token.bridgeAndCall")) - 1)) &
-            ~bytes32(uint256(0xff));
+        keccak256(abi.encode(uint256(keccak256("token.bridgeAndCall")) - 1)) & ~bytes32(uint256(0xff));
 
     struct Data {
-        address bridgeExtension;
+        address bridgeModule;
     }
 
     function data() internal pure returns (Data storage data_) {
@@ -22,69 +22,58 @@ library BridgeAndCallStorage {
             data_.slot := position
         }
     }
+
 }
 
-contract BridgeAndCallERC721 is ModularExtension, BeforeTransferCallbackERC721 {
+contract BridgeAndCallERC721 is ModularModule, BeforeTransferCallbackERC721 {
+
     /*//////////////////////////////////////////////////////////////
                                 ERRORS
     //////////////////////////////////////////////////////////////*/
 
     /// @notice Emitted on attempt to transfer a token when the bridge extension is not set.
-    error bridgeExtensionNotSet();
+    error bridgeModuleNotSet();
 
     /*//////////////////////////////////////////////////////////////
                             EXTENSION CONFIG
     //////////////////////////////////////////////////////////////*/
 
     /// @notice Returns all implemented callback and extension functions.
-    function getExtensionConfig()
-        external
-        pure
-        override
-        returns (ExtensionConfig memory config)
-    {
+    function getModuleConfig() external pure override returns (ModuleConfig memory config) {
         config.fallbackFunctions = new FallbackFunction[](4);
 
-        config.fallbackFunctions[0] = FallbackFunction({
-            selector: this.getBridgeExtension.selector,
-            permissionBits: 0
-        });
-        config.fallbackFunctions[1] = FallbackFunction({
-            selector: this.setBridgeExtension.selector,
-            permissionBits: Role._MANAGER_ROLE
-        });
-        config.fallbackFunctions[2] = FallbackFunction({
-            selector: this.bridgeAndCall.selector,
-            permissionBits: 0
-        });
+        config.fallbackFunctions[0] = FallbackFunction({selector: this.getBridgeModule.selector, permissionBits: 0});
+        config.fallbackFunctions[1] =
+            FallbackFunction({selector: this.setBridgeModule.selector, permissionBits: Role._MANAGER_ROLE});
+        config.fallbackFunctions[2] = FallbackFunction({selector: this.bridgeAndCall.selector, permissionBits: 0});
 
         config.requiredInterfaces = new bytes4[](1);
         config.requiredInterfaces[0] = 0x80ac58cd; // ERC721.
 
         config.registerInstallationCallback = true;
     }
 
-    /// @dev Called by a Core into an Extension during the installation of the Extension.
+    /// @dev Called by a Core into an Module during the installation of the Module.
     function onInstall(bytes calldata data) external {
-        address bridgeExtension = abi.decode(data, (address));
-        _bridgeAndCallStorage().bridgeExtension = bridgeExtension;
+        address bridgeModule = abi.decode(data, (address));
+        _bridgeAndCallStorage().bridgeModule = bridgeModule;
     }
 
-    /// @dev Called by a Core into an Extension during the uninstallation of the Extension.
+    /// @dev Called by a Core into an Module during the uninstallation of the Module.
     function onUninstall(bytes calldata data) external {}
 
     /*//////////////////////////////////////////////////////////////
                             FALLBACK FUNCTIONS
     //////////////////////////////////////////////////////////////*/
 
     /// @notice Returns whether transfers is enabled for the token.
-    function getBridgeExtension() external view returns (address) {
-        return _bridgeAndCallStorage().bridgeExtension;
+    function getBridgeModule() external view returns (address) {
+        return _bridgeAndCallStorage().bridgeModule;
     }
 
     /// @notice Set transferability for a token.
-    function setBridgeExtension(address enableTransfer) external {
-        _bridgeAndCallStorage().bridgeExtension = enableTransfer;
+    function setBridgeModule(address enableTransfer) external {
+        _bridgeAndCallStorage().bridgeModule = enableTransfer;
     }
 
     /// @notice Set transferability for a token.
@@ -96,31 +85,22 @@ contract BridgeAndCallERC721 is ModularExtension, BeforeTransferCallbackERC721 {
         bytes calldata callData,
         bool forceUpdateGlobalExitRoot
     ) external {
-        address bridgeExtension = _bridgeAndCallStorage().bridgeExtension;
-        if (bridgeExtension == address(0)) {
-            revert bridgeExtensionNotSet();
+        address bridgeModule = _bridgeAndCallStorage().bridgeModule;
+        if (bridgeModule == address(0)) {
+            revert bridgeModuleNotSet();
         }
 
-        IBridgeAndCall(bridgeExtension).bridgeAndCall(
-            address(this),
-            amount,
-            destinationNetwork,
-            callAddress,
-            fallbackAddress,
-            callData,
-            forceUpdateGlobalExitRoot
+        IBridgeAndCall(bridgeModule).bridgeAndCall(
+            address(this), amount, destinationNetwork, callAddress, fallbackAddress, callData, forceUpdateGlobalExitRoot
         );
     }
 
     /*//////////////////////////////////////////////////////////////
                             INTERNAL FUNCTIONS
     //////////////////////////////////////////////////////////////*/
 
-    function _bridgeAndCallStorage()
-        internal
-        pure
-        returns (BridgeAndCallStorage.Data storage)
-    {
+    function _bridgeAndCallStorage() internal pure returns (BridgeAndCallStorage.Data storage) {
         return BridgeAndCallStorage.data();
     }
+
 }