Gradual Dutch Auction Module

README.md

@@ -65,6 +65,14 @@ Then, the test suite can be run with:
 pnpm run test
 ```
 
+Or:
+
+```shell
+forge test
+```
+
+This command usually performs faster than the `pnpm` command.
+
 #### Address Mismatch
 
 Many of the contracts (e.g. callbacks) require a specific address prefix or have a deterministic address. If tests are failing for this reason, the cause is usually one of:

foundry.toml

@@ -5,9 +5,11 @@ fs_permissions = [{access = "read-write", path = "./bytecode/"}, {access = "read
 ffi = true
 solc_version = "0.8.19"
 evm_version = "paris"
+no-match-test = "optimal"
 
 [fuzz]
-runs = 1024
+runs = 4096
+max_test_rejects = 20000000
 
 # Remappings are setup using remappings.txt, since forge seems to ignore remappings here
 
@@ -27,7 +29,8 @@ ignore = [
 
 [dependencies]
 forge-std = { version = "1.9.1" }
-solmate = { version = "6.7.0", url = "git@github.com:transmissions11/solmate.git", commit = "c892309933b25c03d32b1b0d674df7ae292ba925" }
+solmate = { version = "6.7.0", git = "https://github.com/transmissions11/solmate.git", rev = "c892309933b25c03d32b1b0d674df7ae292ba925" }
 solady = { version = "0.0.124" }
 "@openzeppelin-contracts" = { version = "4.9.2" }
-clones-with-immutable-args = { version = "1.1.1", git = "[email protected]:wighawag/clones-with-immutable-args.git", rev = "f5ca191afea933d50a36d101009b5644dc28bc99" }
+clones-with-immutable-args = { version = "1.1.1", git = "https://github.com/wighawag/clones-with-immutable-args.git", rev = "f5ca191afea933d50a36d101009b5644dc28bc99" }
+prb-math = { version = "4.0-axis", git = "https://github.com/Oighty/prb-math" }

remappings.txt

@@ -1,5 +1,6 @@
+@clones-with-immutable-args-1.1.1=dependencies/clones-with-immutable-args-1.1.1/src
 @forge-std-1.9.1=dependencies/forge-std-1.9.1/src
-@solmate-6.7.0=dependencies/solmate-6.7.0/src
-@solady-0.0.124=dependencies/solady-0.0.124/src
 @openzeppelin-contracts-4.9.2=dependencies/@openzeppelin-contracts-4.9.2
-@clones-with-immutable-args-1.1.1=dependencies/clones-with-immutable-args-1.1.1/src
+@solady-0.0.124=dependencies/solady-0.0.124/src
+@solmate-6.7.0=dependencies/solmate-6.7.0/src
+prb-math-4.0-axis/=dependencies/prb-math-4.0-axis/src

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_];
 

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)");

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")

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));
     }
 }

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);
     }
 

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");
     }

script/salts/TestSaltConstants.sol

@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity 0.8.19;
+
+abstract contract TestSaltConstants {
+    address internal constant _OWNER = address(0x1);
+    address internal constant _AUCTION_HOUSE = address(0x000000000000000000000000000000000000000A);
+
+    address internal constant _UNISWAP_V2_FACTORY =
+        address(0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f);
+    address internal constant _UNISWAP_V2_ROUTER =
+        address(0x1EBC400fd43aC56937d4e14B8495B0f021e7c876);
+    address internal constant _UNISWAP_V3_FACTORY =
+        address(0x7F1bb763E9acE13Ad3488E3d48D4AE1cde6E9604);
+    address internal constant _GUNI_FACTORY = address(0x2Bc907bF89D72479e6b6A38CC89fdE71672ba90e);
+}

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");
     }
 

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();
 

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