Distributor addr (#74)

* Support distributor tokens * Remove scoring container * Update distributor tokens * Update oracle version * Refactor distributor redirects * Update docker images * Fix graphql query
stakewise · Mar 27, 2022 · 5c89983 · 5c89983
1 parent 08e98bc
commit 5c89983
Show file tree

Hide file tree

Showing 16 changed files with 272 additions and 224 deletions.
diff --git a/deploy/gnosis/.env.example b/deploy/gnosis/.env.example
@@ -77,10 +77,3 @@ postgres_db=graph-node
 POSTGRES_DB=graph-node
 POSTGRES_USER=graph
 POSTGRES_PASSWORD=strong-password
-
-############
-# Scroring #
-############
-SCORING_GRAPH_NODE_URL=https://api.thegraph.com/subgraphs/name/stakewise/stakewise-gnosis
-SCORING_ETH2_NODE_URL=http://eth2-node:5052
-SCORING_DATABASE_PATH=/data/operator.db
diff --git a/deploy/gnosis/docker-compose.yml b/deploy/gnosis/docker-compose.yml
@@ -15,8 +15,6 @@ volumes:
     driver: local
   lighthouse:
     driver: local
-  scoring:
-    driver: local
 
 networks:
   gnosis:
@@ -26,7 +24,7 @@ networks:
 services:
   oracle:
     container_name: oracle_gnosis
-    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.2.9
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.3.0
     restart: always
     entrypoint: ["python"]
     command: ["oracle/oracle/main.py"]
@@ -36,24 +34,14 @@ services:
 
   keeper:
     container_name: keeper_gnosis
-    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.2.9
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.3.0
     restart: always
     entrypoint: ["python"]
     command: ["oracle/keeper/main.py"]
     env_file: [".env"]
     profiles: ["keeper"]
     networks:
       - gnosis
-
-  scoring:
-    container_name: scoring_gnosis
-    image: europe-west4-docker.pkg.dev/stakewiselabs/public/operator-effectiveness:v0.0.6
-    restart: always
-    env_file: [".env"]
-    volumes:
-      - scoring:/data
-    networks:
-      - gnosis
 
   prometheus:
     container_name: prometheus_gnosis
@@ -81,7 +69,7 @@ services:
 
   graph-node:
     container_name: graph_node_gnosis
-    image: graphprotocol/graph-node:v0.25.0
+    image: graphprotocol/graph-node:v0.25.2
     restart: always
     env_file: [".env"]
     depends_on: ["postgres","ipfs"]
@@ -102,7 +90,7 @@ services:
 
   subgraphs:
     container_name: subgraphs_gnosis
-    image: europe-west4-docker.pkg.dev/stakewiselabs/public/subgraphs:v1.1.1
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/subgraphs:v1.2.0
     command: >
       /bin/sh -c "until nc -vz graph-node 8020; do echo 'Waiting graph-node'; sleep 2; done
       && yarn build:gnosis
@@ -117,7 +105,7 @@ services:
 
   ipfs:
     container_name: ipfs_gnosis
-    image: ipfs/go-ipfs:v0.10.0
+    image: ipfs/go-ipfs:v0.12.1
     restart: always
     env_file: [".env"]
     ulimits:
@@ -131,7 +119,7 @@ services:
 
   openethereum:
     container_name: openethereum_gnosis
-    image: openethereum/openethereum:v3.3.3
+    image: openethereum/openethereum:v3.3.4
     restart: always
     command:
       - --chain=xdai
@@ -147,10 +135,9 @@ services:
         aliases:
           - eth1-node
 
-
   nethermind:
     container_name: nethermind_gnosis
-    image: nethermind/nethermind:1.12.4
+    image: nethermind/nethermind:1.12.6
     restart: always
     command:
       - --config=xdai
@@ -168,7 +155,7 @@ services:
 
   lighthouse:
     container_name: lighthouse_gnosis
-    image: sigp/lighthouse:v2.1.2
+    image: sigp/lighthouse:v2.1.5
     restart: always
     command:
       - lighthouse

diff --git a/deploy/goerli/.env.example b/deploy/goerli/.env.example
@@ -78,10 +78,3 @@ postgres_db=graph-node
 POSTGRES_DB=graph-node
 POSTGRES_USER=graph
 POSTGRES_PASSWORD=strong-password
-
-############
-# Scroring #
-############
-SCORING_GRAPH_NODE_URL=https://api.thegraph.com/subgraphs/name/stakewise/stakewise-goerli
-SCORING_ETH2_NODE_URL=http://eth2-node:5052
-SCORING_DATABASE_PATH=/data/operator.db
diff --git a/deploy/goerli/docker-compose.yml b/deploy/goerli/docker-compose.yml
@@ -17,8 +17,6 @@ volumes:
     driver: local
   lighthouse:
     driver: local
-  scoring:
-    driver: local
 
 networks:
   goerli:
@@ -28,7 +26,7 @@ networks:
 services:
   oracle:
     container_name: oracle_goerli
-    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.2.9
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.3.0
     restart: always
     entrypoint: ["python"]
     command: ["oracle/oracle/main.py"]
@@ -38,24 +36,14 @@ services:
 
   keeper:
     container_name: keeper_goerli
-    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.2.9
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.3.0
     restart: always
     entrypoint: ["python"]
     command: ["oracle/keeper/main.py"]
     env_file: [".env"]
     profiles: ["keeper"]
     networks:
       - goerli
-
-  scoring:
-    container_name: scoring_goerli
-    image: europe-west4-docker.pkg.dev/stakewiselabs/public/operator-effectiveness:v0.0.6
-    restart: always
-    env_file: [".env"]
-    volumes:
-      - scoring:/data
-    networks:
-      - goerli
 
   prometheus:
     container_name: prometheus_goerli
@@ -104,7 +92,7 @@ services:
 
   subgraphs:
     container_name: subgraphs_goerli
-    image: europe-west4-docker.pkg.dev/stakewiselabs/public/subgraphs:v1.1.1
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/subgraphs:v1.2.0
     command: >
       /bin/sh -c "until nc -vz graph-node 8020; do echo 'Waiting graph-node'; sleep 2; done
       && yarn build:goerli
@@ -154,7 +142,7 @@ services:
 
   erigon:
     container_name: erigon_goerli
-    image: thorax/erigon:v2022.01.03
+    image: thorax/erigon:v2022.03.02
     restart: always
     command:
       - erigon
@@ -172,7 +160,7 @@ services:
 
   erigon-rpcdaemon:
     container_name: erigon_rpcdaemon_goerli
-    image: thorax/erigon:v2022.01.03
+    image: thorax/erigon:v2022.03.02
     restart: always
     command:
       - rpcdaemon
@@ -212,7 +200,7 @@ services:
 
   lighthouse:
     container_name: lighthouse_goerli
-    image: sigp/lighthouse:v2.1.2
+    image: sigp/lighthouse:v2.1.5
     restart: always
     command:
       - lighthouse

diff --git a/deploy/mainnet/.env.example b/deploy/mainnet/.env.example
@@ -18,7 +18,6 @@ IPFS_PINATA_SECRET_KEY=<pinata_secret_key>
 MAINNET_STAKEWISE_SUBGRAPH_URL=https://api.thegraph.com/subgraphs/name/stakewise/stakewise-mainnet
 MAINNET_ETHEREUM_SUBGRAPH_URL=https://api.thegraph.com/subgraphs/name/stakewise/ethereum-mainnet
 MAINNET_UNISWAP_V3_SUBGRAPH_URL=https://api.thegraph.com/subgraphs/name/stakewise/uniswap-v3-mainnet
-MAINNET_RARI_FUSE_SUBGRAPH_URL=https://api.thegraph.com/subgraphs/name/stakewise/rari-fuse-mainnet
 
 # Ethereum private key
 # NB! You must use a different private key for every network
@@ -79,10 +78,3 @@ postgres_db=graph-node
 POSTGRES_DB=graph-node
 POSTGRES_USER=graph
 POSTGRES_PASSWORD=strong-password
-
-############
-# Scroring #
-############
-SCORING_GRAPH_NODE_URL=https://api.thegraph.com/subgraphs/name/stakewise/stakewise-mainnet
-SCORING_ETH2_NODE_URL=http://eth2-node:5052
-SCORING_DATABASE_PATH=/data/operator.db
diff --git a/deploy/mainnet/docker-compose.yml b/deploy/mainnet/docker-compose.yml
@@ -17,8 +17,6 @@ volumes:
     driver: local
   lighthouse:
     driver: local
-  scoring:
-    driver: local
 
 networks:
   mainnet:
@@ -28,7 +26,7 @@ networks:
 services:
   oracle:
     container_name: oracle_mainnet
-    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.2.9
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.3.0
     restart: always
     entrypoint: ["python"]
     command: ["oracle/oracle/main.py"]
@@ -38,24 +36,14 @@ services:
 
   keeper:
     container_name: keeper_mainnet
-    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.2.9
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.3.0
     restart: always
     entrypoint: ["python"]
     command: ["oracle/keeper/main.py"]
     env_file: [".env"]
     profiles: ["keeper"]
     networks:
       - mainnet
-
-  scoring:
-    container_name: scoring_mainnet
-    image: europe-west4-docker.pkg.dev/stakewiselabs/public/operator-effectiveness:v0.0.6
-    restart: always
-    env_file: [".env"]
-    volumes:
-      - scoring:/data
-    networks:
-      - mainnet
 
   prometheus:
     container_name: prometheus_mainnet
@@ -104,7 +92,7 @@ services:
 
   subgraphs:
     container_name: subgraphs_mainnet
-    image: europe-west4-docker.pkg.dev/stakewiselabs/public/subgraphs:v1.1.1
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/subgraphs:v1.2.0
     command: >
       /bin/sh -c "until nc -vz graph-node 8020; do echo 'Waiting graph-node'; sleep 2; done
       && yarn build:mainnet
@@ -151,7 +139,7 @@ services:
 
   erigon:
     container_name: erigon_mainnet
-    image: thorax/erigon:v2022.01.03
+    image: thorax/erigon:v2022.03.02
     restart: always
     command:
       - erigon
@@ -170,7 +158,7 @@ services:
 
   erigon-rpcdaemon:
     container_name: erigon_rpcdaemon_mainnet
-    image: thorax/erigon:v2022.01.03
+    image: thorax/erigon:v2022.03.02
     restart: always
     command:
       - rpcdaemon
@@ -208,7 +196,7 @@ services:
 
   lighthouse:
     container_name: lighthouse_mainnet
-    image: sigp/lighthouse:v2.1.2
+    image: sigp/lighthouse:v2.1.5
     restart: always
     command:
       - lighthouse

diff --git a/deploy/perm_goerli/docker-compose.yml b/deploy/perm_goerli/docker-compose.yml
@@ -17,8 +17,6 @@ volumes:
     driver: local
   lighthouse:
     driver: local
-  scoring:
-    driver: local
 
 networks:
   perm_goerli:
@@ -28,19 +26,17 @@ networks:
 services:
   oracle:
     container_name: oracle_perm_goerli
-    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.2.9
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.3.0
     restart: always
     entrypoint: ["python"]
     command: ["oracle/oracle/main.py"]
     env_file: [".env"]
-    volumes:
-      - scoring:/data
     networks:
       - perm_goerli
 
   keeper:
     container_name: keeper_perm_goerli
-    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.2.9
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.3.0
     restart: always
     entrypoint: ["python"]
     command: ["oracle/keeper/main.py"]
@@ -75,7 +71,7 @@ services:
 
   graph-node:
     container_name: graph_node_perm_goerli
-    image: graphprotocol/graph-node:v0.25.0
+    image: graphprotocol/graph-node:v0.25.2
     restart: always
     env_file: [".env"]
     depends_on: ["postgres","ipfs"]
@@ -96,7 +92,7 @@ services:
 
   subgraphs:
     container_name: subgraphs_perm_goerli
-    image: europe-west4-docker.pkg.dev/stakewiselabs/public/subgraphs:v1.1.1
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/subgraphs:v1.2.0
     command: >
       /bin/sh -c "until nc -vz graph-node 8020; do echo 'Waiting graph-node'; sleep 2; done
       && yarn build:perm_goerli
@@ -111,7 +107,7 @@ services:
 
   ipfs:
     container_name: ipfs_perm_goerli
-    image: ipfs/go-ipfs:v0.10.0
+    image: ipfs/go-ipfs:v0.12.1
     restart: always
     env_file: [".env"]
     ulimits:
@@ -125,7 +121,7 @@ services:
 
   geth:
     container_name: geth_perm_goerli
-    image: ethereum/client-go:v1.10.15
+    image: ethereum/client-go:v1.10.16
     restart: always
     command:
       - --goerli
@@ -146,7 +142,7 @@ services:
 
   erigon:
     container_name: erigon_perm_goerli
-    image: thorax/erigon:v2022.01.03
+    image: thorax/erigon:v2022.03.02
     restart: always
     command:
       - erigon
@@ -164,7 +160,7 @@ services:
 
   erigon-rpcdaemon:
     container_name: erigon_rpcdaemon_perm_goerli
-    image: thorax/erigon:v2022.01.03
+    image: thorax/erigon:v2022.03.02
     restart: always
     command:
       - rpcdaemon
@@ -204,7 +200,7 @@ services:
 
   lighthouse:
     container_name: lighthouse_perm_goerli
-    image: sigp/lighthouse:v2.1.2
+    image: sigp/lighthouse:v2.1.5
     restart: always
     command:
       - lighthouse