[RELEASE] 0.13.0

backend/app/constants.py

@@ -1000,7 +1000,5 @@
     "TrustedCitizen": 4.0,
 }
 
-SABLIER_SENDER_ADDRESS_SEPOLIA = "0x2417201ca5A11989bF3D0C116888ba866dab1090"
-SABLIER_TOKEN_ADDRESS_SEPOLIA = (
-    "0x2e5221B0f855Be4ea5Cefffb8311EED0563B6e87"  # native sETH
-)
+SABLIER_SENDER_ADDRESS_SEPOLIA = "0xf86fD85672683c220709B9ED80bAD7a51800206a"
+SABLIER_TOKEN_ADDRESS_SEPOLIA = "0x71432dd1ae7db41706ee6a22148446087bdd0906"

backend/app/modules/user/events_generator/core.py

@@ -7,7 +7,7 @@
 def unify_deposit_balances(events: List[DepositEvent]) -> List[DepositEvent]:
     """
     Unify deposit balance for each event in the list of events. Events are expected to be sorted by timestamp.
-    The first event is always from Octant, but the first Sablier event may have a non-zero `deposit_before`, indicating a balance from the past.
+    The first event is taken from deposits, but it already includes deposit from Sablier from the past.
 
     Returns:
         List[DepositEvent]: A list of events with adjusted `deposit_before` and `deposit_after`.
@@ -17,12 +17,7 @@ def unify_deposit_balances(events: List[DepositEvent]) -> List[DepositEvent]:
     acc_balance_sablier = 0
     acc_balance_octant = events[0].deposit_before  # balance from previous epoch
 
-    first_sablier_processed = False
     for event in modified_events[1:]:
-        if event.source == DepositSource.SABLIER and not first_sablier_processed:
-            acc_balance_sablier = event.deposit_before
-            first_sablier_processed = True
-
         combined_balance = acc_balance_sablier + acc_balance_octant
         event.deposit_before = combined_balance
 

backend/app/settings.py

@@ -91,7 +91,7 @@ class ProdConfig(Config):
         os.getenv("SQLALCHEMY_CONNECTION_POOL_SIZE", 10)
     )
     SQLALCHEMY_CONNECTION_POOL_MAX_OVERFLOW = int(
-        os.getenv("SQLALCHEMY_CONNECTION_POOL_MAX_OVERFLOW", 100)
+        os.getenv("SQLALCHEMY_CONNECTION_POOL_MAX_OVERFLOW", 0)
     )
     SQLALCHEMY_DATABASE_URI = os.getenv("DB_URI")
     SQLALCHEMY_ENGINE_OPTIONS = {

backend/pyproject.toml

@@ -37,6 +37,8 @@ uvicorn = {extras = ["standard"], version = "^0.31.0"}
 asyncpg = "^0.29.0"
 uvloop = "^0.20.0"
 python-socketio = "^5.11.4"
+async-factory-boy = "^1.0.1"
+dataclasses-json = "^0.6.7"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^8.3.3"

backend/tests/modules/user/events_generator/test_unify_deposit_balances.py

@@ -54,7 +54,7 @@
                     type=EventType.LOCK,
                     timestamp=2,
                     amount=1000,
-                    deposit_before=1500,
+                    deposit_before=500,  # must be <= than the deposit_before from the first event
                     source=DepositSource.SABLIER,
                 ),
             ],
@@ -79,7 +79,7 @@
                     type=EventType.LOCK,
                     timestamp=2,
                     amount=1000,
-                    deposit_before=3000,
+                    deposit_before=1500,
                     source=DepositSource.SABLIER,
                 ),
             ],
@@ -99,7 +99,7 @@
                     type=EventType.LOCK,
                     timestamp=1,
                     amount=1000,
-                    deposit_before=2000,
+                    deposit_before=1000,
                     source=DepositSource.SABLIER,
                 ),
                 DepositEvent(
@@ -108,7 +108,6 @@
                     timestamp=2,
                     amount=500,
                     deposit_before=1000,
-                    # Takes the balance from the previous event from Octant, not Sablier
                     source=DepositSource.OCTANT,
                 ),
             ],
@@ -125,15 +124,15 @@
                     type=EventType.LOCK,
                     timestamp=1,
                     amount=1000,
-                    deposit_before=3000,
+                    deposit_before=1000,
                     source=DepositSource.SABLIER,
                 ),
                 DepositEvent(
                     user="0x123",
                     type=EventType.LOCK,
                     timestamp=2,
                     amount=500,
-                    deposit_before=4000,
+                    deposit_before=2000,
                     source=DepositSource.OCTANT,
                 ),
             ],
@@ -162,16 +161,15 @@
                     type=EventType.LOCK,
                     timestamp=2,
                     amount=1000,
-                    deposit_before=1000,
+                    deposit_before=500,  # must be <= than the deposit_before from the first event
                     source=DepositSource.SABLIER,
                 ),
                 DepositEvent(
                     user="0x123",
                     type=EventType.UNLOCK,
                     timestamp=3,
                     amount=400,
-                    deposit_before=2000,
-                    # Takes the balance from the previous event from Sablier, not Octant
+                    deposit_before=1500,
                     source=DepositSource.SABLIER,
                 ),
                 DepositEvent(
@@ -180,7 +178,6 @@
                     timestamp=4,
                     amount=200,
                     deposit_before=1500,
-                    # Takes the balance from the previous event from Octant, not Sablier
                     source=DepositSource.OCTANT,
                 ),
             ],
@@ -206,23 +203,23 @@
                     type=EventType.LOCK,
                     timestamp=2,
                     amount=1000,
-                    deposit_before=2000,
+                    deposit_before=1000,
                     source=DepositSource.SABLIER,
                 ),
                 DepositEvent(
                     user="0x123",
                     type=EventType.UNLOCK,
                     timestamp=3,
                     amount=400,
-                    deposit_before=3000,
+                    deposit_before=2000,
                     source=DepositSource.SABLIER,
                 ),
                 DepositEvent(
                     user="0x123",
                     type=EventType.LOCK,
                     timestamp=4,
                     amount=200,
-                    deposit_before=2600,
+                    deposit_before=1600,
                     source=DepositSource.OCTANT,
                 ),
             ],

backend/tests/v2/allocations/test_get_allocations_for_epoch.py

@@ -1,9 +1,9 @@
 import pytest
+from fastapi import status
 from httpx import AsyncClient
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from fastapi import status
-from tests.v2.utils import FakeUser, FakeAllocation
+from tests.v2.factories import FactoriesAggregator
 
 """Test cases for the GET /allocations/epoch/{epoch_number} endpoint"""
 
@@ -22,24 +22,22 @@ async def test_returns_empty_list_when_no_allocations(
 
 @pytest.mark.asyncio
 async def test_returns_allocations_when_they_exist(
-    fast_client: AsyncClient, fast_session: AsyncSession
+    fast_client: AsyncClient, factories: FactoriesAggregator
 ):
     """Should return allocations when they exist"""
 
     # Given: donors with allocations
-    alice = await FakeUser.GetAlice(fast_session)
-    a_alloc1 = await FakeAllocation.of_(fast_session, alice, 1)
-    a_alloc2 = await FakeAllocation.of_(fast_session, alice, 2)
-    a_alloc3 = await FakeAllocation.of_(fast_session, alice, 3)
+    alice = await factories.users.get_or_create_alice()
+    a_alloc1 = await factories.allocations.create(user=alice, epoch=1)
+    a_alloc2 = await factories.allocations.create(user=alice, epoch=2)
+    a_alloc3 = await factories.allocations.create(user=alice, epoch=3)
 
-    bob = await FakeUser.GetBob(fast_session)
-    b_alloc1 = await FakeAllocation.of_(fast_session, bob, 1)
-    b_alloc2 = await FakeAllocation.of_(fast_session, bob, 2)
+    bob = await factories.users.get_or_create_bob()
+    b_alloc1 = await factories.allocations.create(user=bob, epoch=1)
+    b_alloc2 = await factories.allocations.create(user=bob, epoch=2)
 
-    charlie = await FakeUser.GetCharlie(fast_session)
-    c_alloc1 = await FakeAllocation.of_(fast_session, charlie, 1)
-
-    await fast_session.commit()
+    charlie = await factories.users.get_or_create_charlie()
+    c_alloc1 = await factories.allocations.create(user=charlie, epoch=1)
 
     async with fast_client as client:
         # Allocations for epoch 1
@@ -104,20 +102,18 @@ async def test_returns_allocations_when_they_exist(
 
 @pytest.mark.asyncio
 async def test_returns_zero_allocations_when_include_zero_allocations_is_true(
-    fast_client: AsyncClient, fast_session: AsyncSession
+    fast_client: AsyncClient, factories: FactoriesAggregator
 ):
     """Should return zero allocations when include_zero_allocations is true"""
 
     # Given: a donor with allocations
-    alice = await FakeUser.GetAlice(fast_session)
+    alice = await factories.users.get_or_create_alice()
     # For testing purposes, we set the amount to 0 of one of the allocations
-    a_alloc1 = await FakeAllocation.of_(fast_session, alice, 1, amount=0)
-    a_alloc2 = await FakeAllocation.of_(
-        fast_session, alice, 1
+    a_alloc1 = await factories.allocations.create(alice, epoch=1, amount=0)
+    a_alloc2 = await factories.allocations.create(
+        alice, epoch=1
     )  # This will have random amount
 
-    await fast_session.commit()
-
     async with fast_client as client:
         resp = await client.get(
             "allocations/epoch/1", params={"includeZeroAllocations": True}

backend/tests/v2/allocations/test_get_donors_for_epoch.py

@@ -1,17 +1,18 @@
 from datetime import datetime
+
 import pytest
+from fastapi import status
 from httpx import AsyncClient
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from fastapi import status
-from tests.v2.utils import FakeUser, FakeAllocation
+from tests.v2.factories import FactoriesAggregator
 
 """Test cases for the GET /allocations/donors/{epoch_number} (get_donors_for_epoch_v1) endpoint"""
 
 
 @pytest.mark.asyncio
 async def test_returns_empty_list_when_no_donors(
-    fast_client: AsyncClient, fast_session: AsyncSession
+    fast_client: AsyncClient, fast_session: AsyncClient
 ):
     """Should return an empty list when there are no donors for the epoch"""
 
@@ -26,24 +27,22 @@ async def test_returns_empty_list_when_no_donors(
 
 @pytest.mark.asyncio
 async def test_returns_donors_when_they_exist(
-    fast_client: AsyncClient, fast_session: AsyncSession
+    fast_client: AsyncClient, factories: FactoriesAggregator
 ):
     """Should return a list of donors when they exist"""
 
-    # Given: a donor
-    alice = await FakeUser.GetAlice(fast_session)
-    await FakeAllocation.of_(fast_session, alice, 1)
-    await FakeAllocation.of_(fast_session, alice, 2)
-    await FakeAllocation.of_(fast_session, alice, 3)
+    # Given: donors with allocations
+    alice = await factories.users.get_or_create_alice()
+    await factories.allocations.create(user=alice, epoch=1)
+    await factories.allocations.create(user=alice, epoch=2)
+    await factories.allocations.create(user=alice, epoch=3)
 
-    bob = await FakeUser.GetBob(fast_session)
-    await FakeAllocation.of_(fast_session, bob, 1)
-    await FakeAllocation.of_(fast_session, bob, 2)
+    bob = await factories.users.get_or_create_bob()
+    await factories.allocations.create(user=bob, epoch=1)
+    await factories.allocations.create(user=bob, epoch=2)
 
-    charlie = await FakeUser.GetCharlie(fast_session)
-    await FakeAllocation.of_(fast_session, charlie, 1)
-
-    await fast_session.commit()
+    charlie = await factories.users.get_or_create_charlie()
+    await factories.allocations.create(user=charlie, epoch=1)
 
     async with fast_client as client:
         # A, B, C are donors for epoch 1
@@ -69,17 +68,15 @@ async def test_returns_donors_when_they_exist(
 
 @pytest.mark.asyncio
 async def test_returns_unique_donors(
-    fast_client: AsyncClient, fast_session: AsyncSession
+    fast_client: AsyncClient, factories: FactoriesAggregator
 ):
     """Should return unique donors"""
 
     # Given: a donor with allocation for 3 projects in the same epoch
-    alice = await FakeUser.GetAlice(fast_session)
-    await FakeAllocation.of_(fast_session, alice, 1)
-    await FakeAllocation.of_(fast_session, alice, 1)
-    await FakeAllocation.of_(fast_session, alice, 1)
-
-    await fast_session.commit()
+    alice = await factories.users.get_or_create_alice()
+    await factories.allocations.create(user=alice, epoch=1)
+    await factories.allocations.create(user=alice, epoch=1)
+    await factories.allocations.create(user=alice, epoch=1)
 
     async with fast_client as client:
         resp = await client.get("allocations/donors/1")
@@ -89,17 +86,15 @@ async def test_returns_unique_donors(
 
 @pytest.mark.asyncio
 async def test_removed_allocations_are_not_included(
-    fast_client: AsyncClient, fast_session: AsyncSession
+    fast_client: AsyncClient, fast_session: AsyncSession, factories: FactoriesAggregator
 ):
     """Should not include removed allocations"""
 
     # Given: a donor with allocation for 3 projects in the same epoch
-    alice = await FakeUser.GetAlice(fast_session)
-    alloc1 = await FakeAllocation.of_(fast_session, alice, 1)
-    alloc2 = await FakeAllocation.of_(fast_session, alice, 1)
-    alloc3 = await FakeAllocation.of_(fast_session, alice, 1)
-
-    await fast_session.commit()
+    alice = await factories.users.get_or_create_alice()
+    alloc1 = await factories.allocations.create(user=alice, epoch=1)
+    alloc2 = await factories.allocations.create(user=alice, epoch=1)
+    alloc3 = await factories.allocations.create(user=alice, epoch=1)
 
     async with fast_client as client:
         resp = await client.get("allocations/donors/1")

backend/tests/v2/allocations/test_get_project_allocations_for_epoch.py

@@ -1,10 +1,10 @@
 import pytest
-from httpx import AsyncClient
-from sqlalchemy.ext.asyncio import AsyncSession
 
 from fastapi import status
-from tests.v2.utils import FakeUser, FakeAllocation
+from httpx import AsyncClient
+from sqlalchemy.ext.asyncio import AsyncSession
 
+from tests.v2.factories import FactoriesAggregator
 
 """Test cases for the GET /allocations/projects/{project_address}/epoch/{epoch_number} endpoint"""
 
@@ -25,20 +25,25 @@ async def test_returns_empty_list_when_no_allocations(
 
 @pytest.mark.asyncio
 async def test_returns_allocations_when_they_exist(
-    fast_client: AsyncClient, fast_session: AsyncSession
+    fast_client: AsyncClient, factories: FactoriesAggregator
 ):
     """Should return allocations when they exist"""
 
     # Given: allocations for a project
     project_address = "0x433485B5951f250cEFDCbf197Cb0F60fdBE55513"
-    alice = await FakeUser.GetAlice(fast_session)
-    a_alloc1 = await FakeAllocation.of_(fast_session, alice, 1, project_address)
-    a_alloc2 = await FakeAllocation.of_(fast_session, alice, 2, project_address)
 
-    bob = await FakeUser.GetBob(fast_session)
-    b_alloc1 = await FakeAllocation.of_(fast_session, bob, 1, project_address)
+    alice = await factories.users.get_or_create_alice()
+    a_alloc1 = await factories.allocations.create(
+        user=alice, epoch=1, project_address=project_address
+    )
+    a_alloc2 = await factories.allocations.create(
+        user=alice, epoch=2, project_address=project_address
+    )
 
-    await fast_session.commit()
+    bob = await factories.users.get_or_create_bob()
+    b_alloc1 = await factories.allocations.create(
+        user=bob, epoch=1, project_address=project_address
+    )
 
     async with fast_client as client:
         resp = await client.get(f"allocations/project/{project_address}/epoch/1")