diff --git a/deploy/gnosis/.env.example b/deploy/gnosis/.env.example index ad6e3e7..9130e45 100644 --- a/deploy/gnosis/.env.example +++ b/deploy/gnosis/.env.example @@ -19,31 +19,31 @@ IPFS_PINATA_API_KEY= IPFS_PINATA_SECRET_KEY= # Change https://api.thegraph.com to http://graph-node:8000 if running local graph node -GNOSIS_STAKEWISE_SUBGRAPH_URLS=https://api.thegraph.com/subgraphs/name/stakewise/stakewise-gnosis -GNOSIS_ETHEREUM_SUBGRAPH_URLS=https://api.thegraph.com/subgraphs/name/stakewise/ethereum-gnosis +STAKEWISE_SUBGRAPH_URLS=https://api.thegraph.com/subgraphs/name/stakewise/stakewise-gnosis +ETHEREUM_SUBGRAPH_URLS=https://api.thegraph.com/subgraphs/name/stakewise/ethereum-gnosis # Ethereum private key # NB! You must use a different private key for every network -GNOSIS_ORACLE_PRIVATE_KEY=0x +ORACLE_PRIVATE_KEY=0x # ETH2 (consensus) client endpoint # Change if running an external ETH2 node -GNOSIS_ETH2_ENDPOINT=http://eth2-node:5052 +ETH2_ENDPOINT=http://eth2-node:5052 # AWS bucket to publish oracle votes to -GNOSIS_AWS_ACCESS_KEY_ID= -GNOSIS_AWS_SECRET_ACCESS_KEY= -GNOSIS_AWS_BUCKET_NAME=oracle-votes-gnosis -GNOSIS_AWS_REGION=eu-north-1 +AWS_ACCESS_KEY_ID= +AWS_SECRET_ACCESS_KEY= +AWS_BUCKET_NAME=oracle-votes-gnosis +AWS_REGION=eu-north-1 ########## # Keeper # ########## # Change if running an external ETH1 node -GNOSIS_KEEPER_ETH1_ENDPOINT=http://eth1-node:8545 +KEEPER_ETH1_ENDPOINT=http://eth1-node:8545 # Use https://eth-converter.com/ to calculate -GNOSIS_KEEPER_MIN_BALANCE_WEI=1000000000000000000 -GNOSIS_KEEPER_MAX_FEE_PER_GAS_GWEI=150 +KEEPER_MIN_BALANCE_WEI=1000000000000000000 +KEEPER_MAX_FEE_PER_GAS_GWEI=150 ######## # IPFS # @@ -81,3 +81,8 @@ postgres_db=graph-node POSTGRES_DB=graph-node POSTGRES_USER=graph POSTGRES_PASSWORD=strong-password + +############ +# SENTRY # +############ +# SENTRY_DSN= diff --git a/deploy/gnosis/docker-compose.yml b/deploy/gnosis/docker-compose.yml index f772339..6f65fb1 100644 --- 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.5.3 + image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.7.6 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.5.3 + image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.7.6 restart: always entrypoint: ["python"] command: ["oracle/keeper/main.py"] diff --git a/deploy/goerli/.env.example b/deploy/goerli/.env.example index 504541f..0521e43 100644 --- a/deploy/goerli/.env.example +++ b/deploy/goerli/.env.example @@ -19,32 +19,32 @@ IPFS_PINATA_API_KEY= IPFS_PINATA_SECRET_KEY= # Change https://api.thegraph.com to http://graph-node:8000 if running local graph node -GOERLI_STAKEWISE_SUBGRAPH_URLS=https://api.thegraph.com/subgraphs/name/stakewise/stakewise-goerli -GOERLI_ETHEREUM_SUBGRAPH_URLS=https://api.thegraph.com/subgraphs/name/stakewise/ethereum-goerli -GOERLI_UNISWAP_V3_SUBGRAPH_URLS=https://api.thegraph.com/subgraphs/name/stakewise/uniswap-v3-goerli +STAKEWISE_SUBGRAPH_URLS=https://api.thegraph.com/subgraphs/name/stakewise/stakewise-goerli +ETHEREUM_SUBGRAPH_URLS=https://api.thegraph.com/subgraphs/name/stakewise/ethereum-goerli +UNISWAP_V3_SUBGRAPH_URLS=https://api.thegraph.com/subgraphs/name/stakewise/uniswap-v3-goerli # Ethereum private key # NB! You must use a different private key for every network -GOERLI_ORACLE_PRIVATE_KEY=0x +ORACLE_PRIVATE_KEY=0x # ETH2 (consensus) client endpoint # Change if running an external ETH2 node -GOERLI_ETH2_ENDPOINT=http://eth2-node:5052 +ETH2_ENDPOINT=http://eth2-node:5052 # AWS bucket to publish oracle votes to -GOERLI_AWS_ACCESS_KEY_ID= -GOERLI_AWS_SECRET_ACCESS_KEY= -GOERLI_AWS_BUCKET_NAME=oracle-votes-goerli -GOERLI_AWS_REGION=eu-central-1 +AWS_ACCESS_KEY_ID= +AWS_SECRET_ACCESS_KEY= +AWS_BUCKET_NAME=oracle-votes-goerli +AWS_REGION=eu-central-1 ########## # Keeper # ########## # Change if running an external ETH1 node -GOERLI_KEEPER_ETH1_ENDPOINT=http://eth1-node:8545 +KEEPER_ETH1_ENDPOINT=http://eth1-node:8545 # Use https://eth-converter.com/ to calculate -GOERLI_KEEPER_MIN_BALANCE_WEI=100000000000000000 -GOERLI_KEEPER_MAX_FEE_PER_GAS_GWEI=150 +KEEPER_MIN_BALANCE_WEI=100000000000000000 +KEEPER_MAX_FEE_PER_GAS_GWEI=150 ######## # IPFS # @@ -82,3 +82,8 @@ postgres_db=graph-node POSTGRES_DB=graph-node POSTGRES_USER=graph POSTGRES_PASSWORD=strong-password + +############ +# SENTRY # +############ +# SENTRY_DSN= diff --git a/deploy/goerli/docker-compose.yml b/deploy/goerli/docker-compose.yml index 3fdb9a5..beb5ebd 100644 --- 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.5.3 + image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.7.6 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.5.3 + image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.7.6 restart: always entrypoint: ["python"] command: ["oracle/keeper/main.py"] diff --git a/deploy/harbour_goerli/.env.example b/deploy/harbour_goerli/.env.example index 9aa8517..172a902 100644 --- a/deploy/harbour_goerli/.env.example +++ b/deploy/harbour_goerli/.env.example @@ -19,31 +19,31 @@ IPFS_PINATA_API_KEY= IPFS_PINATA_SECRET_KEY= # Change https://api.thegraph.com to http://graph-node:8000 if running local graph node -HARBOUR_GOERLI_STAKEWISE_SUBGRAPH_URLS=https://api.thegraph.com/subgraphs/name/stakewise/stakewise-perm-goerli -HARBOUR_GOERLI_ETHEREUM_SUBGRAPH_URLS=https://api.thegraph.com/subgraphs/name/stakewise/ethereum-goerli +STAKEWISE_SUBGRAPH_URLS=https://api.thegraph.com/subgraphs/name/stakewise/stakewise-perm-goerli +ETHEREUM_SUBGRAPH_URLS=https://api.thegraph.com/subgraphs/name/stakewise/ethereum-goerli # Ethereum private key # NB! You must use a different private key for every network -HARBOUR_GOERLI_ORACLE_PRIVATE_KEY=0x +ORACLE_PRIVATE_KEY=0x # ETH2 (consensus) client endpoint # Change if running an external ETH2 node -HARBOUR_GOERLI_ETH2_ENDPOINT=http://eth2-node:5052 +ETH2_ENDPOINT=http://eth2-node:5052 # AWS bucket to publish oracle votes to -HARBOUR_GOERLI_AWS_ACCESS_KEY_ID= -HARBOUR_GOERLI_AWS_SECRET_ACCESS_KEY= -HARBOUR_GOERLI_AWS_BUCKET_NAME=oracle-votes-perm-goerli -HARBOUR_GOERLI_AWS_REGION=eu-central-1 +AWS_ACCESS_KEY_ID= +AWS_SECRET_ACCESS_KEY= +AWS_BUCKET_NAME=oracle-votes-perm-goerli +AWS_REGION=eu-central-1 ########## # Keeper # ########## # Change if running an external ETH1 node -HARBOUR_GOERLI_KEEPER_ETH1_ENDPOINT=http://eth1-node:8545 +KEEPER_ETH1_ENDPOINT=http://eth1-node:8545 # Use https://eth-converter.com/ to calculate -HARBOUR_GOERLI_KEEPER_MIN_BALANCE_WEI=100000000000000000 -HARBOUR_GOERLI_KEEPER_MAX_FEE_PER_GAS_GWEI=150 +KEEPER_MIN_BALANCE_WEI=100000000000000000 +KEEPER_MAX_FEE_PER_GAS_GWEI=150 ######## # IPFS # @@ -81,3 +81,8 @@ postgres_db=graph-node POSTGRES_DB=graph-node POSTGRES_USER=graph POSTGRES_PASSWORD=strong-password + +############ +# SENTRY # +############ +# SENTRY_DSN= diff --git a/deploy/harbour_goerli/docker-compose.yml b/deploy/harbour_goerli/docker-compose.yml index 9c16527..3891b4c 100644 --- a/deploy/harbour_goerli/docker-compose.yml +++ b/deploy/harbour_goerli/docker-compose.yml @@ -26,7 +26,7 @@ networks: services: oracle: container_name: oracle_harbour_goerli - image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.5.3 + image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.7.6 restart: always entrypoint: ["python"] command: ["oracle/oracle/main.py"] @@ -36,7 +36,7 @@ services: keeper: container_name: keeper_harbour_goerli - image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.5.3 + image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.7.6 restart: always entrypoint: ["python"] command: ["oracle/keeper/main.py"] diff --git a/deploy/harbour_mainnet/.env.example b/deploy/harbour_mainnet/.env.example index b0b7608..d2d89c9 100644 --- a/deploy/harbour_mainnet/.env.example +++ b/deploy/harbour_mainnet/.env.example @@ -19,31 +19,31 @@ IPFS_PINATA_API_KEY= IPFS_PINATA_SECRET_KEY= # Change https://api.thegraph.com to http://graph-node:8000 if running local graph node -HARBOUR_MAINNET_STAKEWISE_SUBGRAPH_URLS=https://api.thegraph.com/subgraphs/name/stakewise/stakewise-harbour-mainnet -HARBOUR_MAINNET_ETHEREUM_SUBGRAPH_URLS=https://api.thegraph.com/subgraphs/name/stakewise/ethereum-mainnet +STAKEWISE_SUBGRAPH_URLS=https://api.thegraph.com/subgraphs/name/stakewise/stakewise-harbour-mainnet +ETHEREUM_SUBGRAPH_URLS=https://api.thegraph.com/subgraphs/name/stakewise/ethereum-mainnet # Ethereum private key # NB! You must use a different private key for every network -HARBOUR_MAINNET_ORACLE_PRIVATE_KEY=0x +ORACLE_PRIVATE_KEY=0x # ETH2 (consensus) client endpoint # Change if running an external ETH2 node -HARBOUR_MAINNET_ETH2_ENDPOINT=http://eth2-node:5052 +ETH2_ENDPOINT=http://eth2-node:5052 # AWS bucket to publish oracle votes to -HARBOUR_MAINNET_AWS_ACCESS_KEY_ID= -HARBOUR_MAINNET_AWS_SECRET_ACCESS_KEY= -HARBOUR_MAINNET_AWS_BUCKET_NAME=oracle-votes-harbour-mainnet -HARBOUR_MAINNET_AWS_REGION=us-east-1 +AWS_ACCESS_KEY_ID= +AWS_SECRET_ACCESS_KEY= +AWS_BUCKET_NAME=oracle-votes-harbour-mainnet +AWS_REGION=us-east-1 ########## # Keeper # ########## # Change if running an external ETH1 node -HARBOUR_MAINNET_KEEPER_ETH1_ENDPOINT=http://eth1-node:8545 +KEEPER_ETH1_ENDPOINT=http://eth1-node:8545 # Use https://eth-converter.com/ to calculate -HARBOUR_MAINNET_KEEPER_MIN_BALANCE_WEI=100000000000000000 -HARBOUR_MAINNET_KEEPER_MAX_FEE_PER_GAS_GWEI=150 +KEEPER_MIN_BALANCE_WEI=100000000000000000 +KEEPER_MAX_FEE_PER_GAS_GWEI=150 ######## # IPFS # @@ -81,3 +81,8 @@ postgres_db=graph-node POSTGRES_DB=graph-node POSTGRES_USER=graph POSTGRES_PASSWORD=strong-password + +############ +# SENTRY # +############ +# SENTRY_DSN= diff --git a/deploy/harbour_mainnet/docker-compose.yml b/deploy/harbour_mainnet/docker-compose.yml index 8fdf8ef..0b211be 100644 --- a/deploy/harbour_mainnet/docker-compose.yml +++ b/deploy/harbour_mainnet/docker-compose.yml @@ -26,7 +26,7 @@ networks: services: oracle: container_name: oracle_harbour_mainnet - image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.5.3 + image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.7.6 restart: always entrypoint: ["python"] command: ["oracle/oracle/main.py"] @@ -36,7 +36,7 @@ services: keeper: container_name: keeper_harbour_mainnet - image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.5.3 + image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.7.6 restart: always entrypoint: ["python"] command: ["oracle/keeper/main.py"] diff --git a/deploy/mainnet/.env.example b/deploy/mainnet/.env.example index 0fe2e0c..3554d50 100644 --- a/deploy/mainnet/.env.example +++ b/deploy/mainnet/.env.example @@ -20,32 +20,32 @@ IPFS_PINATA_API_KEY= IPFS_PINATA_SECRET_KEY= # Change https://api.thegraph.com to http://graph-node:8000 if running local graph node -MAINNET_STAKEWISE_SUBGRAPH_URLS=https://api.thegraph.com/subgraphs/name/stakewise/stakewise-mainnet -MAINNET_ETHEREUM_SUBGRAPH_URLS=https://api.thegraph.com/subgraphs/name/stakewise/ethereum-mainnet -MAINNET_UNISWAP_V3_SUBGRAPH_URLS=https://api.thegraph.com/subgraphs/name/stakewise/uniswap-v3-mainnet +STAKEWISE_SUBGRAPH_URLS=https://api.thegraph.com/subgraphs/name/stakewise/stakewise-mainnet +ETHEREUM_SUBGRAPH_URLS=https://api.thegraph.com/subgraphs/name/stakewise/ethereum-mainnet +UNISWAP_V3_SUBGRAPH_URLS=https://api.thegraph.com/subgraphs/name/stakewise/uniswap-v3-mainnet # Ethereum private key # NB! You must use a different private key for every network -MAINNET_ORACLE_PRIVATE_KEY=0x +ORACLE_PRIVATE_KEY=0x # ETH2 (consensus) client endpoint # Change if running an external ETH2 node -MAINNET_ETH2_ENDPOINT=http://eth2-node:5052 +ETH2_ENDPOINT=http://eth2-node:5052 # AWS bucket to publish oracle votes to -MAINNET_AWS_ACCESS_KEY_ID= -MAINNET_AWS_SECRET_ACCESS_KEY= -MAINNET_AWS_BUCKET_NAME=oracle-votes-mainnet -MAINNET_AWS_REGION=eu-central-1 +AWS_ACCESS_KEY_ID= +AWS_SECRET_ACCESS_KEY= +AWS_BUCKET_NAME=oracle-votes-mainnet +AWS_REGION=eu-central-1 ########## # Keeper # ########## # Change if running an external ETH1 node -MAINNET_KEEPER_ETH1_ENDPOINT=http://eth1-node:8545 +KEEPER_ETH1_ENDPOINT=http://eth1-node:8545 # Use https://eth-converter.com/ to calculate -MAINNET_KEEPER_MIN_BALANCE_WEI=100000000000000000 -MAINNET_KEEPER_MAX_FEE_PER_GAS_GWEI=150 +KEEPER_MIN_BALANCE_WEI=100000000000000000 +KEEPER_MAX_FEE_PER_GAS_GWEI=150 ######## # IPFS # @@ -83,3 +83,8 @@ postgres_db=graph-node POSTGRES_DB=graph-node POSTGRES_USER=graph POSTGRES_PASSWORD=strong-password + +############ +# SENTRY # +############ +# SENTRY_DSN= diff --git a/deploy/mainnet/docker-compose.yml b/deploy/mainnet/docker-compose.yml index ec62356..cd88735 100644 --- 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.5.3 + image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.7.6 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.5.3 + image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.7.6 restart: always entrypoint: ["python"] command: ["oracle/keeper/main.py"] diff --git a/pyproject.toml b/pyproject.toml index 715dfe0..cdb1ceb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "oracle" -version = "2.5.3" +version = "2.7.6" description = "StakeWise Oracles are responsible for submitting off-chain data." authors = ["Dmitri Tsumak "] license = "AGPL-3.0-only"