Implemented nft.getall

atbe · atbe · commit 0162aa7922dd · 2021-10-14T16:50:24.000-07:00
diff --git a/main.py b/main.py
@@ -18,7 +18,8 @@
 nft_module = sdk.get_nft_module("0xbDfF8fb43688fB4D2184DF8029A7238ac1413A24")
 print(nft_module.total_supply())
 
-minted_nft = nft_module.mint(arg=MintArg(name="Test 123", description="Some description"))
-print(minted_nft)
-# print(nft_module.get(27))
-#
+# minted_nft = nft_module.mint(arg=MintArg(name="Test 123", description="Some description"))
+# print(minted_nft)
+
+for nft in nft_module.get_all():
+    print(nft)
diff --git a/nftlabs/modules/nft.py b/nftlabs/modules/nft.py
@@ -7,7 +7,7 @@
 from web3.types import TxReceipt
 
 from . import BaseModule
-from typing import Callable, Dict, NamedTuple
+from typing import Callable, Dict, NamedTuple, List
 from ..abi.nft import NFT
 from ..storage.ipfs_storage import IpfsStorage
 
@@ -100,3 +100,6 @@ def set_royalty_bps(self, amount: int):
         tx = self.__abi_module.set_royalty_bps.build_transaction(amount, self.get_transact_opts())
         self.execute_tx(tx)
 
+    def get_all(self) -> List[NftType]:
+        max_id = self.__abi_module.next_token_id.call()
+        return [self.get(i) for i in range(max_id)]
diff --git a/nftlabs/types/nft.py b/nftlabs/types/nft.py
@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from typing import Optional
+from typing import Optional, Union
 
 from dataclasses_json import dataclass_json
 
@@ -10,6 +10,6 @@ class NFT:
     name: str
     description: str
     image: str
-    properties: Optional[dict] = None
+    properties: Optional[Union[str, dict]] = None
     id: Optional[int] = None
     uri: Optional[str] = None
