Fix keeper tx sending (#56)

stakewise · Feb 17, 2022 · 7b4e611 · 7b4e611
1 parent 31ae985
commit 7b4e611
Show file tree

Hide file tree

Showing 9 changed files with 73 additions and 68 deletions.
diff --git a/deploy/gnosis/docker-compose.yml b/deploy/gnosis/docker-compose.yml
@@ -24,7 +24,7 @@ networks:
 services:
   oracle:
     container_name: oracle_gnosis
-    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.2.0
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.2.1
     restart: always
     entrypoint: ["python"]
     command: ["oracle/oracle/main.py"]
@@ -35,7 +35,7 @@ services:
 
   keeper:
     container_name: keeper_gnosis
-    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.2.0
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.2.1
     restart: always
     entrypoint: ["python"]
     command: ["oracle/keeper/main.py"]

diff --git a/deploy/goerli/docker-compose.yml b/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.2.0
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.2.1
     restart: always
     entrypoint: ["python"]
     command: ["oracle/oracle/main.py"]
@@ -37,7 +37,7 @@ services:
 
   keeper:
     container_name: keeper_goerli
-    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.2.0
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.2.1
     restart: always
     entrypoint: ["python"]
     command: ["oracle/keeper/main.py"]

diff --git a/deploy/mainnet/docker-compose.yml b/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.2.0
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.2.1
     restart: always
     entrypoint: ["python"]
     command: ["oracle/oracle/main.py"]
@@ -37,7 +37,7 @@ services:
 
   keeper:
     container_name: keeper_mainnet
-    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.2.0
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.2.1
     restart: always
     entrypoint: ["python"]
     command: ["oracle/keeper/main.py"]

diff --git a/oracle/keeper/health_server.py b/oracle/keeper/health_server.py
@@ -34,6 +34,7 @@ async def health(request):
             # Can resolve and fetch recent votes of the oracles
             get_oracles_votes(
                 network=network,
+                web3_client=web3_client,
                 rewards_nonce=params.rewards_nonce,
                 validators_nonce=params.validators_nonce,
                 oracles=params.oracles,

diff --git a/oracle/keeper/main.py b/oracle/keeper/main.py
@@ -10,6 +10,7 @@
 from oracle.settings import (
     ENABLE_HEALTH_SERVER,
     ENABLED_NETWORKS,
+    HEALTH_SERVER_HOST,
     HEALTH_SERVER_PORT,
     KEEPER_PROCESS_INTERVAL,
     LOG_LEVEL,
@@ -59,7 +60,7 @@ def main() -> None:
             daemon=True,
         )
         logger.info(
-            f"Starting monitoring server at http://{ENABLE_HEALTH_SERVER}:{HEALTH_SERVER_PORT}"
+            f"Starting monitoring server at http://{HEALTH_SERVER_HOST}:{HEALTH_SERVER_PORT}"
         )
         t.start()
     main()
diff --git a/oracle/keeper/utils.py b/oracle/keeper/utils.py
@@ -162,6 +162,7 @@ def check_validator_vote(
 
 def get_oracles_votes(
     network: str,
+    web3_client: Web3,
     rewards_nonce: int,
     validators_nonce: int,
     oracles: List[ChecksumAddress],
@@ -198,7 +199,7 @@ def get_oracles_votes(
                 vote = response.json()
                 if "nonce" not in vote or vote["nonce"] != correct_nonce:
                     continue
-                if not vote_checker(vote, oracle):
+                if not vote_checker(web3_client, vote, oracle):
                     logger.warning(
                         f"[{network}] Oracle {oracle} has submitted incorrect vote at {bucket_key}"
                     )
@@ -275,6 +276,7 @@ def submit_votes(
     # resolve and fetch the latest votes of the oracles for validators and rewards
     votes = get_oracles_votes(
         network=network,
+        web3_client=web3_client,
         rewards_nonce=params.rewards_nonce,
         validators_nonce=params.validators_nonce,
         oracles=params.oracles,

diff --git a/oracle/oracle/main.py b/oracle/oracle/main.py
@@ -18,6 +18,7 @@
 from oracle.settings import (
     ENABLE_HEALTH_SERVER,
     ENABLED_NETWORKS,
+    HEALTH_SERVER_HOST,
     HEALTH_SERVER_PORT,
     LOG_LEVEL,
     ORACLE_PROCESS_INTERVAL,
@@ -130,7 +131,7 @@ async def main() -> None:
             daemon=True,
         )
         logger.info(
-            f"Starting monitoring server at http://{ENABLE_HEALTH_SERVER}:{HEALTH_SERVER_PORT}"
+            f"Starting monitoring server at http://{HEALTH_SERVER_HOST}:{HEALTH_SERVER_PORT}"
         )
         t.start()
     asyncio.run(main())
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "oracle"
-version = "2.1.2"
+version = "2.2.1"
 description = "StakeWise Oracles are responsible for submitting off-chain data."
 authors = ["Dmitri Tsumak <[email protected]>"]
 license = "AGPL-3.0-only"