Update formatting

Author: tsudmi

.dockerignore

@@ -0,0 +1,7 @@
+/.git
+/.idea
+venv
+.mypy_cache
+Dockerfile
+.dockerignore
+.gitignore

.flake8

@@ -0,0 +1,4 @@
+[flake8]
+max-line-length = 88
+extend-ignore = E203
+exclude = .git,__pycache__,proto,venv

.gitignore

@@ -1,2 +1,4 @@
 __pycache__/
+venv
+.mypy_cache
 .idea

.mypy.ini

@@ -0,0 +1,4 @@
+[mypy]
+strict = True
+allow_untyped_calls=True
+warn_return_any=False

Dockerfile

@@ -10,37 +10,34 @@ ENV PYTHONUSERBASE $PYROOT
 
 WORKDIR /build
 
-# Install pipenv
-RUN pip install 'pipenv==2018.11.26'
+# Setup virtualenv
+RUN python -m venv /opt/venv
+ENV PATH="/opt/venv/bin:$PATH"
 
-# Copy Pipfile, Pipfile.lock to the build container
-COPY Pipfile* ./
+# Copy requirements
+COPY requirements.txt ./
 
 # Install build dependencies
 RUN apt-get update && \
   apt-get install -y \
   gcc \
   && rm -rf /var/lib/apt/lists/*
+
 # Install dependencies
-RUN PIP_USER=1 PIP_IGNORE_INSTALLED=1 pipenv install --system --deploy --ignore-pipfile
+RUN pip install --require-hashes -r requirements.txt
 
 ####################
 # Production image #
 ####################
 FROM python:3.8.7-slim
 
 # Dependencies path
-ENV PYROOT /pyroot
-ENV PATH $PYROOT/bin:$PATH
-ENV PYTHONPATH $PYROOT/lib/python:$PATH
-# This is crucial for pkg_resources to work
-ENV PYTHONUSERBASE $PYROOT
+ENV PATH="/opt/venv/bin:$PATH"
 
-WORKDIR /src
+WORKDIR /app
 
 # Copy dependencies from build container
-COPY --from=builder $PYROOT/bin/ $PYROOT/bin/
-COPY --from=builder $PYROOT/lib/ $PYROOT/lib/
+COPY --from=builder /opt/venv /opt/venv
 
 # Copy source code
 COPY . ./

Pipfile

@@ -1,22 +1,22 @@
 import json
 import os
 
-from eth_typing import ChecksumAddress
+from eth_typing.evm import ChecksumAddress
 from web3 import Web3
 from web3.contract import Contract
 
-from reporting.settings import (
+from src.settings import (
     POOL_CONTRACT_ADDRESS,
     REWARD_ETH_CONTRACT_ADDRESS,
     STAKED_ETH_CONTRACT_ADDRESS,
-    BALANCE_REPORTERS_CONTRACT_ADDRESS
+    BALANCE_REPORTERS_CONTRACT_ADDRESS,
 )
 
 
 def get_staked_eth_contract(w3: Web3) -> Contract:
     """:returns instance of `StakedEthToken` contract."""
     current_dir = os.path.dirname(__file__)
-    with open(os.path.join(current_dir, 'abi/IStakedEthToken.json')) as f:
+    with open(os.path.join(current_dir, "abi/IStakedEthToken.json")) as f:
         abi = json.load(f)
 
     return w3.eth.contract(abi=abi, address=STAKED_ETH_CONTRACT_ADDRESS)
@@ -25,7 +25,7 @@ def get_staked_eth_contract(w3: Web3) -> Contract:
 def get_reward_eth_contract(w3: Web3) -> Contract:
     """:returns instance of `RewardEthToken` contract."""
     current_dir = os.path.dirname(__file__)
-    with open(os.path.join(current_dir, 'abi/IRewardEthToken.json')) as f:
+    with open(os.path.join(current_dir, "abi/IRewardEthToken.json")) as f:
         abi = json.load(f)
 
     return w3.eth.contract(abi=abi, address=REWARD_ETH_CONTRACT_ADDRESS)
@@ -34,19 +34,18 @@ def get_reward_eth_contract(w3: Web3) -> Contract:
 def get_pool_contract(w3: Web3) -> Contract:
     """:returns instance of `Pool` contract."""
     current_dir = os.path.dirname(__file__)
-    with open(os.path.join(current_dir, 'abi/IPool.json')) as f:
+    with open(os.path.join(current_dir, "abi/IPool.json")) as f:
         abi = json.load(f)
 
-    return w3.eth.contract(
-        abi=abi,
-        address=POOL_CONTRACT_ADDRESS
-    )
+    return w3.eth.contract(abi=abi, address=POOL_CONTRACT_ADDRESS)
 
 
-def get_ownable_pausable_contract(w3: Web3, contract_address: ChecksumAddress) -> Contract:
+def get_ownable_pausable_contract(
+    w3: Web3, contract_address: ChecksumAddress
+) -> Contract:
     """:returns instance of `OwnablePausable` contract."""
     current_dir = os.path.dirname(__file__)
-    with open(os.path.join(current_dir, 'abi/OwnablePausableUpgradeable.json')) as f:
+    with open(os.path.join(current_dir, "abi/OwnablePausableUpgradeable.json")) as f:
         abi = json.load(f)
 
     return w3.eth.contract(abi=abi, address=contract_address)
@@ -55,10 +54,7 @@ def get_ownable_pausable_contract(w3: Web3, contract_address: ChecksumAddress) -
 def get_balance_reporters_contract(w3: Web3) -> Contract:
     """:returns instance of `Balance Reporters` contract."""
     current_dir = os.path.dirname(__file__)
-    with open(os.path.join(current_dir, 'abi/IBalanceReporters.json')) as f:
+    with open(os.path.join(current_dir, "abi/IBalanceReporters.json")) as f:
         abi = json.load(f)
 
-    return w3.eth.contract(
-        abi=abi,
-        address=BALANCE_REPORTERS_CONTRACT_ADDRESS
-    )
+    return w3.eth.contract(abi=abi, address=BALANCE_REPORTERS_CONTRACT_ADDRESS)

Pipfile.lock

@@ -3,16 +3,10 @@
 import sys
 import time
 from loguru import logger
-from notifiers.logging import NotificationHandler
+from notifiers.logging import NotificationHandler  # type: ignore
 
-from utils import (
-    get_web3_client,
-    configure_default_account,
-    InterruptHandler,
-    check_default_account_balance
-)
-from reporting.reward_token import RewardToken
-from reporting.settings import (
+from src.reward_token import RewardToken
+from src.settings import (
     WEB3_WS_ENDPOINT,
     WEB3_HTTP_ENDPOINT,
     INJECT_POA_MIDDLEWARE,
@@ -25,22 +19,29 @@
     BALANCE_ERROR_THRESHOLD,
     APPLY_GAS_PRICE_STRATEGY,
     MAX_TX_WAIT_SECONDS,
-    LOG_LEVEL
+    LOG_LEVEL,
+)
+from src.utils import (
+    get_web3_client,
+    configure_default_account,
+    InterruptHandler,
+    check_default_account_balance,
 )
 
 # Send notification to admins on error
-handler = NotificationHandler('telegram')
+handler = NotificationHandler("telegram")
 logger.remove(0)
 logger.add(
     sink=sys.stderr,
-    format="<green>{time:YYYY-MM-DD HH:mm:ss.SSS}</green> <level>{level}</level> <level>{message}</level>",
-    level=LOG_LEVEL
+    format="<green>{time:YYYY-MM-DD HH:mm:ss.SSS}</green>"
+    " <level>{level}</level> <level>{message}</level>",
+    level=LOG_LEVEL,
 )
-logger.add(handler, level='ERROR', backtrace=False, diagnose=False)
+logger.add(handler, level="ERROR", backtrace=False, diagnose=False)
 
 
 @logger.catch
-def main():
+def main() -> None:
     # setup Web3 client
     web3_client = get_web3_client(
         http_endpoint=WEB3_HTTP_ENDPOINT,
@@ -51,7 +52,7 @@ def main():
         inject_poa=INJECT_POA_MIDDLEWARE,
         inject_local_filter=INJECT_LOCAL_FILTER_MIDDLEWARE,
         inject_stale_check=INJECT_STALE_CHECK_MIDDLEWARE,
-        stale_check_allowable_delay=STALE_CHECK_MIDDLEWARE_ALLOWABLE_DELAY
+        stale_check_allowable_delay=STALE_CHECK_MIDDLEWARE_ALLOWABLE_DELAY,
     )
 
     # setup default account
@@ -61,26 +62,30 @@ def main():
     interrupt_handler = InterruptHandler()
 
     reward_token_total_rewards = RewardToken(
-        w3=web3_client,
-        interrupt_handler=interrupt_handler
+        w3=web3_client, interrupt_handler=interrupt_handler
     )
 
     while not interrupt_handler.exit:
         # сheck reporter balance
         check_default_account_balance(
-            web3_client,
-            BALANCE_WARNING_THRESHOLD,
-            BALANCE_ERROR_THRESHOLD
+            web3_client, BALANCE_WARNING_THRESHOLD, BALANCE_ERROR_THRESHOLD
         )
 
         current_datetime = datetime.now(tz=timezone.utc)
         if reward_token_total_rewards.next_update_at > current_datetime:
-            logger.info(f'Scheduling next rewards update at {reward_token_total_rewards.next_update_at}')
-            time.sleep((reward_token_total_rewards.next_update_at - current_datetime).total_seconds())
+            logger.info(
+                f"Scheduling next rewards update at"
+                f" {reward_token_total_rewards.next_update_at}"
+            )
+            time.sleep(
+                (
+                    reward_token_total_rewards.next_update_at - current_datetime
+                ).total_seconds()
+            )
 
         # update Reward Token total rewards
         reward_token_total_rewards.process()
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()