Use fixed to_block in rewards calculation (#142)

Signed-off-by: cyc60 <[email protected]>

deploy/goerli/docker-compose.yml

@@ -26,7 +26,7 @@ networks:
 services:
   oracle:
     container_name: oracle_goerli
-    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.9.3
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.9.4
     restart: always
     entrypoint: ["python"]
     command: ["oracle/oracle/main.py"]
@@ -36,7 +36,7 @@ services:
 
   keeper:
     container_name: keeper_goerli
-    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.9.3
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.9.4
     restart: always
     entrypoint: ["python"]
     command: ["oracle/keeper/main.py"]

deploy/harbour_goerli/docker-compose.yml

@@ -26,7 +26,7 @@ networks:
 services:
   oracle:
     container_name: oracle_harbour_goerli
-    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.9.3
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.9.4
     restart: always
     entrypoint: ["python"]
     command: ["oracle/oracle/main.py"]
@@ -36,7 +36,7 @@ services:
 
   keeper:
     container_name: keeper_harbour_goerli
-    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.9.3
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.9.4
     restart: always
     entrypoint: ["python"]
     command: ["oracle/keeper/main.py"]

deploy/harbour_mainnet/docker-compose.yml

@@ -26,7 +26,7 @@ networks:
 services:
   oracle:
     container_name: oracle_harbour_mainnet
-    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.9.3
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.9.4
     restart: always
     entrypoint: ["python"]
     command: ["oracle/oracle/main.py"]
@@ -36,7 +36,7 @@ services:
 
   keeper:
     container_name: keeper_harbour_mainnet
-    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.9.3
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.9.4
     restart: always
     entrypoint: ["python"]
     command: ["oracle/keeper/main.py"]

deploy/mainnet/docker-compose.yml

@@ -26,7 +26,7 @@ networks:
 services:
   oracle:
     container_name: oracle_mainnet
-    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.9.3
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.9.4
     restart: always
     entrypoint: ["python"]
     command: ["oracle/oracle/main.py"]
@@ -36,7 +36,7 @@ services:
 
   keeper:
     container_name: keeper_mainnet
-    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.9.3
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.9.4
     restart: always
     entrypoint: ["python"]
     command: ["oracle/keeper/main.py"]

oracle/oracle/rewards/controller.py

@@ -123,7 +123,6 @@ async def process(
         ):
             withdrawals_rewards = await self.calculate_withdrawal_rewards(
                 validator_indexes=validator_indexes,
-                to_block=current_block_number,
                 current_slot=int(state_id),
             )
             total_rewards += withdrawals_rewards
@@ -208,13 +207,18 @@ async def calculate_balance_rewards(
         return validator_indexes, Wei(rewards)
 
     async def calculate_withdrawal_rewards(
-        self, validator_indexes: set[int], to_block: BlockNumber, current_slot: int
+        self, validator_indexes: set[int], current_slot: int
     ) -> Wei:
         withdrawals_amount = 0
         from_block = await self.get_withdrawals_from_block(current_slot)
+        to_block = await self.get_withdrawals_to_block(current_slot)
         if not from_block or from_block >= to_block:
             return Wei(0)
 
+        logger.info(
+            f"Retrieving pool validator withdrawals "
+            f"from block: {from_block} to block: {to_block}"
+        )
         execution_client = get_web3_client()
 
         with concurrent.futures.ThreadPoolExecutor(max_workers=10) as executor:
@@ -244,6 +248,17 @@ async def get_withdrawals_from_block(self, current_slot: int) -> BlockNumber | N
                 return from_block
             slot_number += 1
 
+    async def get_withdrawals_to_block(self, current_slot: int) -> BlockNumber | None:
+        slot_number = current_slot
+        withdrawals_slot_number = self.withdrawals_genesis_epoch * self.slots_per_epoch
+        while slot_number >= withdrawals_slot_number:
+            to_block = await get_execution_block(
+                session=self.aiohttp_session, slot_number=slot_number
+            )
+            if to_block:
+                return to_block
+            slot_number -= 1
+
     def format_ether(self, value: Union[str, int, Wei]) -> str:
         """Converts Wei value."""
         _value = int(value)

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "oracle"
-version = "2.9.3"
+version = "2.9.4"
 description = "StakeWise Oracles are responsible for submitting off-chain data."
 authors = ["Dmitri Tsumak <[email protected]>"]
 license = "AGPL-3.0-only"