diff --git a/contracts/base/ERC721Multiwrap.sol b/contracts/base/ERC721Multiwrap.sol index 78fb9b774..c84064697 100644 --- a/contracts/base/ERC721Multiwrap.sol +++ b/contracts/base/ERC721Multiwrap.sol @@ -203,7 +203,7 @@ contract ERC721Multiwrap is Multicall, TokenStore, SoulboundERC721A, ERC721A, Co } /// @dev Returns whether transfers can be restricted in a given execution context. - function _canRestrictTransfers() internal virtual override returns (bool) { + function _canRestrictTransfers() internal view virtual override returns (bool) { return msg.sender == owner(); } diff --git a/contracts/extension/ContractMetadata.sol b/contracts/extension/ContractMetadata.sol index 0a3498128..c90ea0764 100644 --- a/contracts/extension/ContractMetadata.sol +++ b/contracts/extension/ContractMetadata.sol @@ -39,5 +39,5 @@ abstract contract ContractMetadata is IContractMetadata { } /// @dev Returns whether contract metadata can be set in the given execution context. - function _canSetContractURI() internal virtual returns (bool); + function _canSetContractURI() internal view virtual returns (bool); } diff --git a/contracts/extension/Drop.sol b/contracts/extension/Drop.sol index 2c0b031c8..b80e00fbc 100644 --- a/contracts/extension/Drop.sol +++ b/contracts/extension/Drop.sol @@ -316,5 +316,5 @@ abstract contract Drop is IDrop { returns (uint256 startTokenId); /// @dev Determine what wallet can update claim conditions - function _canSetClaimConditions() internal virtual returns (bool); + function _canSetClaimConditions() internal view virtual returns (bool); } diff --git a/contracts/extension/DropSinglePhase.sol b/contracts/extension/DropSinglePhase.sol index e86952d47..7693fe911 100644 --- a/contracts/extension/DropSinglePhase.sol +++ b/contracts/extension/DropSinglePhase.sol @@ -252,5 +252,5 @@ abstract contract DropSinglePhase is IDropSinglePhase { virtual returns (uint256 startTokenId); - function _canSetClaimConditions() internal virtual returns (bool); + function _canSetClaimConditions() internal view virtual returns (bool); } diff --git a/contracts/extension/DropSinglePhase1155.sol b/contracts/extension/DropSinglePhase1155.sol index 3dcbbe3a4..31127a1fd 100644 --- a/contracts/extension/DropSinglePhase1155.sol +++ b/contracts/extension/DropSinglePhase1155.sol @@ -272,5 +272,5 @@ abstract contract DropSinglePhase1155 is IDropSinglePhase1155 { uint256 _quantityBeingClaimed ) internal virtual; - function _canSetClaimConditions() internal virtual returns (bool); + function _canSetClaimConditions() internal view virtual returns (bool); } diff --git a/contracts/extension/Ownable.sol b/contracts/extension/Ownable.sol index fea6d8d18..593ac29ba 100644 --- a/contracts/extension/Ownable.sol +++ b/contracts/extension/Ownable.sol @@ -49,5 +49,5 @@ abstract contract Ownable is IOwnable { } /// @dev Returns whether owner can be set in the given execution context. - function _canSetOwner() internal virtual returns (bool); + function _canSetOwner() internal view virtual returns (bool); } diff --git a/contracts/extension/PlatformFee.sol b/contracts/extension/PlatformFee.sol index 8b9b86d5a..9662f9c30 100644 --- a/contracts/extension/PlatformFee.sol +++ b/contracts/extension/PlatformFee.sol @@ -51,5 +51,5 @@ abstract contract PlatformFee is IPlatformFee { } /// @dev Returns whether platform fee info can be set in the given execution context. - function _canSetPlatformFeeInfo() internal virtual returns (bool); + function _canSetPlatformFeeInfo() internal view virtual returns (bool); } diff --git a/contracts/extension/PrimarySale.sol b/contracts/extension/PrimarySale.sol index 0230ff398..351a9a3b3 100644 --- a/contracts/extension/PrimarySale.sol +++ b/contracts/extension/PrimarySale.sol @@ -41,5 +41,5 @@ abstract contract PrimarySale is IPrimarySale { } /// @dev Returns whether primary sale recipient can be set in the given execution context. - function _canSetPrimarySaleRecipient() internal virtual returns (bool); + function _canSetPrimarySaleRecipient() internal view virtual returns (bool); } diff --git a/contracts/extension/Royalty.sol b/contracts/extension/Royalty.sol index 58a588c26..2114047bc 100644 --- a/contracts/extension/Royalty.sol +++ b/contracts/extension/Royalty.sol @@ -130,5 +130,5 @@ abstract contract Royalty is IRoyalty { } /// @dev Returns whether royalty info can be set in the given execution context. - function _canSetRoyaltyInfo() internal virtual returns (bool); + function _canSetRoyaltyInfo() internal view virtual returns (bool); } diff --git a/contracts/extension/SignatureMintERC1155.sol b/contracts/extension/SignatureMintERC1155.sol index 4f8aaef3d..78a658883 100644 --- a/contracts/extension/SignatureMintERC1155.sol +++ b/contracts/extension/SignatureMintERC1155.sol @@ -2,9 +2,7 @@ pragma solidity ^0.8.0; import "./interface/ISignatureMintERC1155.sol"; - -import "@openzeppelin/contracts/utils/cryptography/ECDSA.sol"; -import "@openzeppelin/contracts/utils/cryptography/draft-EIP712.sol"; +import "../openzeppelin-presets/utils/cryptography/EIP712.sol"; abstract contract SignatureMintERC1155 is EIP712, ISignatureMintERC1155 { using ECDSA for bytes32; diff --git a/contracts/extension/SoulboundERC721A.sol b/contracts/extension/SoulboundERC721A.sol index fa1929f12..e22e51515 100644 --- a/contracts/extension/SoulboundERC721A.sol +++ b/contracts/extension/SoulboundERC721A.sol @@ -35,7 +35,7 @@ abstract contract SoulboundERC721A is PermissionsEnumerable { } /// @dev Returns whether transfers can be restricted in a given execution context. - function _canRestrictTransfers() internal virtual returns (bool); + function _canRestrictTransfers() internal view virtual returns (bool); /// @dev See {ERC721A-_beforeTokenTransfers}. function _beforeTokenTransfers( diff --git a/src/test/sdk/extension/ContractMetadata.t.sol b/src/test/sdk/extension/ContractMetadata.t.sol index 21fce8336..a28b9d076 100644 --- a/src/test/sdk/extension/ContractMetadata.t.sol +++ b/src/test/sdk/extension/ContractMetadata.t.sol @@ -13,7 +13,7 @@ contract MyContractMetadata is ContractMetadata { condition = _condition; } - function _canSetContractURI() internal override returns (bool) { + function _canSetContractURI() internal view override returns (bool) { return condition; } } diff --git a/src/test/sdk/extension/DropSinglePhase.t.sol b/src/test/sdk/extension/DropSinglePhase.t.sol index 531968fc0..94bef98e0 100644 --- a/src/test/sdk/extension/DropSinglePhase.t.sol +++ b/src/test/sdk/extension/DropSinglePhase.t.sol @@ -13,7 +13,7 @@ contract MyDropSinglePhase is DropSinglePhase { condition = _condition; } - function _canSetClaimConditions() internal override returns (bool) { + function _canSetClaimConditions() internal view override returns (bool) { return condition; } diff --git a/src/test/sdk/extension/DropSinglePhase1155.t.sol b/src/test/sdk/extension/DropSinglePhase1155.t.sol index feb9d2246..362f25396 100644 --- a/src/test/sdk/extension/DropSinglePhase1155.t.sol +++ b/src/test/sdk/extension/DropSinglePhase1155.t.sol @@ -13,7 +13,7 @@ contract MyDropSinglePhase1155 is DropSinglePhase1155 { condition = _condition; } - function _canSetClaimConditions() internal override returns (bool) { + function _canSetClaimConditions() internal view override returns (bool) { return condition; } diff --git a/src/test/sdk/extension/Ownable.t.sol b/src/test/sdk/extension/Ownable.t.sol index 69397a3e7..efc8e7ee8 100644 --- a/src/test/sdk/extension/Ownable.t.sol +++ b/src/test/sdk/extension/Ownable.t.sol @@ -13,7 +13,7 @@ contract MyOwnable is Ownable { condition = _condition; } - function _canSetOwner() internal override returns (bool) { + function _canSetOwner() internal view override returns (bool) { return condition; } } diff --git a/src/test/sdk/extension/PlatformFee.t.sol b/src/test/sdk/extension/PlatformFee.t.sol index 086922a7d..da05dc114 100644 --- a/src/test/sdk/extension/PlatformFee.t.sol +++ b/src/test/sdk/extension/PlatformFee.t.sol @@ -13,7 +13,7 @@ contract MyPlatformFee is PlatformFee { condition = _condition; } - function _canSetPlatformFeeInfo() internal override returns (bool) { + function _canSetPlatformFeeInfo() internal view override returns (bool) { return condition; } } diff --git a/src/test/sdk/extension/PrimarySale.t.sol b/src/test/sdk/extension/PrimarySale.t.sol index 94d6812b9..ce360dbdf 100644 --- a/src/test/sdk/extension/PrimarySale.t.sol +++ b/src/test/sdk/extension/PrimarySale.t.sol @@ -13,7 +13,7 @@ contract MyPrimarySale is PrimarySale { condition = _condition; } - function _canSetPrimarySaleRecipient() internal override returns (bool) { + function _canSetPrimarySaleRecipient() internal view override returns (bool) { return condition; } } diff --git a/src/test/sdk/extension/Royalty.t.sol b/src/test/sdk/extension/Royalty.t.sol index 18a81c2ba..51a73a6c5 100644 --- a/src/test/sdk/extension/Royalty.t.sol +++ b/src/test/sdk/extension/Royalty.t.sol @@ -13,7 +13,7 @@ contract MyRoyalty is Royalty { condition = _condition; } - function _canSetRoyaltyInfo() internal override returns (bool) { + function _canSetRoyaltyInfo() internal view override returns (bool) { return condition; }