Merge pull request #313 from Uniswap/hotfix-staging

release(v1.1.0): hotfix

Author: zhongeric

CHANGELOG.md

@@ -11,11 +11,13 @@ Fully backwards compatible with Liquidity Launcher v1.0.0 deployments. Contains
 - New package `blocknumberish` to handle block number retrieval on different chains (to support Arbitrum)
 - `IContinuousClearingAuction.lbpInitializationParams` to return the initialization parameters for the LBP initializer
 - `IContinuousClearingAuction.supportsInterface` to check if the contract supports the LBP initializer interface
+- Added `ValidationHookIntrospection` to existing ValidationHook contracts to support introspection via ERC165
 
 ### Changed
 
-- Some minor code quality changes
+- Fixed a bug in certain rare edge cases which would cause bids to be permanently locked in the contract
 - Fixed an issue in error parameter order
+- Some minor code quality changes
 
 ### Audits
 
@@ -24,10 +26,10 @@ Fully backwards compatible with Liquidity Launcher v1.0.0 deployments. Contains
 **ContinuousClearingAuctionFactory**
 | Network | Address | Commit Hash | Version |
 | -------- | ------------------------------------------ | ---------------------------------------- | ---------------- |
-| Mainnet | 0xcca1101C61cF5cb44C968947985300DF945C3565 | 95d7da7a2d25cf60f14eaccd6ab5fb24d393a452 | v1.1.0 |
-| Unichain | 0xcca1101C61cF5cb44C968947985300DF945C3565 | 95d7da7a2d25cf60f14eaccd6ab5fb24d393a452 | v1.1.0 |
-| Base | 0xcca1101C61cF5cb44C968947985300DF945C3565 | 95d7da7a2d25cf60f14eaccd6ab5fb24d393a452 | v1.1.0 |
-| Sepolia | 0xcca1101C61cF5cb44C968947985300DF945C3565 | 95d7da7a2d25cf60f14eaccd6ab5fb24d393a452 | v1.1.0 |
+| Mainnet | 0xCCccCcCAE7503Cac057829BF2811De42E16e0bD5 | 87b2546a298f691c095b06ec077ceef25ba56007 | v1.1.0 |
+| Unichain | 0xCCccCcCAE7503Cac057829BF2811De42E16e0bD5 | 87b2546a298f691c095b06ec077ceef25ba56007 | v1.1.0 |
+| Base | 0xCCccCcCAE7503Cac057829BF2811De42E16e0bD5 | 87b2546a298f691c095b06ec077ceef25ba56007 | v1.1.0 |
+| Sepolia | 0xCCccCcCAE7503Cac057829BF2811De42E16e0bD5 | 87b2546a298f691c095b06ec077ceef25ba56007 | v1.1.0 |
 
 ## v1.0.0
 

README.md

@@ -35,7 +35,7 @@ Addresses are cannonical across select EVM chains. If it is not already deployed
 
 | Network  | Address                                    | Commit Hash                              | Version          |
 | -------- | ------------------------------------------ | ---------------------------------------- | ---------------- |
-| v1.1.0   | 0xcca1101C61cF5cb44C968947985300DF945C3565 | 95d7da7a2d25cf60f14eaccd6ab5fb24d393a452 | v1.1.0           |
+| v1.1.0   | 0xCCccCcCAE7503Cac057829BF2811De42E16e0bD5 | 87b2546a298f691c095b06ec077ceef25ba56007 | v1.1.0           |
 | v1.0.0\* | 0x0000ccaDF55C911a2FbC0BB9d2942Aa77c6FAa1D | 154fd189022858707837112943c09346869c964f | v1.0.0-candidate |
 
 > \*v1.0.0-candidate is the initial version of CCA and is NOT recommended for production use. For more details, see the [Changelog](./CHANGELOG.md).

docs/autogen/src/README.md

@@ -35,7 +35,7 @@ Addresses are cannonical across select EVM chains. If it is not already deployed
 
 | Network  | Address                                    | Commit Hash                              | Version          |
 | -------- | ------------------------------------------ | ---------------------------------------- | ---------------- |
-| v1.1.0   | 0xcca1101C61cF5cb44C968947985300DF945C3565 | 95d7da7a2d25cf60f14eaccd6ab5fb24d393a452 | v1.1.0           |
+| v1.1.0   | 0xCCccCcCAE7503Cac057829BF2811De42E16e0bD5 |  | v1.1.0           |
 | v1.0.0\* | 0x0000ccaDF55C911a2FbC0BB9d2942Aa77c6FAa1D | 154fd189022858707837112943c09346869c964f | v1.0.0-candidate |
 
 > \*v1.0.0-candidate is the initial version of CCA and is NOT recommended for production use. For more details, see the [Changelog](./CHANGELOG.md).

script/IntrospectionSelectors.s.sol

@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.26;
+
+import {IValidationHook} from '../src/interfaces/IValidationHook.sol';
+import {IBaseERC1155ValidationHook} from '../src/periphery/validationHooks/BaseERC1155ValidationHook.sol';
+import {IGatedERC1155ValidationHook} from '../src/periphery/validationHooks/GatedERC1155ValidationHook.sol';
+import {IValidationHookIntrospection} from '../src/periphery/validationHooks/ValidationHookIntrospection.sol';
+import {IERC165} from '@openzeppelin/contracts/utils/introspection/IERC165.sol';
+import {console} from 'forge-std/console.sol';
+
+contract IntrospectionSelectors {
+    function run() public {
+        console.log('IERC165');
+        console.logBytes4(type(IERC165).interfaceId);
+        console.log('IValidationHook');
+        console.logBytes4(type(IValidationHook).interfaceId);
+        console.log('IBaseERC1155ValidationHook');
+        console.logBytes4(type(IBaseERC1155ValidationHook).interfaceId);
+        console.log('IGatedERC1155ValidationHook');
+        console.logBytes4(type(IGatedERC1155ValidationHook).interfaceId);
+    }
+}

script/deploy/DeployContinuousAuctionFactory.s.sol

@@ -8,7 +8,7 @@ import 'forge-std/console2.sol';
 
 /// @title DeployContinuousAuctionFactoryScript
 /// @notice Script to deploy the ContinuousClearingAuctionFactory
-/// @dev This will deploy to 0xcca1101C61cF5cb44C968947985300DF945C3565 on most EVM chains
+/// @dev This will deploy to 0xCCccCcCAE7503Cac057829BF2811De42E16e0bD5 on most EVM chains
 ///      with the CREATE2 deployer at 0x4e59b44847b379578588920cA78FbF26c0B4956C
 contract DeployContinuousAuctionFactoryScript is Script {
     function run() public returns (IContinuousClearingAuctionFactory factory) {
@@ -17,8 +17,8 @@ contract DeployContinuousAuctionFactoryScript is Script {
         bytes32 initCodeHash = keccak256(type(ContinuousClearingAuctionFactory).creationCode);
         console2.logBytes32(initCodeHash);
 
-        // Deploys to: 0xcca1101C61cF5cb44C968947985300DF945C3565
-        bytes32 salt = 0x3607090e08af583d30437fc9eb4cd2105a732f30be11624f8d145b53167f17f9;
+        // Deploys to: 0xCCccCcCAE7503Cac057829BF2811De42E16e0bD5
+        bytes32 salt = 0xf0354626131f1f8f0a1f7a3837aa270bdcfc1a9e5c6f9125a6f69ba45e416ce3;
         factory = IContinuousClearingAuctionFactory(address(new ContinuousClearingAuctionFactory{salt: salt}()));
 
         console2.log('ContinuousClearingAuctionFactory deployed to:', address(factory));

snapshots/AuctionTest.json

@@ -1,11 +1,11 @@
 {
-  "Auction bytecode size": "18374",
+  "Auction bytecode size": "18420",
   "checkpoint_advanceToCurrentStep": "179349",
   "checkpoint_noBids": "165321",
   "checkpoint_zeroSupply": "119208",
   "claimTokens": "67156",
-  "exitBid": "84483",
-  "exitPartiallyFilledBid": "230504",
+  "exitBid": "84402",
+  "exitPartiallyFilledBid": "230397",
   "submitBid": "154252",
   "submitBidWithoutPrevTickPrice": "154140",
   "submitBidWithoutPrevTickPrice_initializeTick_search": "202179",