feat: batch cancel, getAuction

Author: horsefacts

src/Auction.sol

@@ -135,37 +135,18 @@ contract Auction is IAuction, Ownable2Step, Pausable, EIP712 {
     }
 
     /// @inheritdoc IAuction
-    function cancel(bytes32 castHash, AuthData memory auth) external whenNotPaused {
-        // Auction must be active or ended (not settled or cancelled)
-        AuctionState state = auctionState(castHash);
-        if (state != AuctionState.Active && state != AuctionState.Ended) revert AuctionNotCancellable();
-
-        // Verify authorization
-        if (block.timestamp > auth.deadline) revert DeadlineExpired();
-        if (usedNonces[auth.nonce]) revert NonceAlreadyUsed();
-
-        // Validate signature
-        bytes32 digest = hashCancelAuthorization(castHash, auth.nonce, auth.deadline);
-        address signer = ECDSA.recover(digest, auth.signature);
-        if (!authorizers[signer]) revert Unauthorized();
-
-        // Mark nonce as used
-        usedNonces[auth.nonce] = true;
-
-        // Load refund info
-        AuctionData storage auctionData = auctions[castHash];
-        address refundAddress = auctionData.highestBidder;
-        uint96 refundBidderFid = auctionData.highestBidderFid;
-        uint256 refundAmount = auctionData.highestBid;
-
-        // Mark as cancelled
-        auctionData.state = AuctionState.Cancelled;
+    function batchCancel(bytes32[] calldata castHashes, AuthData[] calldata authDatas) external whenNotPaused {
+        uint256 length = castHashes.length;
+        if (length != authDatas.length) revert InvalidAuctionParams();
 
-        // Refund the highest bidder
-        usdc.transfer(refundAddress, refundAmount);
-        emit BidRefunded(castHash, refundAddress, refundAmount);
+        for (uint256 i = 0; i < length; ++i) {
+            _cancel(castHashes[i], authDatas[i]);
+        }
+    }
 
-        emit AuctionCancelled(castHash, refundAddress, refundBidderFid, signer);
+    /// @inheritdoc IAuction
+    function cancel(bytes32 castHash, AuthData memory auth) external whenNotPaused {
+        _cancel(castHash, auth);
     }
 
     /// @inheritdoc IAuction
@@ -260,25 +241,20 @@ contract Auction is IAuction, Ownable2Step, Pausable, EIP712 {
     /// @inheritdoc IAuction
     function auctionState(bytes32 castHash) public view returns (AuctionState) {
         AuctionData storage auctionData = auctions[castHash];
+        AuctionState state = auctionData.state;
 
-        if (auctionData.endTime == 0) {
-            return AuctionState.None;
-        }
-
-        // If auction is in terminal state, return that state
-        if (
-            auctionData.state == AuctionState.Settled || auctionData.state == AuctionState.Cancelled
-                || auctionData.state == AuctionState.Recovered
-        ) {
-            return auctionData.state;
+        if (block.timestamp > auctionData.endTime && state == AuctionState.Active) {
+            return AuctionState.Ended;
         }
 
-        // Otherwise, check if auction is active or ended based on time
-        if (block.timestamp < auctionData.endTime) {
-            return AuctionState.Active;
-        }
+        return state;
+    }
 
-        return AuctionState.Ended;
+    /// @inheritdoc IAuction
+    function getAuction(bytes32 castHash) external view returns (AuctionData memory) {
+        AuctionData memory auction = auctions[castHash];
+        auction.state = auctionState(castHash);
+        return auction;
     }
 
     /// @inheritdoc IAuction
@@ -484,6 +460,39 @@ contract Auction is IAuction, Ownable2Step, Pausable, EIP712 {
         emit AuctionSettled(castHash, auctionData.highestBidder, auctionData.highestBidderFid, auctionData.highestBid);
     }
 
+    function _cancel(bytes32 castHash, AuthData memory auth) internal {
+        // Auction must be active or ended (not settled or cancelled)
+        AuctionState state = auctionState(castHash);
+        if (state != AuctionState.Active && state != AuctionState.Ended) revert AuctionNotCancellable();
+
+        // Verify authorization
+        if (block.timestamp > auth.deadline) revert DeadlineExpired();
+        if (usedNonces[auth.nonce]) revert NonceAlreadyUsed();
+
+        // Validate signature
+        bytes32 digest = hashCancelAuthorization(castHash, auth.nonce, auth.deadline);
+        address signer = ECDSA.recover(digest, auth.signature);
+        if (!authorizers[signer]) revert Unauthorized();
+
+        // Mark nonce as used
+        usedNonces[auth.nonce] = true;
+
+        // Load refund info
+        AuctionData storage auctionData = auctions[castHash];
+        address refundAddress = auctionData.highestBidder;
+        uint96 refundBidderFid = auctionData.highestBidderFid;
+        uint256 refundAmount = auctionData.highestBid;
+
+        // Mark as cancelled
+        auctionData.state = AuctionState.Cancelled;
+
+        // Refund the highest bidder
+        usdc.transfer(refundAddress, refundAmount);
+        emit BidRefunded(castHash, refundAddress, refundAmount);
+
+        emit AuctionCancelled(castHash, refundAddress, refundBidderFid, signer);
+    }
+
     function _permitAndTransfer(uint256 amount, PermitData memory permit) internal {
         IERC20Permit(address(usdc)).permit(
             msg.sender, address(this), amount, permit.deadline, permit.v, permit.r, permit.s

src/interfaces/IAuction.sol

@@ -144,7 +144,9 @@ interface IAuction {
     event AuctionStarted(
         bytes32 indexed castHash, address indexed creator, uint96 creatorFid, uint40 endTime, address authorizer
     ); // New auction started with initial bid and signed parameters
-    event BidPlaced(bytes32 indexed castHash, address indexed bidder, uint96 bidderFid, uint256 amount, address indexed authorizer); // Bid placed on auction
+    event BidPlaced(
+        bytes32 indexed castHash, address indexed bidder, uint96 bidderFid, uint256 amount, address indexed authorizer
+    ); // Bid placed on auction
     event AuctionExtended(bytes32 indexed castHash, uint256 newEndTime); // Auction end time extended due to late bid
     event AuctionSettled(bytes32 indexed castHash, address indexed winner, uint96 winnerFid, uint256 amount); // Auction settled, NFT minted to winner
     event AuctionCancelled(
@@ -218,6 +220,14 @@ interface IAuction {
      */
     function cancel(bytes32 castHash, AuthData memory auth) external;
 
+    /**
+     * @notice Batch cancels multiple auctions
+     * @param castHashes Array of cast identifiers
+     * @param authDatas Array of signature authorizations (must match castHashes length)
+     * @dev Reverts entire batch if any cancellation fails
+     */
+    function batchCancel(bytes32[] calldata castHashes, AuthData[] calldata authDatas) external;
+
     /**
      * @notice Emergency recovery for stuck auctions
      * @param castHash Cast identifier
@@ -233,6 +243,14 @@ interface IAuction {
      */
     function auctionState(bytes32 castHash) external view returns (AuctionState);
 
+    /**
+     * @notice Get auction data with calculated state
+     * @param castHash Cast identifier
+     * @return Auction data with current calculated state
+     * @dev Returns empty struct for non-existent auctions
+     */
+    function getAuction(bytes32 castHash) external view returns (AuctionData memory);
+
     /**
      * @notice Computes bid authorization hash
      * @return EIP-712 hash for signature verification