Signature based minting works :D switch dependency eth-account to forked version

atbe · atbe · commit de36361cbd91 · 2022-02-18T11:35:07.000-08:00
diff --git a/requirements.txt b/requirements.txt
@@ -21,14 +21,14 @@ dataclasses-json==0.5.6
 Deprecated==1.2.13
 deprecation==2.1.0
 docutils==0.17.1
-eth-abi==2.1.1
+eth-abi==3.0.0
 eth-account==0.5.7
 eth-hash==0.3.2
-eth-keyfile==0.5.1
-eth-keys==0.3.4
-eth-rlp==0.2.1
-eth-typing==2.2.2
-eth-utils==1.10.0
+eth-keyfile==0.6.0
+eth-keys==0.4.0
+eth-rlp==0.3.0
+eth-typing==3.0.0
+eth-utils==2.0.0
 ghp-import==2.0.2
 hexbytes==0.2.2
 idna==3.2
@@ -70,11 +70,12 @@ pytz==2021.3
 PyYAML==6.0
 pyyaml_env_tag==0.1
 requests==2.26.0
-rlp==2.0.1
+rlp==3.0.0
 six==1.16.0
 snowballstemmer==2.2.0
 stringcase==1.2.0
 thirdweb-contract-wrappers==2.0.3
+thirdweb-eth-account==0.6.4
 thirdweb-web3==5.24.8
 toml==0.10.2
 tomli==1.2.3
@@ -86,7 +87,7 @@ urllib3==1.26.7
 uuid==1.30
 varint==1.0.2
 watchdog==2.1.6
-web3==5.24.0
+web3==5.27.0
 websockets==9.1
 wrapt==1.13.1
 yarl==1.7.0
diff --git a/thirdweb/modules/nft.py b/thirdweb/modules/nft.py
@@ -3,7 +3,8 @@
 from typing import Dict, List, Union
 import json
 from uuid import uuid4
-from eth_account.messages import encode_structured_data
+
+from thirdweb_eth_account.messages import encode_structured_data
 
 import web3
 from thirdweb.abi.erc20 import ERC20
@@ -364,9 +365,9 @@ def resolve_id(mint_request: NewSignaturePayload):
             if mint_request.id is None:
                 print("mint_request.id is empty, generating uuid-v4")
                 generated_id = uuid4().hex
-                return "0x" + binascii.hexlify(str.encode(generated_id)).decode()
+                return str.encode(generated_id)
             else:
-                return "0x" + binascii.hexlify(str.encode(mint_request.id)).decode()
+                return str.encode(mint_request.id)
 
         if not self.get_signer_address() in self.get_role_members(Role.minter):
             raise Exception("You are not a minter")
@@ -383,11 +384,7 @@ def generate_signature(payload: NewSignaturePayload) -> BatchGeneratedSignature:
             message["uid"] = resolved_id
 
             print("message", message)
-            encode_message = {
-                **message,
-                "uid": str(message['uid'].encode('utf-8'))
-            }
-            encoded_message = encode_structured_data(text=json.dumps({
+            encoded_message = encode_structured_data({
                 "types": {
                     "MintRequest": [
                         {"name": "to", "type": "address"},
@@ -413,7 +410,7 @@ def generate_signature(payload: NewSignaturePayload) -> BatchGeneratedSignature:
                     "verifyingContract": self.address
                 },
                 "message": message
-            }))
+            })
             print("encoded_message =", encoded_message)
             return BatchGeneratedSignature(
                 payload=payload,
