v3 (#114)

* Add claim condition support for drop v2

* Update version

* Pass through address to claim instead of destination address

* Update version

* am/custom (#115)

Add

* Update

* Update edition drop

* Update version

Author: adam-maj

Makefile

@@ -26,8 +26,8 @@ abi:
 	abi-gen --language Python -o thirdweb/abi --abis abi/IERC20.json && mv thirdweb/abi/ierc20/__init__.py thirdweb/abi/ierc20.py && rm -rf thirdweb/abi/ierc20
 	abi-gen --language Python -o thirdweb/abi --abis abi/IERC721.json && mv thirdweb/abi/ierc721/__init__.py thirdweb/abi/ierc721.py && rm -rf thirdweb/abi/ierc721
 	abi-gen --language Python -o thirdweb/abi --abis abi/IERC1155.json && mv thirdweb/abi/ierc1155/__init__.py thirdweb/abi/ierc1155.py && rm -rf thirdweb/abi/ierc1155
-	abi-gen --language Python -o thirdweb/abi --abis abi/DropERC721_V3.json && mv thirdweb/abi/droperc721_v3/__init__.py thirdweb/abi/drop_erc721.py && rm -rf thirdweb/abi/droperc721_v3
-	abi-gen --language Python -o thirdweb/abi --abis abi/DropERC1155_V2.json && mv thirdweb/abi/droperc1155_v2/__init__.py thirdweb/abi/drop_erc1155.py && rm -rf thirdweb/abi/droperc1155_v2
+	abi-gen --language Python -o thirdweb/abi --abis abi/DropERC721.json && mv thirdweb/abi/drop_erc721/__init__.py thirdweb/abi/drop_erc721.py && rm -rf thirdweb/abi/drop_erc721
+	abi-gen --language Python -o thirdweb/abi --abis abi/DropERC1155.json && mv thirdweb/abi/drop_erc1155/__init__.py thirdweb/abi/drop_erc1155.py && rm -rf thirdweb/abi/drop_erc1155
 	abi-gen --language Python -o thirdweb/abi --abis abi/Multiwrap.json && mv thirdweb/abi/multiwrap/__init__.py thirdweb/abi/multiwrap.py && rm -rf thirdweb/abi/multiwrap
 
 	abi-gen --language Python -o thirdweb/abi --abis abi/SignatureMintERC20.json && mv thirdweb/abi/signature_mint_erc20/__init__.py thirdweb/abi/signature_mint_erc20.py && rm -rf thirdweb/abi/signature_mint_erc20

pyproject.toml

@@ -6,7 +6,7 @@ packages = [
   {include = "thirdweb"},
 ]
 readme = "README.md"
-version = "2.2.0"
+version = "3.0.0"
 
 [tool.poetry.dependencies]
 python = ">=3.7.1"

tests/test_edition_drop.py tests/skip_edition_drop.pytests/test_edition_drop.py renamed to tests/skip_edition_drop.py

@@ -0,0 +1,47 @@
+import pytest
+from thirdweb.constants.currency import ZERO_ADDRESS
+from thirdweb.constants.role import Role
+from thirdweb.contracts.nft_drop import NFTDrop
+
+from thirdweb.core.sdk import ThirdwebSDK
+from thirdweb.types.nft import NFTMetadataInput
+from thirdweb.types.settings.metadata import NFTDropContractMetadata
+
+
+@pytest.mark.usefixtures("sdk", "primary_account")
+@pytest.fixture(scope="function")
+def nft_drop(sdk: ThirdwebSDK, primary_account) -> NFTDrop:
+    sdk.update_signer(primary_account)
+    nft_drop = sdk.get_nft_drop(
+        sdk.deployer.deploy_nft_drop(
+            NFTDropContractMetadata(
+                name="SDK NFT Drop",
+                primary_sale_recipient=sdk.get_signer().address,  # type: ignore
+                seller_fee_basis_points=500,
+                fee_recipient=ZERO_ADDRESS,
+                platform_fee_basis_points=10,
+                platform_fee_recipient=ZERO_ADDRESS,
+            )
+        )
+    )
+    nft_drop.roles.grant(Role.MINTER, sdk.get_signer().address)  # type: ignore
+    return nft_drop
+
+
+def test_create_batch(nft_drop: NFTDrop):
+    metadatas = []
+    for i in range(10):
+        metadatas.append(NFTMetadataInput(name=f"NFT {i}"))
+
+    nft_drop.create_batch(metadatas)
+    nfts = nft_drop.get_all()
+
+    assert len(nfts) == 10
+
+    for i, nft in enumerate(nfts):
+        assert nft.metadata.name == f"NFT {i}"
+
+    assert nft_drop.get_total_count() == 10
+    assert len(nft_drop.get_all_claimed()) == 0
+    assert len(nft_drop.get_all_unclaimed()) == 10
+

tests/skip_nft_drop.py

@@ -1,22 +1,20 @@
-from .t_w_factory import TWFactory
-from .t_w_registry import TWRegistry
-from .token_erc721 import TokenERC721
-from .token_erc1155 import TokenERC1155
-from .token_erc20 import TokenERC20
-from .marketplace import Marketplace
-from .multiwrap import Multiwrap
-from .ierc20 import IERC20
-from .ierc165 import IERC165
-from .ierc721 import IERC721
-from .ierc1155 import IERC1155
-from .drop_erc721 import DropERC721_V3
-from .drop_erc1155 import DropERC1155_V2
-from .contract_metadata_registry import ContractMetadataRegistry
-from .thirdweb_contract import ThirdwebContract
-from .i_platform_fee import IPlatformFee
-from .i_primary_sale import IPrimarySale
-from .i_permissions_enumerable import IPermissionsEnumerable
-from .i_royalty import IRoyalty
-from .i_token_erc20 import ITokenERC20
-from .i_token_erc721 import ITokenERC721
-from .i_token_erc1155 import ITokenERC1155
+from .t_w_factory import TWFactory # pylint: disable=unused-import
+from .t_w_registry import TWRegistry # pylint: disable=unused-import
+from .token_erc721 import TokenERC721 # pylint: disable=unused-import
+from .token_erc1155 import TokenERC1155 # pylint: disable=unused-import
+from .token_erc20 import TokenERC20 # pylint: disable=unused-import
+from .marketplace import Marketplace # pylint: disable=unused-import
+from .multiwrap import Multiwrap # pylint: disable=unused-import
+from .ierc20 import IERC20 # pylint: disable=unused-import
+from .ierc165 import IERC165 # pylint: disable=unused-import
+from .ierc721 import IERC721 # pylint: disable=unused-import
+from .ierc1155 import IERC1155 # pylint: disable=unused-import
+from .drop_erc721 import DropERC721 # pylint: disable=unused-import
+from .drop_erc1155 import DropERC1155 # pylint: disable=unused-import
+from .i_platform_fee import IPlatformFee # pylint: disable=unused-import
+from .i_primary_sale import IPrimarySale # pylint: disable=unused-import
+from .i_permissions_enumerable import IPermissionsEnumerable # pylint: disable=unused-import
+from .i_royalty import IRoyalty # pylint: disable=unused-import
+from .i_token_erc20 import ITokenERC20 # pylint: disable=unused-import
+from .i_token_erc721 import ITokenERC721 # pylint: disable=unused-import
+from .i_token_erc1155 import ITokenERC1155 # pylint: disable=unused-import