Merge pull request #7 from stakewise/fix-reward-token-sync

Fix reward token sync
stakewise · Jan 31, 2021 · f6a38a5 · f6a38a5
2 parents 961ce04 + 4578382
commit f6a38a5
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/requirements/prod.in b/requirements/prod.in
@@ -3,4 +3,4 @@ notifiers==1.2.1
 web3==5.15.0
 grpcio==1.35.0
 protobuf==3.14.0
-google-api-core==1.24.1
+google-api-core==1.25.1
diff --git a/requirements/prod.txt b/requirements/prod.txt
@@ -86,9 +86,9 @@ eth-utils==1.10.0 \
     #   eth-rlp
     #   rlp
     #   web3
-google-api-core==1.24.1 \
-    --hash=sha256:0f1dee446db2685863c3c493a90fefa5fc7f4defaf8e1a320b50ccaddfb5d469 \
-    --hash=sha256:a7f5794446a22ff7d36764959ba5f319f37628faf4da04fdc0dedf1598b556c1
+google-api-core==1.25.1 \
+    --hash=sha256:0e152ec37b8481d1be1258d95844a5a7031cd3d83d7c7046d9e9b2d807042440 \
+    --hash=sha256:292dd636ed381098d24b7093ccb826b2278a12d886a3fc982084069aa24a8fbb
     # via -r requirements/prod.in
 google-auth==1.24.0 \
     --hash=sha256:0b0e026b412a0ad096e753907559e4bdb180d9ba9f68dd9036164db4fdc4ad2e \

diff --git a/src/reward_token.py b/src/reward_token.py
@@ -90,14 +90,15 @@ def __init__(self, w3: Web3, interrupt_handler: InterruptHandler) -> None:
         self.total_rewards_update_period: timedelta = timedelta(
             seconds=self.oracles.functions.totalRewardsUpdatePeriod().call()
         )
-        logger.debug(f"Total rewards update period: {self.total_rewards_update_period}")
-        if self.last_update_at < self.genesis_time:
+        logger.info(f"Total rewards update period: {self.total_rewards_update_period}")
+
+        next_update_at = self.last_update_at + self.total_rewards_update_period
+        while next_update_at <= datetime.now(tz=timezone.utc):
+            self.last_update_at = next_update_at
             next_update_at = self.last_update_at + self.total_rewards_update_period
-            while next_update_at <= datetime.now(tz=timezone.utc):
-                self.last_update_at = next_update_at
-                next_update_at = self.last_update_at + self.total_rewards_update_period
 
         self.next_update_at = self.last_update_at + self.total_rewards_update_period
+        logger.info(f"Next rewards update time: {self.next_update_at}")
 
     def process(self) -> None:
         """Records new pool validators, updates total rewards."""
@@ -106,18 +107,24 @@ def process(self) -> None:
         )
         if total_rewards_update_period != self.total_rewards_update_period:
             # adjust next update time based on new period
-            self.next_update_at = (
+            next_update_at = (
                 self.next_update_at
                 - self.total_rewards_update_period
                 + total_rewards_update_period
             )
+            self.total_rewards_update_period = total_rewards_update_period
             logger.info(
                 f"Updated total rewards update period:"
                 f" previous={self.total_rewards_update_period},"
                 f" new={total_rewards_update_period}"
             )
+
+            while next_update_at <= datetime.now(tz=timezone.utc):
+                self.last_update_at = next_update_at
+                next_update_at = self.last_update_at + self.total_rewards_update_period
+
+            self.next_update_at = self.last_update_at + self.total_rewards_update_period
             logger.info(f"Scheduling next rewards update at {self.next_update_at}")
-            self.total_rewards_update_period = total_rewards_update_period
 
         if self.next_update_at > datetime.now(tz=timezone.utc):
             # it's not the time to update yet
@@ -165,7 +172,7 @@ def process(self) -> None:
             )
             return
 
-        logger.debug(
+        logger.info(
             f"Retrieving balances for {len(active_public_keys)} / {len(public_keys)}"
             f" validators at epoch={epoch}"
         )