Completed pack.create function

atbe · atbe · commit e3fb3ea61327 · 2021-11-08T16:55:28.000-08:00
diff --git a/nftlabs/modules/pack.py b/nftlabs/modules/pack.py
@@ -2,7 +2,7 @@
 from typing import Dict, List
 from json import dumps
 
-from web3 import Web3
+from thirdweb_web3 import Web3
 from eth_abi import encode_abi
 
 
@@ -26,19 +26,19 @@ def __init__(self, address: str, client: Web3):
         self.__abi_module = Pack(client, address)
 
     def get(self, pack_id: int) -> PackMetadata:
-        uri = self._BaseModule__get_token_uri(pack_id)
+        uri = self.__abi_module.uri.call(pack_id)
         if uri == "":
             raise AssetNotFoundException(pack_id)
         metadata = self.get_storage().get(uri)
         state = self.__abi_module.get_pack.call(pack_id)
         total_supply = self.__abi_module.total_supply.call(pack_id)
         return PackMetadata(
             id=pack_id,
-            creator_address=state.creator,
+            creator_address=state['creator'],
             current_supply=total_supply,
             metadata=metadata,
-            open_start=None if state.openStart <= 0 else datetime.fromtimestamp(
-                state.openStart),
+            open_start=None if state['openStart'] <= 0 else datetime.fromtimestamp(
+                state['openStart']),
         )
 
     def open(self, pack_id: int) -> List[NftMetadata]:
@@ -98,6 +98,8 @@ def create(self, arg: CreatePackArg) -> PackMetadata:
         ))
         result = self.__abi_module.get_pack_created_event(
             receipt.transactionHash)
+        new_pack_id = result[0]['args']['packId']
+        return self.get(new_pack_id)
 
     def transfer_from(self, from_address: str, to_address: str, args: AssetAmountPair):
         return self.execute_tx(self.__abi_module.safe_transfer_from.build_transaction(
