Remove hosted graph settings (#162)

* Remove hosted graph settings Signed-off-by: cyc60 <[email protected]> * Version bump Signed-off-by: cyc60 <[email protected]> * Update flake8 Signed-off-by: cyc60 <[email protected]> --------- Signed-off-by: cyc60 <[email protected]>
stakewise · May 29, 2024 · 8fed0dc · 8fed0dc
1 parent cb24b2f
commit 8fed0dc
Show file tree

Hide file tree

Showing 8 changed files with 1,038 additions and 1,002 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -5,7 +5,7 @@ repos:
       - id: black
 
   - repo: https://github.com/PyCQA/flake8
-    rev: 4.0.1
+    rev: 7.0.0
     hooks:
       - id: flake8
 

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:v3.3.0
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v3.3.1
     restart: always
     entrypoint: ["python"]
     command: ["oracle/oracle/main.py"]
@@ -34,7 +34,7 @@ services:
 
   keeper:
     container_name: keeper_gnosis
-    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v3.3.0
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v3.3.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:v3.3.0
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v3.3.1
     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:v3.3.0
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v3.3.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:v3.3.0
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v3.3.1
     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:v3.3.0
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v3.3.1
     restart: always
     entrypoint: ["python"]
     command: ["oracle/keeper/main.py"]

diff --git a/oracle/networks.py b/oracle/networks.py
@@ -20,17 +20,17 @@
     MAINNET: dict(
         STAKEWISE_SUBGRAPH_URLS=config(
             "STAKEWISE_SUBGRAPH_URLS",
-            default="https://graph.stakewise.io/subgraphs/name/stakewise/stakewise,https://api.thegraph.com/subgraphs/name/stakewise/stakewise-mainnet",
+            default="https://graph.stakewise.io/subgraphs/name/stakewise/stakewise",
             cast=Csv(),
         ),
         ETHEREUM_SUBGRAPH_URLS=config(
             "ETHEREUM_SUBGRAPH_URLS",
-            default="https://graph.stakewise.io/subgraphs/name/stakewise/ethereum,https://api.thegraph.com/subgraphs/name/stakewise/ethereum-mainnet",
+            default="https://graph.stakewise.io/subgraphs/name/stakewise/ethereum",
             cast=Csv(),
         ),
         UNISWAP_V3_SUBGRAPH_URLS=config(
             "UNISWAP_V3_SUBGRAPH_URLS",
-            default="https://graph.stakewise.io/subgraphs/name/stakewise/uniswap-v3,https://api.thegraph.com/subgraphs/name/stakewise/uniswap-v3-mainnet",
+            default="https://graph.stakewise.io/subgraphs/name/stakewise/uniswap-v3",
             cast=Csv(),
         ),
         ETH1_ENDPOINT=config("ETH1_ENDPOINT", default=""),
@@ -84,12 +84,12 @@
     HARBOUR_MAINNET: dict(
         STAKEWISE_SUBGRAPH_URLS=config(
             "STAKEWISE_SUBGRAPH_URLS",
-            default="https://graph.stakewise.io/subgraphs/name/stakewise/stakewise-harbour-mainnet,https://api.thegraph.com/subgraphs/name/stakewise/stakewise-harbour-mainnet",
+            default="https://graph.stakewise.io/subgraphs/name/stakewise/stakewise-harbour-mainnet",
             cast=Csv(),
         ),
         ETHEREUM_SUBGRAPH_URLS=config(
             "ETHEREUM_SUBGRAPH_URLS",
-            default="https://graph.stakewise.io/subgraphs/name/stakewise/ethereum,https://api.thegraph.com/subgraphs/name/stakewise/ethereum-mainnet",
+            default="https://graph.stakewise.io/subgraphs/name/stakewise/ethereum",
             cast=Csv(),
         ),
         UNISWAP_V3_SUBGRAPH_URLS=config(
@@ -264,12 +264,12 @@
     GNOSIS_CHAIN: dict(
         STAKEWISE_SUBGRAPH_URLS=config(
             "STAKEWISE_SUBGRAPH_URLS",
-            default="https://api.thegraph.com/subgraphs/name/stakewise/stakewise-gnosis,https://graph-gno.stakewise.io/subgraphs/name/stakewise/stakewise",
+            default="https://graph-gno.stakewise.io/subgraphs/name/stakewise/stakewise",
             cast=Csv(),
         ),
         ETHEREUM_SUBGRAPH_URLS=config(
             "ETHEREUM_SUBGRAPH_URLS",
-            default="https://api.thegraph.com/subgraphs/name/stakewise/ethereum-gnosis,https://graph-gno.stakewise.io/subgraphs/name/stakewise/ethereum",
+            default="https://graph-gno.stakewise.io/subgraphs/name/stakewise/ethereum",
             cast=Csv(),
         ),
         UNISWAP_V3_SUBGRAPH_URLS=config(

diff --git a/oracle/oracle/distributor/common/eth1.py b/oracle/oracle/distributor/common/eth1.py
@@ -122,7 +122,7 @@ async def get_disabled_stakers_reward_token_distributions(
     distributed: Wei = Wei(0)
     last_staker_index = len(principals) - 1
     for i, staker_address in enumerate(principals):
-        rewards: Wei
+        reward: Wei
         if i == last_staker_index:
             reward = Wei(distributor_reward - distributed)
         else: