djwebdapp 0.6.2.dev2__tar.gz → 0.6.6__tar.gz

{djwebdapp-0.6.2.dev2/src/djwebdapp.egg-info → djwebdapp-0.6.6}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: djwebdapp
-Version: 0.6.2.dev2
+Version: 0.6.6
 Home-page: https://yourlabs.io/oss/djwebdapp
 Author: James Pic
 Author-email: jamespic@gmail.com
@@ -20,9 +20,11 @@ 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.15.1,>=6.7.0; 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.15.1,>=6.7.0; 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"
@@ -36,8 +38,10 @@ 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.15.1,>=6.7.0; extra == "all"
-Requires-Dist: web3<=6.15.1,>=6.7.0; 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"
@@ -45,10 +49,22 @@ 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.15.1,>=6.7.0; extra == "all"
-Requires-Dist: web3<=6.15.1,>=6.7.0; 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"
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
 
 djWebdApp
 ~~~~~~~~~

{djwebdapp-0.6.2.dev2 → djwebdapp-0.6.6}/setup.py

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

djwebdapp-0.6.6/src/djwebdapp/migrations/0018_blockchain_chain_id.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2 on 2025-04-15 17:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('djwebdapp', '0017_event'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='blockchain',
+            name='chain_id',
+            field=models.IntegerField(blank=True, null=True),
+        ),
+    ]

{djwebdapp-0.6.2.dev2 → djwebdapp-0.6.6}/src/djwebdapp/models.py

@@ -253,6 +253,10 @@ class Blockchain(models.Model):
 
         Optionnal description for this blockchain.
 
+    .. py:attribute:: chain_id
+
+        Chain ID used to distinguish different EVM blockchains.
+
     .. py:attribute:: unit
 
         Unit name of the blockchain, ie. eth, xtz...
@@ -293,6 +297,10 @@ class Blockchain(models.Model):
         blank=True,
         help_text='Free text to describe the blockchain to users',
     )
+    chain_id = models.IntegerField(
+        blank=True,
+        null=True,
+    )
     unit = models.CharField(
         max_length=15,
         help_text='Unit name, ie. btc, xtz...',

{djwebdapp-0.6.2.dev2 → djwebdapp-0.6.6/src/djwebdapp.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: djwebdapp
-Version: 0.6.2.dev2
+Version: 0.6.6
 Home-page: https://yourlabs.io/oss/djwebdapp
 Author: James Pic
 Author-email: jamespic@gmail.com
@@ -20,9 +20,11 @@ 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.15.1,>=6.7.0; 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.15.1,>=6.7.0; 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"
@@ -36,8 +38,10 @@ 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.15.1,>=6.7.0; extra == "all"
-Requires-Dist: web3<=6.15.1,>=6.7.0; 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"
@@ -45,10 +49,22 @@ 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.15.1,>=6.7.0; extra == "all"
-Requires-Dist: web3<=6.15.1,>=6.7.0; 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"
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
 
 djWebdApp
 ~~~~~~~~~

{djwebdapp-0.6.2.dev2 → djwebdapp-0.6.6}/src/djwebdapp.egg-info/SOURCES.txt

@@ -39,6 +39,7 @@ src/djwebdapp/migrations/0014_alter_account_unique_together.py
 src/djwebdapp/migrations/0015_alter_transaction_state.py
 src/djwebdapp/migrations/0016_alter_transaction_has_code.py
 src/djwebdapp/migrations/0017_event.py
+src/djwebdapp/migrations/0018_blockchain_chain_id.py
 src/djwebdapp/migrations/__init__.py
 src/djwebdapp_ethereum/__init__.py
 src/djwebdapp_ethereum/admin.py

{djwebdapp-0.6.2.dev2 → djwebdapp-0.6.6}/src/djwebdapp.egg-info/requires.txt

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

{djwebdapp-0.6.2.dev2 → djwebdapp-0.6.6}/src/djwebdapp_ethereum/provider.py

@@ -1,11 +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
@@ -97,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()
 
@@ -403,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 (
@@ -411,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):
@@ -420,24 +427,31 @@ 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.update_or_create(
-            blockchain=self.blockchain,
-            hash=log["transactionHash"].hex(),
-            defaults=dict(
-                level=log["blockNumber"],
+        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"]
@@ -446,7 +460,12 @@ class EthereumEventProvider(EthereumProvider):
             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]})