feat(transfer): standard txs tests hypercerts

hypercerts-org · Oct 29, 2023 · 391d6f7 · 391d6f7
1 parent 042b99c
commit 391d6f7
Show file tree

Hide file tree

Showing 8 changed files with 570 additions and 17 deletions.
diff --git a/contracts/src/marketplace/LooksRareProtocol.sol b/contracts/src/marketplace/LooksRareProtocol.sol
@@ -79,7 +79,7 @@ import {QuoteType} from "./enums/QuoteType.sol";
  *                                             ~~~      ~~~
  *                                              ~~~~  ~~~~
  *                                                ~~~~~~
- * @author LooksRare protocol team (👀,💎)
+ * @author LooksRare protocol team (👀,💎); bitbeckers
  */
 contract LooksRareProtocol is
     ILooksRareProtocol,

diff --git a/contracts/src/marketplace/TransferSelectorNFT.sol b/contracts/src/marketplace/TransferSelectorNFT.sol
@@ -59,7 +59,7 @@ contract TransferSelectorNFT is ExecutionManager, PackableReentrancyGuard {
         } else if (collectionType == CollectionType.ERC1155) {
             transferManager.transferItemsERC1155(collection, sender, recipient, itemIds, amounts);
         } else if (collectionType == CollectionType.Hypercert) {
-            transferManager.transferItemsERC1155(collection, sender, recipient, itemIds, amounts);
+            transferManager.transferItemsHypercert(collection, sender, recipient, itemIds, amounts);
         } else if (collectionType == CollectionType.Hyperboard) {
             revert UnsupportedCollectionType();
         }

diff --git a/contracts/src/protocol/HypercertMinter.sol b/contracts/src/protocol/HypercertMinter.sol
@@ -8,8 +8,6 @@ import {PausableUpgradeable} from "oz-upgradeable/security/PausableUpgradeable.s
 
 import {Errors} from "./libs/Errors.sol";
 
-import "forge-std/console.sol";
-
 /// @title Contract for managing hypercert claims and whitelists
 /// @author bitbeckers
 /// @notice Implementation of the HypercertTokenInterface using { SemiFungible1155 } as underlying token.
@@ -230,15 +228,11 @@ contract HypercertMinter is IHypercertToken, SemiFungible1155, AllowlistMinter,
         // Transfer case, where to and from are non-zero
         uint256 len = ids.length;
         for (uint256 i; i < len;) {
-            console.log("Validating permissions");
             uint256 typeID = getBaseType(ids[i]);
             TransferRestrictions policy = typeRestrictions[typeID];
             if (policy == TransferRestrictions.DisallowAll) {
                 revert Errors.TransfersNotAllowed();
             } else if (policy == TransferRestrictions.FromCreatorOnly && from != creators[typeID]) {
-                console.log("Not allowed: from != creator");
-                console.log("from: %s != creator", from, creators[typeID]);
-
                 revert Errors.TransfersNotAllowed();
             }
             unchecked {

diff --git a/contracts/test/foundry/marketplace/StandardTransactions.t.sol b/contracts/test/foundry/marketplace/StandardTransactions.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.17;
+pragma solidity ^0.8.17;
 
 // Libraries, interfaces, errors
 import {OrderStructs} from "@hypercerts/marketplace/libraries/OrderStructs.sol";