fixes

Author: ryanio

src-upgradeable/src/ERC721ContractMetadataUpgradeable.sol

@@ -13,6 +13,8 @@ import {
     ERC721TransferValidatorUpgradeable
 } from "./lib/ERC721TransferValidatorUpgradeable.sol";
 
+import { ERC721AUpgradeable } from "../lib/ERC721A-Upgradeable/contracts/ERC721AUpgradeable.sol";
+
 import {
     TwoStepOwnableUpgradeable
 } from "../lib-upgradeable/utility-contracts/src/TwoStepOwnableUpgradeable.sol";
@@ -300,8 +302,7 @@ contract ERC721ContractMetadataUpgradeable is
     function _beforeTokenTransfers(
         address from,
         address to,
-        uint256,
-        /* startTokenId */
+        uint256 startTokenId,
         uint256 /* quantity */
     ) internal virtual override {
         if (from != address(0) && to != address(0)) {
@@ -311,7 +312,7 @@ contract ERC721ContractMetadataUpgradeable is
                     msg.sender,
                     from,
                     to,
-                    tokenId
+                    startTokenId
                 );
             }
         }
@@ -326,7 +327,7 @@ contract ERC721ContractMetadataUpgradeable is
         public
         view
         virtual
-        override(IERC165Upgradeable, ERC721AConduitPreapprovedUpgradeable)
+        override(IERC165Upgradeable, ERC721AUpgradeable)
         returns (bool)
     {
         return

src-upgradeable/src/lib/ERC721AConduitPreapprovedUpgradeable.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.17;
 
-import {ERC721AUpgradeable} from "../../lib/ERC721A-Upgradeable/contracts/ERC721AUpgradeable.sol";
+import { ERC721AUpgradeable } from "../../lib/ERC721A-Upgradeable/contracts/ERC721AUpgradeable.sol";
 
 /**
  * @title  ERC721AConduitPreapproved
@@ -18,6 +18,7 @@ abstract contract ERC721AConduitPreapprovedUpgradeable is ERC721AUpgradeable {
         string memory name, string memory symbol
     ) internal onlyInitializing {
         __ERC721A_init_unchained(name, symbol);
+    }
 
     /**
      * @dev Returns if the `operator` is allowed to manage all of the

src-upgradeable/src/lib/ERC721TransferValidatorUpgradeable.sol

@@ -25,7 +25,7 @@ contract ERC721TransferValidatorUpgradeable {
     /// @notice Set the transfer validator.
     ///         The external method that uses this must include access control.
     function _setTransferValidator(address newValidator) internal {
-        address oldValidator = _transferValidator;
+        address oldValidator = ERC721ContractMetadataStorage.layout()._transferValidator;
         if (oldValidator == newValidator) {
             revert SameTransferValidator();
         }