chore: lint (new forge fmt)

Axis-Fi · Sep 19, 2024 · e9dc8d4 · e9dc8d4
1 parent 18ded86
commit e9dc8d4
Show file tree

Hide file tree

Showing 93 changed files with 1,169 additions and 420 deletions.
diff --git a/script/deploy/Deploy.s.sol b/script/deploy/Deploy.s.sol
@@ -220,7 +220,9 @@ contract Deploy is Script, WithEnvironment, WithSalts {
         if (saveDeployment) _saveDeployment(chain_);
     }
 
-    function _saveDeployment(string memory chain_) internal {
+    function _saveDeployment(
+        string memory chain_
+    ) internal {
         // Create the deployments folder if it doesn't exist
         if (!vm.isDir("./deployments")) {
             console2.log("Creating deployments directory");
@@ -349,7 +351,9 @@ contract Deploy is Script, WithEnvironment, WithSalts {
 
     // ========== CATALOGUE DEPLOYMENTS ========== //
 
-    function deployAtomicCatalogue(bytes memory) public virtual returns (address, string memory) {
+    function deployAtomicCatalogue(
+        bytes memory
+    ) public virtual returns (address, string memory) {
         // No args used
         console2.log("");
         console2.log("Deploying AtomicCatalogue");
@@ -378,7 +382,9 @@ contract Deploy is Script, WithEnvironment, WithSalts {
         return (address(atomicCatalogue), _PREFIX_DEPLOYMENT_ROOT);
     }
 
-    function deployBatchCatalogue(bytes memory) public virtual returns (address, string memory) {
+    function deployBatchCatalogue(
+        bytes memory
+    ) public virtual returns (address, string memory) {
         // No args used
         console2.log("");
         console2.log("Deploying BatchCatalogue");
@@ -442,7 +448,9 @@ contract Deploy is Script, WithEnvironment, WithSalts {
         return (address(amEmp), _PREFIX_AUCTION_MODULES);
     }
 
-    function deployFixedPriceSale(bytes memory) public virtual returns (address, string memory) {
+    function deployFixedPriceSale(
+        bytes memory
+    ) public virtual returns (address, string memory) {
         // No args used
         console2.log("");
         console2.log("Deploying FixedPriceSale");
@@ -471,7 +479,9 @@ contract Deploy is Script, WithEnvironment, WithSalts {
         return (address(amFps), _PREFIX_AUCTION_MODULES);
     }
 
-    function deployFixedPriceBatch(bytes memory) public virtual returns (address, string memory) {
+    function deployFixedPriceBatch(
+        bytes memory
+    ) public virtual returns (address, string memory) {
         // No args used
         console2.log("");
         console2.log("Deploying FixedPriceBatch");
@@ -566,17 +576,23 @@ contract Deploy is Script, WithEnvironment, WithSalts {
 
     // ========== HELPER FUNCTIONS ========== //
 
-    function _isAtomicAuctionHouse(string memory deploymentName) internal pure returns (bool) {
+    function _isAtomicAuctionHouse(
+        string memory deploymentName
+    ) internal pure returns (bool) {
         return keccak256(bytes(deploymentName)) == keccak256(_ATOMIC_AUCTION_HOUSE_NAME)
             || keccak256(bytes(deploymentName)) == keccak256(_BLAST_ATOMIC_AUCTION_HOUSE_NAME);
     }
 
-    function _isBatchAuctionHouse(string memory deploymentName) internal pure returns (bool) {
+    function _isBatchAuctionHouse(
+        string memory deploymentName
+    ) internal pure returns (bool) {
         return keccak256(bytes(deploymentName)) == keccak256(_BATCH_AUCTION_HOUSE_NAME)
             || keccak256(bytes(deploymentName)) == keccak256(_BLAST_BATCH_AUCTION_HOUSE_NAME);
     }
 
-    function _isAuctionHouse(string memory deploymentName) internal pure returns (bool) {
+    function _isAuctionHouse(
+        string memory deploymentName
+    ) internal pure returns (bool) {
         return _isAtomicAuctionHouse(deploymentName) || _isBatchAuctionHouse(deploymentName);
     }
 
@@ -623,7 +639,9 @@ contract Deploy is Script, WithEnvironment, WithSalts {
     ///
     /// @param  key_    Key to look for
     /// @return address Returns the address
-    function _getAddressNotZero(string memory key_) internal view returns (address) {
+    function _getAddressNotZero(
+        string memory key_
+    ) internal view returns (address) {
         // Get from the deployed addresses first
         address deployedAddress = deployedTo[key_];
 

diff --git a/script/deploy/DeployBlast.s.sol b/script/deploy/DeployBlast.s.sol
@@ -124,7 +124,9 @@ contract DeployBlast is Deploy {
         return (address(amEmp), _PREFIX_AUCTION_MODULES);
     }
 
-    function deployFixedPriceSale(bytes memory) public override returns (address, string memory) {
+    function deployFixedPriceSale(
+        bytes memory
+    ) public override returns (address, string memory) {
         // No args used
         console2.log("");
         console2.log("Deploying BlastFPS (Fixed Price Sale)");
@@ -152,7 +154,9 @@ contract DeployBlast is Deploy {
         return (address(amFps), _PREFIX_AUCTION_MODULES);
     }
 
-    function deployFixedPriceBatch(bytes memory) public override returns (address, string memory) {
+    function deployFixedPriceBatch(
+        bytes memory
+    ) public override returns (address, string memory) {
         // No args used
         console2.log("");
         console2.log("Deploying BlastFPB (Fixed Price Batch)");

diff --git a/script/deploy/WithEnvironment.s.sol b/script/deploy/WithEnvironment.s.sol
@@ -11,7 +11,9 @@ abstract contract WithEnvironment is Script {
     string public chain;
     string public env;
 
-    function _loadEnv(string calldata chain_) internal {
+    function _loadEnv(
+        string calldata chain_
+    ) internal {
         chain = chain_;
         console2.log("Using chain:", chain_);
 
@@ -24,7 +26,9 @@ abstract contract WithEnvironment is Script {
     ///
     /// @param  key_    The key to look up in the environment file
     /// @return address The address from the environment file, or the zero address
-    function _envAddress(string memory key_) internal view returns (address) {
+    function _envAddress(
+        string memory key_
+    ) internal view returns (address) {
         console2.log("    Checking in env.json");
         string memory fullKey = string.concat(".current.", chain, ".", key_);
         address addr;
@@ -47,7 +51,9 @@ abstract contract WithEnvironment is Script {
     ///
     /// @param  key_    The key to look up in the environment file
     /// @return address The address from the environment file
-    function _envAddressNotZero(string memory key_) internal view returns (address) {
+    function _envAddressNotZero(
+        string memory key_
+    ) internal view returns (address) {
         address addr = _envAddress(key_);
         require(
             addr != address(0), string.concat("WithEnvironment: key '", key_, "' has zero address")

diff --git a/script/ops/Batch.s.sol b/script/ops/Batch.s.sol
@@ -11,7 +11,9 @@ abstract contract Batch is BatchScript {
     string internal chain;
     address safe;
 
-    modifier isBatch(bool send_) {
+    modifier isBatch(
+        bool send_
+    ) {
         // Load environment addresses for chain
         chain = vm.envString("CHAIN");
         env = vm.readFile("./script/env.json");
@@ -26,7 +28,9 @@ abstract contract Batch is BatchScript {
         executeBatch(safe, send_);
     }
 
-    function envAddress(string memory key) internal view returns (address) {
+    function envAddress(
+        string memory key
+    ) internal view returns (address) {
         return env.readAddress(string.concat(".", chain, ".", key));
     }
 }
diff --git a/script/ops/lib/BatchScript.sol b/script/ops/lib/BatchScript.sol
@@ -155,7 +155,9 @@ abstract contract BatchScript is Script, DelegatePrank {
     }
 
     // Encodes the stored encoded transactions into a single Multisend transaction
-    function _createBatch(address safe_) internal returns (Batch memory batch) {
+    function _createBatch(
+        address safe_
+    ) internal returns (Batch memory batch) {
         // Set initial batch fields
         batch.to = SAFE_MULTISEND_ADDRESS;
         batch.value = 0;
@@ -359,7 +361,9 @@ abstract contract BatchScript is Script, DelegatePrank {
         return payload;
     }
 
-    function _stripSlashQuotes(string memory str_) internal returns (string memory) {
+    function _stripSlashQuotes(
+        string memory str_
+    ) internal returns (string memory) {
         // solhint-disable quotes
         // Remove slash quotes from string
         string memory command = string.concat(
@@ -386,7 +390,9 @@ abstract contract BatchScript is Script, DelegatePrank {
         return string(res);
     }
 
-    function _getNonce(address safe_) internal returns (uint256) {
+    function _getNonce(
+        address safe_
+    ) internal returns (uint256) {
         string memory endpoint = string.concat(SAFE_API_BASE_URL, vm.toString(safe_), "/");
         (uint256 status, bytes memory data) = endpoint.get();
         if (status == 200) {
@@ -397,7 +403,9 @@ abstract contract BatchScript is Script, DelegatePrank {
         }
     }
 
-    function _getSafeAPIEndpoint(address safe_) internal view returns (string memory) {
+    function _getSafeAPIEndpoint(
+        address safe_
+    ) internal view returns (string memory) {
         return string.concat(SAFE_API_BASE_URL, vm.toString(safe_), SAFE_API_MULTISIG_SEND);
     }
 

diff --git a/script/ops/lib/Surl.sol b/script/ops/lib/Surl.sol
@@ -6,7 +6,9 @@ import {Vm} from "@forge-std-1.9.1/Vm.sol";
 library Surl {
     Vm constant vm = Vm(address(bytes20(uint160(uint256(keccak256("hevm cheat code"))))));
 
-    function get(string memory self) internal returns (uint256 status, bytes memory data) {
+    function get(
+        string memory self
+    ) internal returns (uint256 status, bytes memory data) {
         string[] memory empty = new string[](0);
         return get(self, empty);
     }
@@ -18,7 +20,9 @@ library Surl {
         return curl(self, headers, "", "GET");
     }
 
-    function del(string memory self) internal returns (uint256 status, bytes memory data) {
+    function del(
+        string memory self
+    ) internal returns (uint256 status, bytes memory data) {
         string[] memory empty = new string[](0);
         return curl(self, empty, "", "DELETE");
     }
@@ -39,7 +43,9 @@ library Surl {
         return curl(self, headers, body, "DELETE");
     }
 
-    function patch(string memory self) internal returns (uint256 status, bytes memory data) {
+    function patch(
+        string memory self
+    ) internal returns (uint256 status, bytes memory data) {
         string[] memory empty = new string[](0);
         return curl(self, empty, "", "PATCH");
     }
@@ -60,7 +66,9 @@ library Surl {
         return curl(self, headers, body, "PATCH");
     }
 
-    function post(string memory self) internal returns (uint256 status, bytes memory data) {
+    function post(
+        string memory self
+    ) internal returns (uint256 status, bytes memory data) {
         string[] memory empty = new string[](0);
         return curl(self, empty, "", "POST");
     }
@@ -81,7 +89,9 @@ library Surl {
         return curl(self, headers, body, "POST");
     }
 
-    function put(string memory self) internal returns (uint256 status, bytes memory data) {
+    function put(
+        string memory self
+    ) internal returns (uint256 status, bytes memory data) {
         string[] memory empty = new string[](0);
         return curl(self, empty, "", "PUT");
     }

diff --git a/script/salts/WithSalts.s.sol b/script/salts/WithSalts.s.sol
@@ -16,7 +16,9 @@ contract WithSalts is Script {
         return string.concat("./", _BYTECODE_DIR);
     }
 
-    function _getBytecodePath(string memory name_) internal pure returns (string memory) {
+    function _getBytecodePath(
+        string memory name_
+    ) internal pure returns (string memory) {
         return string.concat(_getBytecodeDirectory(), "/", name_, ".bin");
     }
 

diff --git a/script/salts/auctionHouse/AuctionHouseSalts.s.sol b/script/salts/auctionHouse/AuctionHouseSalts.s.sol
@@ -14,7 +14,9 @@ contract AuctionHouseSalts is Script, WithEnvironment, WithSalts {
     address internal _envPermit2;
     address internal _envProtocol;
 
-    function _setUp(string calldata chain_) internal {
+    function _setUp(
+        string calldata chain_
+    ) internal {
         _loadEnv(chain_);
         _createBytecodeDirectory();
 

diff --git a/script/salts/auctionHouse/AuctionHouseSaltsBlast.s.sol b/script/salts/auctionHouse/AuctionHouseSaltsBlast.s.sol
@@ -17,7 +17,9 @@ contract AuctionHouseSaltsBlast is Script, WithEnvironment, WithSalts {
     address internal _envWeth;
     address internal _envUsdb;
 
-    function _setUp(string calldata chain_) internal {
+    function _setUp(
+        string calldata chain_
+    ) internal {
         _loadEnv(chain_);
 
         // Cache required variables

diff --git a/script/salts/test/TestSalts.s.sol b/script/salts/test/TestSalts.s.sol
@@ -15,7 +15,9 @@ import {TestConstants} from "../../../test/Constants.sol";
 contract TestSalts is Script, WithEnvironment, Permit2User, WithSalts, TestConstants {
     string internal constant _MOCK_CALLBACK = "MockCallback";
 
-    function _setUp(string calldata chain_) internal {
+    function _setUp(
+        string calldata chain_
+    ) internal {
         _loadEnv(chain_);
         _createBytecodeDirectory();
     }

diff --git a/src/AtomicCatalogue.sol b/src/AtomicCatalogue.sol
@@ -14,7 +14,9 @@ import {Catalogue} from "./bases/Catalogue.sol";
 contract AtomicCatalogue is IAtomicCatalogue, Catalogue {
     // ========== CONSTRUCTOR ========== //
 
-    constructor(address auctionHouse_) Catalogue(auctionHouse_) {}
+    constructor(
+        address auctionHouse_
+    ) Catalogue(auctionHouse_) {}
 
     // ========== ATOMIC AUCTION ========== //
 
@@ -49,7 +51,9 @@ contract AtomicCatalogue is IAtomicCatalogue, Catalogue {
     }
 
     /// @inheritdoc IAtomicCatalogue
-    function maxPayout(uint96 lotId_) external view returns (uint256) {
+    function maxPayout(
+        uint96 lotId_
+    ) external view returns (uint256) {
         IAtomicAuction module =
             IAtomicAuction(address(IAuctionHouse(auctionHouse).getAuctionModuleForId(lotId_)));
 
@@ -60,7 +64,9 @@ contract AtomicCatalogue is IAtomicCatalogue, Catalogue {
     }
 
     /// @inheritdoc IAtomicCatalogue
-    function maxAmountAccepted(uint96 lotId_) external view returns (uint256) {
+    function maxAmountAccepted(
+        uint96 lotId_
+    ) external view returns (uint256) {
         IAtomicAuction module =
             IAtomicAuction(address(IAuctionHouse(auctionHouse).getAuctionModuleForId(lotId_)));
 

diff --git a/src/BatchAuctionHouse.sol b/src/BatchAuctionHouse.sol
@@ -476,7 +476,9 @@ contract BatchAuctionHouse is IBatchAuctionHouse, AuctionHouse {
     ///             Note that this function will not revert if the `onCancel` callback reverts.
     ///
     /// @param      lotId_   The lot ID to abort
-    function abort(uint96 lotId_) external override nonReentrant {
+    function abort(
+        uint96 lotId_
+    ) external override nonReentrant {
         // Validation
         _isLotValid(lotId_);
 
@@ -525,7 +527,9 @@ contract BatchAuctionHouse is IBatchAuctionHouse, AuctionHouse {
 
     // ========== INTERNAL FUNCTIONS ========== //
 
-    function getBatchModuleForId(uint96 lotId_) public view returns (BatchAuctionModule) {
+    function getBatchModuleForId(
+        uint96 lotId_
+    ) public view returns (BatchAuctionModule) {
         return BatchAuctionModule(address(_getAuctionModuleForId(lotId_)));
     }
 }
diff --git a/src/BatchCatalogue.sol b/src/BatchCatalogue.sol
@@ -13,12 +13,16 @@ import {Catalogue} from "./bases/Catalogue.sol";
 contract BatchCatalogue is IBatchCatalogue, Catalogue {
     // ========== CONSTRUCTOR ========== //
 
-    constructor(address auctionHouse_) Catalogue(auctionHouse_) {}
+    constructor(
+        address auctionHouse_
+    ) Catalogue(auctionHouse_) {}
 
     // ========== RETRIEVING BIDS ========== //
 
     /// @inheritdoc IBatchCatalogue
-    function getNumBids(uint96 lotId_) external view returns (uint256) {
+    function getNumBids(
+        uint96 lotId_
+    ) external view returns (uint256) {
         IBatchAuction module =
             IBatchAuction(address(IAuctionHouse(auctionHouse).getAuctionModuleForId(lotId_)));