djwebdapp 0.6.0__tar.gz → 0.6.5__tar.gz

{djwebdapp-0.6.0/src/djwebdapp.egg-info → djwebdapp-0.6.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: djwebdapp
-Version: 0.6.0
+Version: 0.6.5
 Home-page: https://yourlabs.io/oss/djwebdapp
 Author: James Pic
 Author-email: jamespic@gmail.com
@@ -8,12 +8,53 @@ License: MIT
 Keywords: cli
 Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
+License-File: LICENSE
+Requires-Dist: django-model-utils
+Requires-Dist: djfernet>=0.8.1
+Requires-Dist: django-picklefield>=3.0.1
+Requires-Dist: networkx==2.8.8
+Requires-Dist: mnemonic
 Provides-Extra: test
+Requires-Dist: django; extra == "test"
+Requires-Dist: djangorestframework; extra == "test"
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: pytest-django; extra == "test"
+Requires-Dist: web3<=6.20,>=6.7.0; extra == "test"
+Requires-Dist: eth-typing<5; extra == "test"
 Provides-Extra: ethereum
+Requires-Dist: web3<=6.20,>=6.7.0; extra == "ethereum"
+Requires-Dist: eth-typing<5; extra == "ethereum"
 Provides-Extra: tezos
+Requires-Dist: pytezos>3.4; extra == "tezos"
+Requires-Dist: pymich>=0.9.8; extra == "tezos"
 Provides-Extra: binary
+Requires-Dist: pysodium; extra == "binary"
+Requires-Dist: secp256k1; extra == "binary"
+Requires-Dist: fastecdsa; extra == "binary"
 Provides-Extra: all
-License-File: LICENSE
+Requires-Dist: django; extra == "all"
+Requires-Dist: djangorestframework; extra == "all"
+Requires-Dist: pytest; extra == "all"
+Requires-Dist: pytest-cov; extra == "all"
+Requires-Dist: pytest-django; extra == "all"
+Requires-Dist: web3<=6.20,>=6.7.0; extra == "all"
+Requires-Dist: eth-typing<5; extra == "all"
+Requires-Dist: web3<=6.20,>=6.7.0; extra == "all"
+Requires-Dist: eth-typing<5; extra == "all"
+Requires-Dist: pytezos>3.4; extra == "all"
+Requires-Dist: pymich>=0.9.8; extra == "all"
+Requires-Dist: django; extra == "all"
+Requires-Dist: djangorestframework; extra == "all"
+Requires-Dist: pytest; extra == "all"
+Requires-Dist: pytest-cov; extra == "all"
+Requires-Dist: pytest-django; extra == "all"
+Requires-Dist: web3<=6.20,>=6.7.0; extra == "all"
+Requires-Dist: eth-typing<5; extra == "all"
+Requires-Dist: web3<=6.20,>=6.7.0; extra == "all"
+Requires-Dist: eth-typing<5; extra == "all"
+Requires-Dist: pytezos>3.4; extra == "all"
+Requires-Dist: pymich>=0.9.8; extra == "all"
 
 djWebdApp
 ~~~~~~~~~

{djwebdapp-0.6.0 → djwebdapp-0.6.5}/setup.py

@@ -8,10 +8,13 @@ extras_require = dict(
         'pytest',
         'pytest-cov',
         'pytest-django',
-        'web3[dev]>=6.7.0',
+        'web3>=6.7.0,<=6.20',
+        'eth-typing<5',
     ],
     ethereum=[
-        'web3>=6.7.0',  # no [dev] for persistent deployments
+        #'web3>=6.7.0',  # no [dev] for persistent deployments
+        'web3>=6.7.0,<=6.20',
+        'eth-typing<5',
     ],
     tezos=[
         'pytezos>3.4',
@@ -33,7 +36,7 @@ for name, deps in extras_require.items():
 
 setup(
     name='djwebdapp',
-    version='0.6.0',
+    version='0.6.5',
     setup_requires='setupmeta',
     packages=find_packages('src'),
     package_dir={'': 'src'},

{djwebdapp-0.6.0 → djwebdapp-0.6.5/src/djwebdapp.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: djwebdapp
-Version: 0.6.0
+Version: 0.6.5
 Home-page: https://yourlabs.io/oss/djwebdapp
 Author: James Pic
 Author-email: jamespic@gmail.com
@@ -8,12 +8,53 @@ License: MIT
 Keywords: cli
 Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
+License-File: LICENSE
+Requires-Dist: django-model-utils
+Requires-Dist: djfernet>=0.8.1
+Requires-Dist: django-picklefield>=3.0.1
+Requires-Dist: networkx==2.8.8
+Requires-Dist: mnemonic
 Provides-Extra: test
+Requires-Dist: django; extra == "test"
+Requires-Dist: djangorestframework; extra == "test"
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: pytest-django; extra == "test"
+Requires-Dist: web3<=6.20,>=6.7.0; extra == "test"
+Requires-Dist: eth-typing<5; extra == "test"
 Provides-Extra: ethereum
+Requires-Dist: web3<=6.20,>=6.7.0; extra == "ethereum"
+Requires-Dist: eth-typing<5; extra == "ethereum"
 Provides-Extra: tezos
+Requires-Dist: pytezos>3.4; extra == "tezos"
+Requires-Dist: pymich>=0.9.8; extra == "tezos"
 Provides-Extra: binary
+Requires-Dist: pysodium; extra == "binary"
+Requires-Dist: secp256k1; extra == "binary"
+Requires-Dist: fastecdsa; extra == "binary"
 Provides-Extra: all
-License-File: LICENSE
+Requires-Dist: django; extra == "all"
+Requires-Dist: djangorestframework; extra == "all"
+Requires-Dist: pytest; extra == "all"
+Requires-Dist: pytest-cov; extra == "all"
+Requires-Dist: pytest-django; extra == "all"
+Requires-Dist: web3<=6.20,>=6.7.0; extra == "all"
+Requires-Dist: eth-typing<5; extra == "all"
+Requires-Dist: web3<=6.20,>=6.7.0; extra == "all"
+Requires-Dist: eth-typing<5; extra == "all"
+Requires-Dist: pytezos>3.4; extra == "all"
+Requires-Dist: pymich>=0.9.8; extra == "all"
+Requires-Dist: django; extra == "all"
+Requires-Dist: djangorestframework; extra == "all"
+Requires-Dist: pytest; extra == "all"
+Requires-Dist: pytest-cov; extra == "all"
+Requires-Dist: pytest-django; extra == "all"
+Requires-Dist: web3<=6.20,>=6.7.0; extra == "all"
+Requires-Dist: eth-typing<5; extra == "all"
+Requires-Dist: web3<=6.20,>=6.7.0; extra == "all"
+Requires-Dist: eth-typing<5; extra == "all"
+Requires-Dist: pytezos>3.4; extra == "all"
+Requires-Dist: pymich>=0.9.8; extra == "all"
 
 djWebdApp
 ~~~~~~~~~

{djwebdapp-0.6.0 → djwebdapp-0.6.5}/src/djwebdapp.egg-info/requires.txt

@@ -10,8 +10,8 @@ djangorestframework
 pytest
 pytest-cov
 pytest-django
-web3[dev]>=6.7.0
-web3>=6.7.0
+web3<=6.20,>=6.7.0
+eth-typing<5
 pytezos>3.4
 pymich>=0.9.8
 
@@ -21,7 +21,8 @@ secp256k1
 fastecdsa
 
 [ethereum]
-web3>=6.7.0
+web3<=6.20,>=6.7.0
+eth-typing<5
 
 [test]
 django
@@ -29,7 +30,8 @@ djangorestframework
 pytest
 pytest-cov
 pytest-django
-web3[dev]>=6.7.0
+web3<=6.20,>=6.7.0
+eth-typing<5
 
 [tezos]
 pytezos>3.4

{djwebdapp-0.6.0 → djwebdapp-0.6.5}/src/djwebdapp_ethereum/provider.py

@@ -1,10 +1,13 @@
 import logging
 
+from eth_utils.abi import event_abi_to_log_topic
 from hexbytes import HexBytes
 from web3 import Web3
+from web3.exceptions import ContractLogicError
 
 from django.conf import settings
 
+from django.db import transaction as db_transaction
 from djwebdapp.models import Account
 from djwebdapp_ethereum.models import EthereumEvent, EthereumTransaction
 from djwebdapp.provider import Provider
@@ -96,7 +99,7 @@ class EthereumProvider(Provider):
                 index=False,
             )
 
-        call = contract.call_set.select_subclasses().filter(
+        call = self.transaction_class.objects.select_subclasses().filter(
             hash=transaction['hash'].hex(),
         ).first()
 
@@ -186,7 +189,7 @@ class EthereumProvider(Provider):
                 args[i] = self.client.to_bytes(hexstr=args[i])
 
         tx = func(*args)
-        transaction.hash = self.write_transaction(transaction.sender, tx)
+        transaction.hash = self.write_transaction(transaction, tx)
 
     def deploy(self, transaction):
         self.logger.debug(f'{transaction}.deploy(): start')
@@ -237,21 +240,24 @@ class EthereumProvider(Provider):
         )
 
         tx = Contract.constructor(*transaction.get_args())
-        transaction.hash = self.write_transaction(transaction.sender, tx)
+        transaction.hash = self.write_transaction(transaction, tx)
         receipt = self.client.eth.wait_for_transaction_receipt(
             transaction.hash)
         transaction.address = receipt.contractAddress
 
-    def write_transaction(self, sender, tx):
+    def write_transaction(self, djwebdapp_transaction, tx):
+        sender = djwebdapp_transaction.sender
         nonce = self.client.eth.get_transaction_count(sender.address)
         options = {
             'from': sender.address,
             'nonce': nonce,
         }
-        options['gas'] = self.client.eth.estimate_gas(
-            tx.build_transaction(options)
-        )
-        built = tx.build_transaction(options)
+        try:
+            built = tx.build_transaction(options)
+        except ContractLogicError as e:
+            djwebdapp_transaction.error = e.message
+            raise e
+        options['gas'] = self.client.eth.estimate_gas(built)
         signed_txn = self.client.eth.account.sign_transaction(
             built,
             private_key=sender.get_secret_key(),
@@ -399,7 +405,7 @@ class EthereumEventProvider(EthereumProvider):
             self.logs
         ))
 
-    def get_contract_event_names(self, contract_abi):
+    def get_contract_event_names(self, contract_abi, encoded_event_name):
         events = []
         for entry in contract_abi:
             if (
@@ -407,7 +413,12 @@ class EthereumEventProvider(EthereumProvider):
                 and entry["type"] == "event"
                 and "name" in entry
             ):
-                events.append(entry["name"])
+                candidate_encoded_event_name = "0x" + event_abi_to_log_topic(
+                    entry,
+                ).hex()
+                if candidate_encoded_event_name == encoded_event_name:
+                    events.append(entry["name"])
+
         return events
 
     def index_log(self, log):
@@ -416,30 +427,45 @@ class EthereumEventProvider(EthereumProvider):
         # so the transaction is not created
         # So right now I return if the tx not exists
 
-        transaction, created = self.transaction_class.objects.get_or_create(
-            blockchain=self.blockchain,
-            hash=log["transactionHash"].hex(),
-        )
+        with db_transaction.atomic():
+            transaction, created = self.transaction_class.objects.update_or_create(  # noqa: E501
+                blockchain=self.blockchain,
+                hash=log["transactionHash"].hex(),
+                defaults=dict(
+                    level=log["blockNumber"],
+                )
+            )
+            transaction.state_set("done")
 
-        is_contract_deployment_tx = 'to' not in log
+            if created:
+                """
+                If the transaction was created, then it's from the log of an
+                indexed contract, we consider the original transaction to be
+                a `function` kind which we don't index.
 
-        if created:
-            transaction.level = log["blockNumber"]
+                This is crucial as it will otherwise by default be saved as
+                an indexed contract. If so, then the indexer will try to
+                index a contract with no address and raise!!
 
-            if is_contract_deployment_tx:
-                transaction.state = 'done'
+                Hence this must also be in the atomic block.
+                """
+                transaction.kind = "function"
                 transaction.index = False
-
-            transaction.save()
+                transaction.save()
 
         contract = self.transaction_class.objects.filter(
             address=log["address"]
-        ).first().contract_subclass()
+        ).first()
         contract_ci = self.client.eth.contract(
             address=contract.address,
             abi=contract.abi,
         )
-        event_names = self.get_contract_event_names(contract_ci.abi)
+        # first topic encodes event name
+        encoded_log_name = log["topics"][0].hex()
+        event_names = self.get_contract_event_names(
+            contract_ci.abi,
+            encoded_log_name,
+        )
         for event_name in event_names:
             event = getattr(contract_ci.events, event_name)
             event_data = event().process_receipt({"logs": [log]})