magicdrop v1.0.1

cli/cmds/contract

@@ -128,20 +128,9 @@ freeze_thaw_contract() {
 
     set_chain
     set_contract_address
-    set_token_standard
 
     print_signer_with_balance $chain_id
 
-    if [ -z "$is_icreatortoken" ]; then
-        supports_icreatortoken
-        is_icreatortoken=$?
-    fi
-
-    if [ -z "$tf_address" ] && [ $is_icreatortoken -eq 0 ]; then
-        tf_address=$(get_transfer_validator_address $chain_id)
-    fi
-
-
     choice=$(gum choose "Freeze" "Thaw")
     if [ "$choice" == "Freeze" ]; then
         freeze_contract
@@ -153,46 +142,39 @@ freeze_thaw_contract() {
 freeze_contract() {
     echo "Freezing contract... this will take a moment."
 
-    if [ "$token_standard" == "ERC1155" ]; then
-        output=$(cast send $contract_address "setTransferable(bool)" true $password --rpc-url "$RPC_URL" --json)
-    elif [ "$token_standard" == "ERC721" ] && [ $is_icreatortoken -eq 0 ]; then
-        freeze_level=8 # https://erc721c.com/docs/integration-guide/creator-token-standards/v3/for-creators/transfer-security
-        output=$(cast send $tf_address "setTransferSecurityLevelOfCollection(address,uint8,bool,bool,bool)" $contract_address 8 false false false $password --rpc-url "$RPC_URL" --json)
-    else
-        echo "Contract does not support freezing."
-        exit 1
-    fi
+    output=$(cast send $contract_address "setTransferable(bool)" false $password --rpc-url "$RPC_URL" --json)
 
     print_transaction_hash $output
-    echo "Contract frozen."
+    echo "Token transfers frozen."
     echo ""
 }
 
 thaw_contract() {
     echo "Thawing contract... this will take a moment."
 
-    if [ "$token_standard" == "ERC1155" ]; then
-        output=$(cast send $contract_address "setTransferable(bool)" true $password --rpc-url "$RPC_URL" --json)
-    elif [ "$token_standard" == "ERC721" ] && [ $is_icreatortoken -eq 0 ]; then
-        # level 3 is the default level of Magic Eden, which offers whitelisting and OTC trading
-        thaw_level=3 # https://erc721c.com/docs/integration-guide/creator-token-standards/v3/for-creators/transfer-security
-        output=$(cast send $tf_address "setTransferSecurityLevelOfCollection(address,uint8,bool,bool,bool)" $contract_address 3 false false false $password --rpc-url "$RPC_URL" --json)
-    else
-        echo "Contract does not support thawing."
-        exit 1
-    fi
+    output=$(cast send $contract_address "setTransferable(bool)" true $password --rpc-url "$RPC_URL" --json)
 
     print_transaction_hash $output
-    echo "Contract thawed."
+    echo "Token transfers thawed."
     echo ""
 }
 
+check_setup_locked() {
+    setup_locked=$(cast call $contract_address "isSetupLocked()" --rpc-url "$RPC_URL" $password)
+    if [ "$setup_locked" == "$TRUE_HEX" ]; then
+        echo "This contract has already been setup. Please use other commands from the 'Manage Contracts' menu to update the contract."
+        exit 1
+    fi
+}
+
 setup_contract() {
     clear 
     trap "echo 'Exiting...'; exit 1" SIGINT
 
     title="Setup an existing collection"
 
+    check_setup_locked
+
     set_chain
     set_contract_address
     set_token_standard
@@ -201,7 +183,11 @@ setup_contract() {
     if [ "$token_standard" == "ERC1155" ]; then
         set_number_of_1155_tokens
         set_1155_uri
-    else
+        token_uri_suffix=
+        base_uri=
+    elif [ "$token_standard" == "ERC721" ]; then
+        set_base_uri
+        set_token_uri_suffix
         uri=
     fi
 
@@ -226,7 +212,7 @@ setup_contract() {
     if [ "$token_standard" == "ERC1155" ]; then
         setup_selector="setup(string,uint256[],uint256[],address,address,(uint80[],uint80[],uint32[],bytes32[],uint24[],uint256,uint256)[],address,uint96)"
     elif [ "$token_standard" == "ERC721" ]; then
-        setup_selector="setup(uint256,uint256,address,address,(uint80,uint80,uint32,bytes32,uint24,uint256,uint256)[],address,uint96)"
+        setup_selector="setup(string,string,uint256,uint256,address,address,(uint80,uint80,uint32,bytes32,uint24,uint256,uint256)[],address,uint96)"
     else
         echo "Unknown token standard"
         exit 1
@@ -237,6 +223,8 @@ setup_contract() {
     output=$(cast send $contract_address \
         "$setup_selector" \
         $uri \
+        $base_uri \
+        $token_uri_suffix \
         "$max_mintable_supply" \
         "$global_wallet_limit" \
         "$mint_currency" \

cli/cmds/getters

@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 
+MAGIC_EDEN_DEFAULT_LIST_ID="1"
+# We use list 3 for Polygon because list 1 was already taken.
+MAGIC_EDEN_POLYGON_LIST_ID="3"
+
+
 get_numeric_input() {
     local prompt="$1"
     local input
@@ -91,14 +96,11 @@ get_transfer_validator_address() {
 get_transfer_validator_list_id() {
     local network="$1"
     case $network in
-        "33139"|"42161"|"8453"|"1")
-            echo "1"
-            ;;
         "137")
-            echo "3"
+            echo $MAGIC_EDEN_POLYGON_LIST_ID
             ;;
         *)
-            echo "0" # default list id
+            echo $MAGIC_EDEN_DEFAULT_LIST_ID
             ;;
     esac
 }

contracts/common/ErrorsAndEvents.sol

@@ -24,8 +24,11 @@ interface ErrorsAndEvents {
     error NewSupplyLessThanTotalSupply();
     error NotTransferable();
     error InitialOwnerCannotBeZero();
+    error ContractAlreadySetup();
+    error TransferableAlreadySet();
 
     event SetMintable(bool mintable);
+    event SetTransferable(bool transferable);
     event SetActiveStage(uint256 activeStage);
     event SetBaseURI(string baseURI);
     event SetTokenURISuffix(string suffix);

contracts/nft/creator-token-standards/ERC721ACQueryableInitializable.sol

@@ -2,38 +2,30 @@
 pragma solidity ^0.8.22;
 
 import "@limitbreak/creator-token-standards/src/utils/CreatorTokenBase.sol";
-import "erc721a-upgradeable/contracts/extensions/ERC721AQueryableUpgradeable.sol";
 import "@limitbreak/creator-token-standards/src/utils/AutomaticValidatorTransferApproval.sol";
-import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 
-/**
- * @title ERC721ACQueryableInitializable
- * @dev This contract is not meant for use in Upgradeable Proxy contracts though it may base on Upgradeable contract. The purpose of this
- * contract is for use with EIP-1167 Minimal Proxies (Clones).
- */
+import {ERC721A, IERC721A} from "erc721a/contracts/ERC721A.sol";
+
+import "contracts/nft/erc721m/clones/ERC721AConduitPreapprovedCloneable.sol";
+
+/// @title ERC721ACQueryableInitializable
+/// @notice An ERC721AC extension with queryable and initialization features.
+/// @dev The purpose of this contract is for use with EIP-1167 Minimal Proxies (Clones).
 abstract contract ERC721ACQueryableInitializable is
-    ERC721AQueryableUpgradeable,
+    ERC721AConduitPreapprovedCloneable,
     CreatorTokenBase,
-    AutomaticValidatorTransferApproval,
-    Initializable
+    AutomaticValidatorTransferApproval
 {
     /// @notice Initializes the contract with the given name and symbol.
     function __ERC721ACQueryableInitializable_init(string memory name_, string memory symbol_) public {
-        __ERC721A_init_unchained(name_, symbol_);
-        __ERC721AQueryable_init_unchained();
+        __ERC721ACloneable__init(name_, symbol_);
 
         _emitDefaultTransferValidator();
         _registerTokenType(getTransferValidator());
     }
 
     /// @notice Overrides behavior of supportsInterface such that the contract implements the ICreatorToken interface.
-    function supportsInterface(bytes4 interfaceId)
-        public
-        view
-        virtual
-        override(ERC721AUpgradeable, IERC721AUpgradeable)
-        returns (bool)
-    {
+    function supportsInterface(bytes4 interfaceId) public view virtual override(ERC721ACloneable, IERC721A) returns (bool) {
         return interfaceId == type(ICreatorToken).interfaceId || interfaceId == type(ICreatorTokenLegacy).interfaceId
             || super.supportsInterface(interfaceId);
     }
@@ -51,7 +43,7 @@ abstract contract ERC721ACQueryableInitializable is
         public
         view
         virtual
-        override(ERC721AUpgradeable, IERC721AUpgradeable)
+        override
         returns (bool isApproved)
     {
         isApproved = super.isApprovedForAll(owner, operator);

contracts/nft/erc1155m/ERC1155MErrorsAndEvents.sol

@@ -19,5 +19,4 @@ interface ERC1155MErrorsAndEvents is ErrorsAndEvents {
     );
     event SetMaxMintableSupply(uint256 indexed tokenId, uint256 maxMintableSupply);
     event SetGlobalWalletLimit(uint256 indexed tokenId, uint256 globalWalletLimit);
-    event SetTransferable(bool transferable);
 }

contracts/nft/erc1155m/ERC1155MInitializableV1_0_0.sol → contracts/nft/erc1155m/ERC1155MInitializableV1_0_1.sol

@@ -18,10 +18,10 @@ import {ERC1155MStorage} from "./ERC1155MStorage.sol";
 import {Cosignable} from "../../common/Cosignable.sol";
 import {AuthorizedMinterControl} from "../../common/AuthorizedMinterControl.sol";
 
-/// @title ERC1155MInitializableV1_0_0
+/// @title ERC1155MInitializableV1_0_1
 /// @notice An initializable ERC1155 contract with multi-stage minting, royalties, and authorized minters
 /// @dev Implements ERC1155, ERC2981, Ownable, ReentrancyGuard, and custom minting logic
-contract ERC1155MInitializableV1_0_0 is
+contract ERC1155MInitializableV1_0_1 is
     IERC1155M,
     ERC1155SupplyUpgradeable,
     Ownable,
@@ -62,7 +62,7 @@ contract ERC1155MInitializableV1_0_0 is
     /// @notice Returns the contract name and version
     /// @return The contract name and version as strings
     function contractNameAndVersion() public pure returns (string memory, string memory) {
-        return ("ERC1155MInitializable", "1.0.0");
+        return ("ERC1155MInitializable", "1.0.1");
     }
 
     /*==============================================================
@@ -196,6 +196,18 @@ contract ERC1155MInitializableV1_0_0 is
         return totalMinted;
     }
 
+    /// @notice Checks if the contract is setup locked
+    /// @return Whether the contract is setup locked
+    function isSetupLocked() external view returns (bool) {
+        return _setupLocked;
+    }
+
+    /// @notice Checks if the contract is transferable
+    /// @return Whether the contract is transferable
+    function isTransferable() public view returns (bool) {
+        return _transferable;
+    }
+
     /// @notice Checks if the contract supports a given interface
     /// @param interfaceId The interface identifier
     /// @return True if the contract supports the interface, false otherwise
@@ -232,6 +244,10 @@ contract ERC1155MInitializableV1_0_0 is
         address royaltyReceiver,
         uint96 royaltyFeeNumerator
     ) external onlyOwner {
+        if (_setupLocked) {
+            revert ContractAlreadySetup();
+        }
+
         if (maxMintableSupply.length != globalWalletLimit.length) {
             revert InvalidLimitArgsLength();
         }
@@ -242,6 +258,7 @@ contract ERC1155MInitializableV1_0_0 is
             }
         }
 
+        _setupLocked = true;
         _numTokens = globalWalletLimit.length;
         _maxMintableSupply = maxMintableSupply;
         _globalWalletLimit = globalWalletLimit;
@@ -315,6 +332,8 @@ contract ERC1155MInitializableV1_0_0 is
     /// @notice Sets whether tokens are transferable
     /// @param transferable True if tokens should be transferable, false otherwise
     function setTransferable(bool transferable) external onlyOwner {
+        if (_transferable == transferable) revert TransferableAlreadySet();
+
         _transferable = transferable;
         emit SetTransferable(transferable);
     }
@@ -581,14 +600,12 @@ contract ERC1155MInitializableV1_0_0 is
         uint256[] memory amounts,
         bytes memory data
     ) internal virtual override {
-        super._beforeTokenTransfer(operator, from, to, ids, amounts, data);
-
-        bool fromZeroAddress = from == address(0);
-        bool toZeroAddress = to == address(0);
-
-        if (!fromZeroAddress && !toZeroAddress && !_transferable) {
+        // If the transfer is not from a mint or burn, revert if not transferable
+        if (from != address(0) && to != address(0) && !_transferable) {
             revert NotTransferable();
         }
+
+        super._beforeTokenTransfer(operator, from, to, ids, amounts, data);
     }
 
     /// @dev Overriden to prevent double-initialization of the owner.

contracts/nft/erc1155m/ERC1155MStorage.sol

@@ -4,19 +4,42 @@ pragma solidity ^0.8.22;
 import {MintStageInfo1155} from "../../common/Structs.sol";
 
 contract ERC1155MStorage {
-    // Mint stage information. See MintStageInfo for details.
+    // Mint stage information. See MintStageInfo1155 for details.
     MintStageInfo1155[] internal _mintStages;
 
+    // The name of the token
     string public name;
+
+    // The symbol of the token
     string public symbol;
-    bool internal _transferable; // Whether the token can be transferred.
-    uint256[] internal _maxMintableSupply; // The total mintable supply per token.
-    uint256[] internal _globalWalletLimit; // Global wallet limit, across all stages, per token.
+
+    // Whether the token can be transferred.
+    bool internal _transferable;
+
+    // The total mintable supply per token.
+    uint256[] internal _maxMintableSupply;
+
+    // Global wallet limit, across all stages, per token.
+    uint256[] internal _globalWalletLimit;
+
+    // Total mint fee
     uint256 internal _totalMintFee;
-    address internal _mintCurrency; // If 0 address, use native currency.
+
+    // Address of ERC-20 token used to pay for minting. If 0 address, use native currency.
+    address internal _mintCurrency;
+
+    // Number of tokens
     uint256 internal _numTokens;
+
+    // Fund receiver
     address internal _fundReceiver;
 
+    // Whether the contract has been setup.
+    bool internal _setupLocked;
+
+    // Minted count per stage per token per wallet.
     mapping(uint256 => mapping(uint256 => mapping(address => uint32))) internal _stageMintedCountsPerTokenPerWallet;
+
+    // Minted count per stage per token.
     mapping(uint256 => mapping(uint256 => uint256)) internal _stageMintedCountsPerToken;
 }

contracts/nft/erc721m/ERC721CM.sol

@@ -76,7 +76,7 @@ contract ERC721CM is
     /// @notice Returns the contract name and version
     /// @return The contract name and version as strings
     function contractNameAndVersion() public pure returns (string memory, string memory) {
-        return ("ERC721M", "1.0.0");
+        return ("ERC721CM", "1.0.0");
     }
 
     /// @notice Gets the token URI for a specific token ID