feat: Add node_id execution_id and price in the historical credit exp… (#867)

* feat: Add node_id execution_id and price in the historical credit expense entries

* fix: swap expense node_id and execution_id order and lint fixes

Author: amalcaraz

pyproject.toml

@@ -17,6 +17,7 @@ classifiers = [
   "Programming Language :: Python",
   "Programming Language :: Python :: 3 :: Only",
   "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
 ]
 dynamic = [ "version" ]
 dependencies = [

src/aleph/db/accessors/balances.py

@@ -497,9 +497,12 @@ def update_credit_balances_expense(
     """
     Updates credit balances for expense messages (aleph_credit_expense).
 
-    Expense messages have negative amounts and only include origin_ref field.
-    Other fields like ratio, tx_hash, provider, payment_method, token, chain,
-    origin, and expiration_date are not present.
+    Expense messages have negative amounts and can include:
+    - execution_id (mapped to origin)
+    - node_id (mapped to tx_hash)
+    - price (mapped to ratio)
+    - time (skipped for now)
+    - ref (mapped to origin_ref)
     """
 
     last_update = utc_now()
@@ -510,8 +513,14 @@ def update_credit_balances_expense(
         amount = -abs(int(credit_entry["amount"]))
         origin_ref = credit_entry.get("ref", "")
 
+        # Map new fields
+        origin = credit_entry.get("execution_id", "")
+        tx_hash = credit_entry.get("node_id", "")
+        ratio = credit_entry.get("price", "")
+        # Skip time field for now
+
         csv_rows.append(
-            f"{address};{amount};{message_hash};{index};{message_timestamp};{last_update};;;;;;;ALEPH;{origin_ref};credit_expense"
+            f"{address};{amount};{message_hash};{index};{message_timestamp};{last_update};{ratio};{tx_hash};;;;{origin};ALEPH;{origin_ref};credit_expense"
         )
 
     _bulk_insert_credit_history(session, csv_rows)

tests/db/test_credit_balances.py

@@ -103,6 +103,7 @@ def test_update_credit_balances_expense(session_factory: DbSessionFactory):
         assert expense_record.token is None
         assert expense_record.chain is None
         assert expense_record.provider == "ALEPH"
+        assert expense_record.origin is None
         assert expense_record.origin_ref == "expense_ref"
         assert expense_record.payment_method == "credit_expense"
         assert expense_record.credit_ref == "expense_msg_789"
@@ -111,6 +112,57 @@ def test_update_credit_balances_expense(session_factory: DbSessionFactory):
         assert expense_record.message_timestamp == message_timestamp
 
 
+def test_update_credit_balances_expense_with_new_fields(
+    session_factory: DbSessionFactory,
+):
+    """Test direct database insertion for credit expense messages with new fields."""
+    credits_list = [
+        {
+            "address": "0x456",
+            "amount": 500,
+            "ref": "expense_ref",
+            "execution_id": "exec_12345",
+            "node_id": "node_67890",
+            "price": "0.001",
+            "time": 1640995200000,  # This will be skipped for now
+        }
+    ]
+
+    message_timestamp = dt.datetime(2023, 1, 2, 12, 0, 0, tzinfo=dt.timezone.utc)
+
+    with session_factory() as session:
+        update_credit_balances_expense(
+            session=session,
+            credits_list=credits_list,
+            message_hash="expense_msg_with_fields_789",
+            message_timestamp=message_timestamp,
+        )
+        session.commit()
+
+        # Verify expense record was inserted with new field mappings
+        expense_record = (
+            session.query(AlephCreditHistoryDb)
+            .filter_by(address="0x456", credit_ref="expense_msg_with_fields_789")
+            .first()
+        )
+
+        assert expense_record is not None
+        assert expense_record.address == "0x456"
+        assert expense_record.amount == -500
+        assert expense_record.ratio == Decimal("0.001")  # price mapped to ratio
+        assert expense_record.tx_hash == "node_67890"  # node_id mapped to tx_hash
+        assert expense_record.token is None
+        assert expense_record.chain is None
+        assert expense_record.provider == "ALEPH"
+        assert expense_record.origin == "exec_12345"  # execution_id mapped to origin
+        assert expense_record.origin_ref == "expense_ref"
+        assert expense_record.payment_method == "credit_expense"
+        assert expense_record.credit_ref == "expense_msg_with_fields_789"
+        assert expense_record.credit_index == 0
+        assert expense_record.expiration_date is None
+        assert expense_record.message_timestamp == message_timestamp
+
+
 def test_update_credit_balances_transfer(session_factory: DbSessionFactory):
     """Test direct database insertion for credit transfer messages."""
     credits_list = [