Use null for empty data instead of b''

- Add a migration to modify current existing data

Author: Uxio0

safe_transaction_service/history/indexers/tx_processor.py

@@ -168,6 +168,7 @@ def __process_decoded_transaction(self, internal_tx_decoded: InternalTxDecoded)
             logger.debug('Executing Tx from Module')
             module_internal_tx = internal_tx.get_previous_module_trace()
             module_address = module_internal_tx.to if module_internal_tx else NULL_ADDRESS
+            module_data = HexBytes(arguments['data'])
             ModuleTransaction.objects.get_or_create(
                 internal_tx=internal_tx,
                 defaults={
@@ -176,7 +177,7 @@ def __process_decoded_transaction(self, internal_tx_decoded: InternalTxDecoded)
                     'module': module_address,
                     'to': arguments['to'],
                     'value': arguments['value'],
-                    'data': HexBytes(arguments['data']),
+                    'data': module_data if module_data else None,
                     'operation': arguments['operation']
                 }
             )

safe_transaction_service/history/migrations/0019_transactions_data_none.py

@@ -0,0 +1,20 @@
+from django.db import migrations
+
+
+def set_data_none(apps, schema_editor):
+    MultisigTransaction = apps.get_model('history', 'MultisigTransaction')
+    ModuleTransaction = apps.get_model('history', 'ModuleTransaction')
+    EthereumTx = apps.get_model('history', 'EthereumTx')
+    for Model in (MultisigTransaction, ModuleTransaction, EthereumTx):
+        Model.objects.filter(data=b'').update(data=None)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('history', '0018_multisigtransaction_trusted'),
+    ]
+
+    operations = [
+        migrations.RunPython(set_data_none),
+    ]

safe_transaction_service/history/models.py

@@ -138,6 +138,7 @@ def set_confirmed(self):
 class EthereumTxManager(models.Manager):
     def create_from_tx_dict(self, tx: Dict[str, Any], tx_receipt: Optional[Dict[str, Any]] = None,
                             ethereum_block: Optional[EthereumBlock] = None) -> 'EthereumTx':
+        data = HexBytes(tx.get('data') or tx.get('input'))
         return super().create(
             block=ethereum_block,
             tx_hash=HexBytes(tx['hash']).hex(),
@@ -148,7 +149,7 @@ def create_from_tx_dict(self, tx: Dict[str, Any], tx_receipt: Optional[Dict[str,
             logs=tx_receipt and [clean_receipt_log(log) for log in tx_receipt.get('logs', list())],
             status=tx_receipt and tx_receipt.get('status'),
             transaction_index=tx_receipt and tx_receipt['transactionIndex'],
-            data=HexBytes(tx.get('data') or tx.get('input')),
+            data=data if data else None,
             nonce=tx['nonce'],
             to=tx.get('to'),
             value=tx['value'],
@@ -328,6 +329,13 @@ def _trace_address_to_str(self, trace_address) -> str:
         return ','.join([str(address) for address in trace_address])
 
     def build_from_trace(self, trace: Dict[str, Any], ethereum_tx: EthereumTx) -> 'InternalTx':
+        """
+        Build a InternalTx object from trace, but it doesn't insert it on database
+        :param trace:
+        :param ethereum_tx:
+        :return: InternalTx not inserted
+        """
+        data = trace['action'].get('input') or trace['action'].get('init')
         tx_type = EthereumTxType.parse(trace['type'])
         call_type = EthereumTxCallType.parse_call_type(trace['action'].get('callType'))
         trace_address_str = self._trace_address_to_str(trace['traceAddress'])
@@ -336,7 +344,7 @@ def build_from_trace(self, trace: Dict[str, Any], ethereum_tx: EthereumTx) -> 'I
             trace_address=trace_address_str,
             _from=trace['action'].get('from'),
             gas=trace['action'].get('gas', 0),
-            data=trace['action'].get('input') or trace['action'].get('init'),
+            data=data if data else None,
             to=trace['action'].get('to') or trace['action'].get('address'),
             value=trace['action'].get('value') or trace['action'].get('balance', 0),
             gas_used=(trace.get('result') or {}).get('gasUsed', 0),