Fix perm goerli eth subgraph (#59)

stakewise · Feb 20, 2022 · 251a69d · 251a69d
1 parent 62d4ba8
commit 251a69d
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 33 deletions.
diff --git a/deploy/gnosis/.env.example b/deploy/gnosis/.env.example
@@ -48,6 +48,11 @@ IPFS_URL=http://ipfs:5001
 IPFS_PROFILE=server
 IPFS_FD_MAX=8192
 
+#############
+# ETH2 Node #
+#############
+ETH1_ENDPOINT=http://eth1-node:8545
+
 ##############
 # Graph Node #
 ##############
@@ -72,8 +77,3 @@ postgres_db=graph-node
 POSTGRES_DB=graph-node
 POSTGRES_USER=graph
 POSTGRES_PASSWORD=strong-password
-
-#############
-# ETH2 NODE #
-#############
-ETH1_ENDPOINT=http://eth1-node:8545
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.2
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.2.3
     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:v2.2.2
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.2.3
     restart: always
     entrypoint: ["python"]
     command: ["oracle/keeper/main.py"]

diff --git a/deploy/goerli/.env.example b/deploy/goerli/.env.example
@@ -49,6 +49,11 @@ IPFS_URL=http://ipfs:5001
 IPFS_PROFILE=server
 IPFS_FD_MAX=8192
 
+#############
+# ETH2 Node #
+#############
+ETH1_ENDPOINT=http://eth1-node:8545
+
 ##############
 # Graph Node #
 ##############
@@ -73,8 +78,3 @@ postgres_db=graph-node
 POSTGRES_DB=graph-node
 POSTGRES_USER=graph
 POSTGRES_PASSWORD=strong-password
-
-#############
-# ETH2 NODE #
-#############
-ETH1_ENDPOINT=http://eth1-node:8545
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.2
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.2.3
     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.2.2
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.2.3
     restart: always
     entrypoint: ["python"]
     command: ["oracle/keeper/main.py"]

diff --git a/deploy/mainnet/.env.example b/deploy/mainnet/.env.example
@@ -50,6 +50,11 @@ IPFS_URL=http://ipfs:5001
 IPFS_PROFILE=server
 IPFS_FD_MAX=8192
 
+#############
+# ETH2 Node #
+#############
+ETH1_ENDPOINT=http://eth1-node:8545
+
 ##############
 # Graph Node #
 ##############
@@ -74,8 +79,3 @@ postgres_db=graph-node
 POSTGRES_DB=graph-node
 POSTGRES_USER=graph
 POSTGRES_PASSWORD=strong-password
-
-#############
-# ETH2 NODE #
-#############
-ETH1_ENDPOINT=http://eth1-node:8545
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.2
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.2.3
     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.2.2
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.2.3
     restart: always
     entrypoint: ["python"]
     command: ["oracle/keeper/main.py"]

diff --git a/deploy/perm_goerli/.env.example b/deploy/perm_goerli/.env.example
@@ -16,8 +16,7 @@ IPFS_PINATA_SECRET_KEY=<pinata_secret_key>
 
 # Change https://api.thegraph.com to http://graph-node:8000 if running local graph node
 PERM_GOERLI_STAKEWISE_SUBGRAPH_URL=https://api.thegraph.com/subgraphs/name/stakewise/stakewise-perm-goerli
-PERM_GOERLI_ETHEREUM_SUBGRAPH_URL=https://api.thegraph.com/subgraphs/name/stakewise/ethereum-perm-goerli
-PERM_GOERLI_UNISWAP_V3_SUBGRAPH_URL=https://api.thegraph.com/subgraphs/name/stakewise/uniswap-v3-perm-goerli
+PERM_GOERLI_ETHEREUM_SUBGRAPH_URL=https://api.thegraph.com/subgraphs/name/stakewise/ethereum-goerli
 
 # Ethereum private key
 # NB! You must use a different private key for every network
@@ -49,6 +48,11 @@ IPFS_URL=http://ipfs:5001
 IPFS_PROFILE=server
 IPFS_FD_MAX=8192
 
+#############
+# ETH2 Node #
+#############
+ETH1_ENDPOINT=http://eth1-node:8545
+
 ##############
 # Graph Node #
 ##############
@@ -73,8 +77,3 @@ postgres_db=graph-node
 POSTGRES_DB=graph-node
 POSTGRES_USER=graph
 POSTGRES_PASSWORD=strong-password
-
-#############
-# ETH2 NODE #
-#############
-ETH1_ENDPOINT=http://eth1-node:8545
diff --git a/deploy/perm_goerli/docker-compose.yml b/deploy/perm_goerli/docker-compose.yml
@@ -26,7 +26,7 @@ networks:
 services:
   oracle:
     container_name: oracle_perm_goerli
-    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.2.2
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.2.3
     restart: always
     entrypoint: ["python"]
     command: ["oracle/oracle/main.py"]
@@ -36,7 +36,7 @@ services:
 
   keeper:
     container_name: keeper_perm_goerli
-    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.2.2
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.2.3
     restart: always
     entrypoint: ["python"]
     command: ["oracle/keeper/main.py"]

diff --git a/oracle/networks.py b/oracle/networks.py
@@ -159,11 +159,11 @@
         ),
         ETHEREUM_SUBGRAPH_URL=config(
             f"{PERM_GOERLI_UPPER}_ETHEREUM_SUBGRAPH_URL",
-            default="https://api.thegraph.com/subgraphs/name/stakewise/ethereum-perm-goerli",
+            default="https://api.thegraph.com/subgraphs/name/stakewise/ethereum-goerli",
         ),
         UNISWAP_V3_SUBGRAPH_URL=config(
             f"{PERM_GOERLI_UPPER}_UNISWAP_V3_SUBGRAPH_URL",
-            default="https://api.thegraph.com/subgraphs/name/stakewise/uniswap-v3-perm-goerli",
+            default="",
         ),
         # TODO: update once rari fuse pools is deployed to goerli chain
         RARI_FUSE_SUBGRAPH_URL=config(

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "oracle"
-version = "2.2.2"
+version = "2.2.3"
 description = "StakeWise Oracles are responsible for submitting off-chain data."
 authors = ["Dmitri Tsumak <[email protected]>"]
 license = "AGPL-3.0-only"