Update dependencies for SignatureMintERC1155; Correct function mutability (#223)

kumaryash90 · web-flow · commit 906de9b1b099 · 2022-08-24T17:09:52.000+05:30
* update dependencies for SignatureMintERC1155

* change mutability to view
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ contract ERC721Multiwrap is Multicall, TokenStore, SoulboundERC721A, ERC721A, Co`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`/// @dev Returns whether transfers can be restricted in a given execution context.`
`206`		`- function _canRestrictTransfers() internal virtual override returns (bool) {`
	`206`	`+ function _canRestrictTransfers() internal view virtual override returns (bool) {`
`207`	`207`	`return msg.sender == owner();`
`208`	`208`	`}`
`209`	`209`
Original file line number	Diff line number	Diff line change
`@@ -39,5 +39,5 @@ abstract contract ContractMetadata is IContractMetadata {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`/// @dev Returns whether contract metadata can be set in the given execution context.`
`42`		`- function _canSetContractURI() internal virtual returns (bool);`
	`42`	`+ function _canSetContractURI() internal view virtual returns (bool);`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -316,5 +316,5 @@ abstract contract Drop is IDrop {`
`316`	`316`	`returns (uint256 startTokenId);`
`317`	`317`
`318`	`318`	`/// @dev Determine what wallet can update claim conditions`
`319`		`- function _canSetClaimConditions() internal virtual returns (bool);`
	`319`	`+ function _canSetClaimConditions() internal view virtual returns (bool);`
`320`	`320`	`}`
Original file line number	Diff line number	Diff line change
`@@ -252,5 +252,5 @@ abstract contract DropSinglePhase is IDropSinglePhase {`
`252`	`252`	`virtual`
`253`	`253`	`returns (uint256 startTokenId);`
`254`	`254`
`255`		`- function _canSetClaimConditions() internal virtual returns (bool);`
	`255`	`+ function _canSetClaimConditions() internal view virtual returns (bool);`
`256`	`256`	`}`
Original file line number	Diff line number	Diff line change
`@@ -272,5 +272,5 @@ abstract contract DropSinglePhase1155 is IDropSinglePhase1155 {`
`272`	`272`	`uint256 _quantityBeingClaimed`
`273`	`273`	`) internal virtual;`
`274`	`274`
`275`		`- function _canSetClaimConditions() internal virtual returns (bool);`
	`275`	`+ function _canSetClaimConditions() internal view virtual returns (bool);`
`276`	`276`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,5 +49,5 @@ abstract contract Ownable is IOwnable {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`/// @dev Returns whether owner can be set in the given execution context.`
`52`		`- function _canSetOwner() internal virtual returns (bool);`
	`52`	`+ function _canSetOwner() internal view virtual returns (bool);`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,5 +51,5 @@ abstract contract PlatformFee is IPlatformFee {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`/// @dev Returns whether platform fee info can be set in the given execution context.`
`54`		`- function _canSetPlatformFeeInfo() internal virtual returns (bool);`
	`54`	`+ function _canSetPlatformFeeInfo() internal view virtual returns (bool);`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,5 +41,5 @@ abstract contract PrimarySale is IPrimarySale {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`/// @dev Returns whether primary sale recipient can be set in the given execution context.`
`44`		`- function _canSetPrimarySaleRecipient() internal virtual returns (bool);`
	`44`	`+ function _canSetPrimarySaleRecipient() internal view virtual returns (bool);`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,5 +130,5 @@ abstract contract Royalty is IRoyalty {`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`/// @dev Returns whether royalty info can be set in the given execution context.`
`133`		`- function _canSetRoyaltyInfo() internal virtual returns (bool);`
	`133`	`+ function _canSetRoyaltyInfo() internal view virtual returns (bool);`
`134`	`134`	`}`