diff --git a/.env_example b/.env_example new file mode 100644 index 0000000..933cd0d --- /dev/null +++ b/.env_example @@ -0,0 +1,12 @@ +RPC_ENDPOINT= +BLOCK_ID_START= +PROOFCHAIN_ADDRESS= +FINALIZER_PRIVATE_KEY= +FINALIZER_ADDRESS= +DB_USER= +DB_PASSWORD= +DB_HOST= +DB_DATABASE= +CHAIN_TABLE_NAME= +GAS_PRICE= +GAS_LIMIT= diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..263d30a --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,15 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates + +version: 2 +updates: + - package-ecosystem: "pip" # See documentation for possible values + directory: "/" # Location of package manifests + schedule: + interval: "weekly" + target-branch: "develop" + reviewers: + - "noslav" + diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml new file mode 100644 index 0000000..52a7d28 --- /dev/null +++ b/.github/workflows/docker-ci.yml @@ -0,0 +1,27 @@ +name: docker-ci + +on: + push: + branches: + - "main" + pull_request: + branches: + - "main" + - "develop" + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Login to GCR + uses: docker/login-action@v2 + with: + registry: gcr.io + username: _json_key + password: ${{ secrets.GCR_JSON_KEY }} + + - uses: actions/checkout@v2 + - name: Build & Publish the Docker image + run: | + docker build . --file Dockerfile --tag gcr.io/covalent-project/bsp-finalizer:latest + docker push gcr.io/covalent-project/bsp-finalizer:latest; \ No newline at end of file diff --git a/.github/workflows/hadolint.yml b/.github/workflows/hadolint.yml new file mode 100644 index 0000000..420d748 --- /dev/null +++ b/.github/workflows/hadolint.yml @@ -0,0 +1,21 @@ +name: hadolint + +on: + push: + branches: + - "main" + pull_request: + branches: + - "main" + - "develop" + +jobs: + hadolint: + name: dockerfile-lint + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Lint dockerfile + uses: brpaz/hadolint-action@master + with: + dockerfile: "Dockerfile" diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml new file mode 100644 index 0000000..62716ef --- /dev/null +++ b/.github/workflows/pylint.yml @@ -0,0 +1,42 @@ +name: pylint + +on: + push: + branches: + - "main" + pull_request: + branches: + - "main" + - "develop" + +jobs: + linter: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: '3.10' + + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install pylint + pip install pipenv + pipenv --python '3.10' install --dev + + - name: Analysing the code with pylint + run: | + pipenv run pylint --rcfile=.pylintrc src/*.py + + - name: Analysing the code with pycodestyle + run: | + pip install pycodestyle + pipenv run pycodestyle src/*.py + + # - name: Analysing the code with black + # run: | + # pipenv install --skip-lock "black==22.3.0" + # pipenv run black --check core/views.py core/views_platform.py + # # $(git ls-files '*.py') \ No newline at end of file diff --git a/.github/workflows/tag-release.yaml b/.github/workflows/tag-release.yaml new file mode 100644 index 0000000..77c513e --- /dev/null +++ b/.github/workflows/tag-release.yaml @@ -0,0 +1,22 @@ +name: tag-release + +on: + push: + tags: + - "v*" + +jobs: + tagged-release: + name: Tagged Release + runs-on: "ubuntu-latest" + + steps: + - uses: "marvinpinto/action-automatic-releases@latest" + with: + repo_token: "${{ secrets.GITHUB_TOKEN }}" + draft: false + prerelease: false + files: | + *.zip + *.tar.gz + diff --git a/.pylintrc b/.pylintrc new file mode 100644 index 0000000..166be96 --- /dev/null +++ b/.pylintrc @@ -0,0 +1,634 @@ +[MAIN] + +# Analyse import fallback blocks. This can be used to support both Python 2 and +# 3 compatible code, which means that the block might have code that exists +# only in one or another interpreter, leading to false positives when analysed. +analyse-fallback-blocks=no + +# Load and enable all available extensions. Use --list-extensions to see a list +# all available extensions. +#enable-all-extensions= + +# In error mode, messages with a category besides ERROR or FATAL are +# suppressed, and no reports are done by default. Error mode is compatible with +# disabling specific errors. +#errors-only= + +# Always return a 0 (non-error) status code, even if lint errors are found. +# This is primarily useful in continuous integration scripts. +#exit-zero= + +# A comma-separated list of package or module names from where C extensions may +# be loaded. Extensions are loading into the active Python interpreter and may +# run arbitrary code. +extension-pkg-allow-list= + +# A comma-separated list of package or module names from where C extensions may +# be loaded. Extensions are loading into the active Python interpreter and may +# run arbitrary code. (This is an alternative name to extension-pkg-allow-list +# for backward compatibility.) +extension-pkg-whitelist= + +# Return non-zero exit code if any of these messages/categories are detected, +# even if score is above --fail-under value. Syntax same as enable. Messages +# specified are enabled, while categories only check already-enabled messages. +fail-on= + +# Specify a score threshold under which the program will exit with error. +fail-under=10 + +# Interpret the stdin as a python script, whose filename needs to be passed as +# the module_or_package argument. +#from-stdin= + +# Files or directories to be skipped. They should be base names, not paths. +ignore=CVS + +# Add files or directories matching the regular expressions patterns to the +# ignore-list. The regex matches against paths and can be in Posix or Windows +# format. Because '\' represents the directory delimiter on Windows systems, it +# can't be used as an escape character. +ignore-paths= + +# Files or directories matching the regular expression patterns are skipped. +# The regex matches against base names, not paths. The default value ignores +# Emacs file locks +ignore-patterns=^\.# + +# List of module names for which member attributes should not be checked +# (useful for modules/projects where namespaces are manipulated during runtime +# and thus existing member attributes cannot be deduced by static analysis). It +# supports qualified module names, as well as Unix pattern matching. +ignored-modules= + +# Python code to execute, usually for sys.path manipulation such as +# pygtk.require(). +#init-hook= + +# Use multiple processes to speed up Pylint. Specifying 0 will auto-detect the +# number of processors available to use, and will cap the count on Windows to +# avoid hangs. +jobs=1 + +# Control the amount of potential inferred values when inferring a single +# object. This can help the performance when dealing with large functions or +# complex, nested conditions. +limit-inference-results=100 + +# List of plugins (as comma separated values of python module names) to load, +# usually to register additional checkers. +load-plugins= + +# Pickle collected data for later comparisons. +persistent=yes + +# Minimum Python version to use for version dependent checks. Will default to +# the version used to run pylint. +py-version=3.10 + +# Discover python modules and packages in the file system subtree. +recursive=no + +# When enabled, pylint would attempt to guess common misconfiguration and emit +# user-friendly hints instead of false-positive error messages. +suggestion-mode=yes + +# Allow loading of arbitrary C extensions. Extensions are imported into the +# active Python interpreter and may run arbitrary code. +unsafe-load-any-extension=no + +# In verbose mode, extra non-checker-related info will be displayed. +#verbose= + + +[REPORTS] + +# Python expression which should return a score less than or equal to 10. You +# have access to the variables 'fatal', 'error', 'warning', 'refactor', +# 'convention', and 'info' which contain the number of messages in each +# category, as well as 'statement' which is the total number of statements +# analyzed. This score is used by the global evaluation report (RP0004). +evaluation=max(0, 0 if fatal else 10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)) + +# Template used to display messages. This is a python new-style format string +# used to format the message information. See doc for all details. +msg-template= + +# Set the output format. Available formats are text, parseable, colorized, json +# and msvs (visual studio). You can also give a reporter class, e.g. +# mypackage.mymodule.MyReporterClass. +#output-format= + +# Tells whether to display a full report or only the messages. +reports=no + +# Activate the evaluation score. +score=yes + + +[MESSAGES CONTROL] + +# Only show warnings with the listed confidence levels. Leave empty to show +# all. Valid levels: HIGH, CONTROL_FLOW, INFERENCE, INFERENCE_FAILURE, +# UNDEFINED. +confidence=HIGH, + CONTROL_FLOW, + INFERENCE, + INFERENCE_FAILURE, + UNDEFINED + +# Disable the message, report, category or checker with the given id(s). You +# can either give multiple identifiers separated by comma (,) or put this +# option multiple times (only on the command line, not in the configuration +# file where it should appear only once). You can also use "--disable=all" to +# disable everything first and then re-enable specific checks. For example, if +# you want to run only the similarities checker, you can use "--disable=all +# --enable=similarities". If you want to run only the classes checker, but have +# no Warning level messages displayed, use "--disable=all --enable=classes +# --disable=W". +disable=raw-checker-failed, + bad-inline-option, + locally-disabled, + file-ignored, + suppressed-message, + useless-suppression, + deprecated-pragma, + use-symbolic-message-instead, + missing-module-docstring, + missing-function-docstring, + unused-argument, line-too-long, + missing-class-docstring, + use-list-literal, + invalid-name, + consider-using-f-string, + broad-except, + no-member, + import-error, + unidiomatic-typecheck, + too-many-arguments, + too-few-public-methods, + too-many-instance-attributes, + logging-fstring-interpolation, + inconsistent-return-statements + +# Enable the message, report, category or checker with the given id(s). You can +# either give multiple identifier separated by comma (,) or put this option +# multiple time (only on the command line, not in the configuration file where +# it should appear only once). See also the "--disable" option for examples. +enable=c-extension-no-member + + +[LOGGING] + +# The type of string formatting that logging methods do. `old` means using % +# formatting, `new` is for `{}` formatting. +logging-format-style=old + +# Logging modules to check that the string format arguments are in logging +# function parameter format. +logging-modules=logging + + +[SPELLING] + +# Limits count of emitted suggestions for spelling mistakes. +max-spelling-suggestions=4 + +# Spelling dictionary name. Available dictionaries: none. To make it work, +# install the 'python-enchant' package. +spelling-dict= + +# List of comma separated words that should be considered directives if they +# appear at the beginning of a comment and should not be checked. +spelling-ignore-comment-directives=fmt: on,fmt: off,noqa:,noqa,nosec,isort:skip,mypy: + +# List of comma separated words that should not be checked. +spelling-ignore-words= + +# A path to a file that contains the private dictionary; one word per line. +spelling-private-dict-file= + +# Tells whether to store unknown words to the private dictionary (see the +# --spelling-private-dict-file option) instead of raising a message. +spelling-store-unknown-words=no + + +[MISCELLANEOUS] + +# List of note tags to take in consideration, separated by a comma. +notes=FIXME, + XXX, + TODO + +# Regular expression of note tags to take in consideration. +notes-rgx= + + +[TYPECHECK] + +# List of decorators that produce context managers, such as +# contextlib.contextmanager. Add to this list to register other decorators that +# produce valid context managers. +contextmanager-decorators=contextlib.contextmanager + +# List of members which are set dynamically and missed by pylint inference +# system, and so shouldn't trigger E1101 when accessed. Python regular +# expressions are accepted. +generated-members= + +# Tells whether to warn about missing members when the owner of the attribute +# is inferred to be None. +ignore-none=yes + +# This flag controls whether pylint should warn about no-member and similar +# checks whenever an opaque object is returned when inferring. The inference +# can return multiple potential results while evaluating a Python object, but +# some branches might not be evaluated, which results in partial inference. In +# that case, it might be useful to still emit no-member and other checks for +# the rest of the inferred objects. +ignore-on-opaque-inference=yes + +# List of symbolic message names to ignore for Mixin members. +ignored-checks-for-mixins=no-member, + not-async-context-manager, + not-context-manager, + attribute-defined-outside-init + +# List of class names for which member attributes should not be checked (useful +# for classes with dynamically set attributes). This supports the use of +# qualified names. +ignored-classes=optparse.Values,thread._local,_thread._local,argparse.Namespace + +# Show a hint with possible names when a member name was not found. The aspect +# of finding the hint is based on edit distance. +missing-member-hint=yes + +# The minimum edit distance a name should have in order to be considered a +# similar match for a missing member name. +missing-member-hint-distance=1 + +# The total number of similar names that should be taken in consideration when +# showing a hint for a missing member. +missing-member-max-choices=1 + +# Regex pattern to define which classes are considered mixins. +mixin-class-rgx=.*[Mm]ixin + +# List of decorators that change the signature of a decorated function. +signature-mutators= + + +[CLASSES] + +# Warn about protected attribute access inside special methods +check-protected-access-in-special-methods=no + +# List of method names used to declare (i.e. assign) instance attributes. +defining-attr-methods=__init__, + __new__, + setUp, + __post_init__ + +# List of member names, which should be excluded from the protected access +# warning. +exclude-protected=_asdict, + _fields, + _replace, + _source, + _make + +# List of valid names for the first argument in a class method. +valid-classmethod-first-arg=cls + +# List of valid names for the first argument in a metaclass class method. +valid-metaclass-classmethod-first-arg=cls + + +[VARIABLES] + +# List of additional names supposed to be defined in builtins. Remember that +# you should avoid defining new builtins when possible. +additional-builtins= + +# Tells whether unused global variables should be treated as a violation. +allow-global-unused-variables=yes + +# List of names allowed to shadow builtins +allowed-redefined-builtins= + +# List of strings which can identify a callback function by name. A callback +# name must start or end with one of those strings. +callbacks=cb_, + _cb + +# A regular expression matching the name of dummy variables (i.e. expected to +# not be used). +dummy-variables-rgx=_+$|(_[a-zA-Z0-9_]*[a-zA-Z0-9]+?$)|dummy|^ignored_|^unused_ + +# Argument names that match this expression will be ignored. +ignored-argument-names=_.*|^ignored_|^unused_ + +# Tells whether we should check for unused import in __init__ files. +init-import=no + +# List of qualified module names which can have objects that can redefine +# builtins. +redefining-builtins-modules=six.moves,past.builtins,future.builtins,builtins,io + + +[FORMAT] + +# Expected format of line ending, e.g. empty (any line ending), LF or CRLF. +expected-line-ending-format= + +# Regexp for a line that is allowed to be longer than the limit. +ignore-long-lines=^\s*(# )??$ + +# Number of spaces of indent required inside a hanging or continued line. +indent-after-paren=4 + +# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1 +# tab). +indent-string=' ' + +# Maximum number of characters on a single line. +max-line-length=100 + +# Maximum number of lines in a module. +max-module-lines=1000 + +# Allow the body of a class to be on the same line as the declaration if body +# contains single statement. +single-line-class-stmt=no + +# Allow the body of an if to be on the same line as the test if there is no +# else. +single-line-if-stmt=no + + +[IMPORTS] + +# List of modules that can be imported at any level, not just the top level +# one. +allow-any-import-level= + +# Allow wildcard imports from modules that define __all__. +allow-wildcard-with-all=no + +# Deprecated modules which should not be used, separated by a comma. +deprecated-modules= + +# Output a graph (.gv or any supported image format) of external dependencies +# to the given file (report RP0402 must not be disabled). +ext-import-graph= + +# Output a graph (.gv or any supported image format) of all (i.e. internal and +# external) dependencies to the given file (report RP0402 must not be +# disabled). +import-graph= + +# Output a graph (.gv or any supported image format) of internal dependencies +# to the given file (report RP0402 must not be disabled). +int-import-graph= + +# Force import order to recognize a module as part of the standard +# compatibility libraries. +known-standard-library= + +# Force import order to recognize a module as part of a third party library. +known-third-party=enchant + +# Couples of modules and preferred modules, separated by a comma. +preferred-modules= + + +[METHOD_ARGS] + +# List of qualified names (i.e., library.method) which require a timeout +# parameter e.g. 'requests.api.get,requests.api.post' +#timeout-methods=requests.api.delete,requests.api.get,requests.api.head,requests.api.options,requests.api.patch,requests.api.post,requests.api.put,requests.api.request + + +[EXCEPTIONS] + +# Exceptions that will emit a warning when caught. +overgeneral-exceptions=BaseException, + Exception + + +[REFACTORING] + +# Maximum number of nested blocks for function / method body +max-nested-blocks=5 + +# Complete name of functions that never returns. When checking for +# inconsistent-return-statements if a never returning function is called then +# it will be considered as an explicit return statement and no message will be +# printed. +never-returning-functions=sys.exit,argparse.parse_error + + +[SIMILARITIES] + +# Comments are removed from the similarity computation +ignore-comments=yes + +# Docstrings are removed from the similarity computation +ignore-docstrings=yes + +# Imports are removed from the similarity computation +ignore-imports=yes + +# Signatures are removed from the similarity computation +ignore-signatures=yes + +# Minimum lines number of a similarity. +min-similarity-lines=4 + + +[DESIGN] + +# List of regular expressions of class ancestor names to ignore when counting +# public methods (see R0903) +exclude-too-few-public-methods= + +# List of qualified class names to ignore when counting class parents (see +# R0901) +ignored-parents= + +# Maximum number of arguments for function / method. +max-args=5 + +# Maximum number of attributes for a class (see R0902). +max-attributes=7 + +# Maximum number of boolean expressions in an if statement (see R0916). +max-bool-expr=5 + +# Maximum number of branch for function / method body. +max-branches=12 + +# Maximum number of locals for function / method body. +max-locals=15 + +# Maximum number of parents for a class (see R0901). +max-parents=7 + +# Maximum number of public methods for a class (see R0904). +max-public-methods=20 + +# Maximum number of return / yield for function / method body. +max-returns=6 + +# Maximum number of statements in function / method body. +max-statements=50 + +# Minimum number of public methods for a class (see R0903). +min-public-methods=2 + + +[STRING] + +# This flag controls whether inconsistent-quotes generates a warning when the +# character used as a quote delimiter is used inconsistently within a module. +check-quote-consistency=no + +# This flag controls whether the implicit-str-concat should generate a warning +# on implicit string concatenation in sequences defined over several lines. +check-str-concat-over-line-jumps=no + + +[BASIC] + +# Naming style matching correct argument names. +argument-naming-style=snake_case + +# Regular expression matching correct argument names. Overrides argument- +# naming-style. If left empty, argument names will be checked with the set +# naming style. +#argument-rgx= + +# Naming style matching correct attribute names. +attr-naming-style=snake_case + +# Regular expression matching correct attribute names. Overrides attr-naming- +# style. If left empty, attribute names will be checked with the set naming +# style. +#attr-rgx= + +# Bad variable names which should always be refused, separated by a comma. +bad-names=foo, + bar, + baz, + toto, + tutu, + tata + +# Bad variable names regexes, separated by a comma. If names match any regex, +# they will always be refused +bad-names-rgxs= + +# Naming style matching correct class attribute names. +class-attribute-naming-style=any + +# Regular expression matching correct class attribute names. Overrides class- +# attribute-naming-style. If left empty, class attribute names will be checked +# with the set naming style. +#class-attribute-rgx= + +# Naming style matching correct class constant names. +class-const-naming-style=UPPER_CASE + +# Regular expression matching correct class constant names. Overrides class- +# const-naming-style. If left empty, class constant names will be checked with +# the set naming style. +#class-const-rgx= + +# Naming style matching correct class names. +class-naming-style=PascalCase + +# Regular expression matching correct class names. Overrides class-naming- +# style. If left empty, class names will be checked with the set naming style. +#class-rgx= + +# Naming style matching correct constant names. +const-naming-style=UPPER_CASE + +# Regular expression matching correct constant names. Overrides const-naming- +# style. If left empty, constant names will be checked with the set naming +# style. +#const-rgx= + +# Minimum line length for functions/classes that require docstrings, shorter +# ones are exempt. +docstring-min-length=-1 + +# Naming style matching correct function names. +function-naming-style=snake_case + +# Regular expression matching correct function names. Overrides function- +# naming-style. If left empty, function names will be checked with the set +# naming style. +#function-rgx= + +# Good variable names which should always be accepted, separated by a comma. +good-names=i, + j, + k, + ex, + Run, + _ + +# Good variable names regexes, separated by a comma. If names match any regex, +# they will always be accepted +good-names-rgxs= + +# Include a hint for the correct naming format with invalid-name. +include-naming-hint=no + +# Naming style matching correct inline iteration names. +inlinevar-naming-style=any + +# Regular expression matching correct inline iteration names. Overrides +# inlinevar-naming-style. If left empty, inline iteration names will be checked +# with the set naming style. +#inlinevar-rgx= + +# Naming style matching correct method names. +method-naming-style=snake_case + +# Regular expression matching correct method names. Overrides method-naming- +# style. If left empty, method names will be checked with the set naming style. +#method-rgx= + +# Naming style matching correct module names. +module-naming-style=snake_case + +# Regular expression matching correct module names. Overrides module-naming- +# style. If left empty, module names will be checked with the set naming style. +#module-rgx= + +# Colon-delimited sets of names that determine each other's naming style when +# the name regexes allow several styles. +name-group= + +# Regular expression which should only match function or class names that do +# not require a docstring. +no-docstring-rgx=^_ + +# List of decorators that produce properties, such as abc.abstractproperty. Add +# to this list to register other decorators that produce valid properties. +# These decorators are taken in consideration only for invalid-name. +property-classes=abc.abstractproperty + +# Regular expression matching correct type variable names. If left empty, type +# variable names will be checked with the set naming style. +#typevar-rgx= + +# Naming style matching correct variable names. +variable-naming-style=snake_case + +# Regular expression matching correct variable names. Overrides variable- +# naming-style. If left empty, variable names will be checked with the set +# naming style. +#variable-rgx= \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..bdb8b1f --- /dev/null +++ b/Dockerfile @@ -0,0 +1,19 @@ +# set base image (host OS) +FROM python:3.10 + +# set the working directory in the container +WORKDIR /app + +# copy the dependencies file to the working directory +COPY requirements.txt . + +# install dependencies +RUN pip install --no-cache-dir -r requirements.txt && mkdir -p src abi sql logs rewards +# copy the content of the local src directory to the working directory +COPY src/ /app/src +COPY abi/ /app/abi +COPY sql/ /app/sql + +# command to run on container start +CMD [ "python", "./src/main.py"] + diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..1cb994e --- /dev/null +++ b/setup.cfg @@ -0,0 +1,6 @@ +[pycodestyle] +; count = False +ignore = E501 +; ignore = W605,W503 +max-line-length = 120 +; statistics = True \ No newline at end of file diff --git a/src/contract.py b/src/contract.py index 9daed3e..6f61221 100644 --- a/src/contract.py +++ b/src/contract.py @@ -2,19 +2,19 @@ import traceback import random import time +import os +import pathlib +from web3 import Web3 from web3.exceptions import TimeExhausted from web3.middleware import geth_poa_middleware import web3.auto import eth_hash.auto -import os -from web3 import Web3 -import pathlib - import logformat MODULE_ROOT_PATH = pathlib.Path(__file__).parent.parent.resolve() + class LoggableReceipt(): def __init__(self, fields, fail_reason=None): self.blockNumber = fields['blockNumber'] @@ -33,8 +33,9 @@ def __str__(self): f" spentGas={self.gasUsed}" ) + class LoggableBounce(): - def __init__(self, tx_hash, err, details={}): + def __init__(self, tx_hash, err, details=None): self.txHash = tx_hash.hex() self.err = err self.details = details @@ -118,12 +119,11 @@ def _attempt_send_finalize(self, chainId, blockHeight, timeout=None): transaction = self.contract.functions.finalizeAndRewardSpecimenSession( chainId, blockHeight).buildTransaction({ - 'gas': self.gas, - 'gasPrice': self.gasPrice, - 'from': self.finalizer_address, - 'nonce': self.nonce - }) - + 'gas': self.gas, + 'gasPrice': self.gasPrice, + 'from': self.finalizer_address, + 'nonce': self.nonce + }) signed_txn = self.w3.eth.account.signTransaction(transaction, private_key=self.finalizer_prvkey) balance_before_send_wei = self.w3.eth.get_balance(self.finalizer_address) @@ -139,7 +139,6 @@ def _attempt_send_finalize(self, chainId, blockHeight, timeout=None): ) tx_hash = None - err = None try: tx_hash = self.w3.eth.sendRawTransaction(signed_txn.rawTransaction) return self.report_transaction_receipt(tx_hash, timeout) @@ -183,7 +182,7 @@ def report_transaction_receipt(self, tx_hash, timeout=None, **kwargs): return (True, None) - except TimeExhausted as ex: + except TimeExhausted: self.increase_gas_price() # retry immediately return (False, 0) @@ -216,14 +215,14 @@ def estimate_gas_price(self): gases = [] print(pending_transactions) for tx in pending_transactions["result"[:10]]: - gas_prices.append(int((tx["gasPrice"]),16)) - gases.append(int((tx["gas"]),16)) + gas_prices.append(int((tx["gasPrice"]), 16)) + gases.append(int((tx["gas"]), 16)) print("Average:") - print("-"*80) + print("-" * 80) print("gasPrice: ", statistics.mean(gas_prices)) print(" ") print("Median:") - print("-"*80) + print("-" * 80) print("gasPrice: ", statistics.median(gas_prices)) def increase_gas_price(self): diff --git a/src/dbmanager.py b/src/dbmanager.py index 1f4b992..64ff1d3 100644 --- a/src/dbmanager.py +++ b/src/dbmanager.py @@ -2,9 +2,8 @@ import threading import time import traceback -import logformat - import psycopg2 +import logformat from finalizationrequest import FinalizationRequest @@ -74,8 +73,13 @@ def __main_loop(self): with conn.cursor() as cur: # we are catching up. So we only need to grab what we need to attempt for finalizing cur.execute( +<<<<<<< HEAD r'SELECT * FROM chain_moonbeam_moonbase_alpha."_proof_chain_events" WHERE observer_chain_session_start_block_id > %s AND observer_chain_finalization_tx_hash IS NULL AND origin_chain_block_height > 16650720;', (self.last_block_id,)) +======= + r'SELECT * FROM reports.proof_chain_moonbeam WHERE observer_chain_session_start_block_id > %s AND observer_chain_finalization_tx_hash IS NULL;', + (self.last_block_id,)) +>>>>>>> 4e125f7154fb2a6187774722bd59cb27337fb427 outputs = cur.fetchall() @@ -91,8 +95,13 @@ def __main_loop(self): self.logger.info(f"Incremental scan block_id={self.last_block_id}") # we need everything after last max block number cur.execute( +<<<<<<< HEAD r'SELECT * FROM chain_moonbeam_moonbase_alpha."_proof_chain_events" WHERE observer_chain_session_start_block_id > %s AND origin_chain_block_height > 16650720;', (self.last_block_id,)) +======= + r'SELECT * FROM reports.proof_chain_moonbeam WHERE observer_chain_session_start_block_id > %s;', + (self.last_block_id,)) +>>>>>>> 4e125f7154fb2a6187774722bd59cb27337fb427 outputs = cur.fetchall() if self._process_outputs(outputs) == 0: diff --git a/src/finalizationrequest.py b/src/finalizationrequest.py index 525ab9b..c404844 100644 --- a/src/finalizationrequest.py +++ b/src/finalizationrequest.py @@ -2,8 +2,8 @@ class FinalizationRequest: - requests_to_be_finalized = dict() - requests_to_be_confirmed = dict() + requests_to_be_finalized = {} + requests_to_be_confirmed = {} @staticmethod def get_requests_to_be_finalized() -> []: @@ -27,7 +27,7 @@ def __init__(self, chainId, blockHeight, deadline, block_id): self.deadline = deadline self.chainId = chainId self.blockHeight = blockHeight - self.session_started_block_id = block_id + self.block_id = block_id self.finalized_time = None def update_block_id(self, bid): @@ -47,7 +47,7 @@ def finalize_request(self): def finalize_later(self): if self.chainId not in FinalizationRequest.requests_to_be_finalized: - FinalizationRequest.requests_to_be_finalized[self.chainId] = dict() + FinalizationRequest.requests_to_be_finalized[self.chainId] = {} reqs_for_chain = FinalizationRequest.requests_to_be_finalized[self.chainId] if self.blockHeight in reqs_for_chain: return False @@ -56,7 +56,7 @@ def finalize_later(self): def confirm_later(self): if self.chainId not in FinalizationRequest.requests_to_be_confirmed: - FinalizationRequest.requests_to_be_confirmed[self.chainId] = dict() + FinalizationRequest.requests_to_be_confirmed[self.chainId] = {} reqs_for_chain = FinalizationRequest.requests_to_be_confirmed[self.chainId] if self.blockHeight in reqs_for_chain: return False @@ -64,11 +64,11 @@ def confirm_later(self): return True def waiting_for_confirm(self): - if self.chainId not in FinalizationRequest.requests_to_be_confirmed.keys(): + if self.chainId not in FinalizationRequest.requests_to_be_confirmed: return False return self.blockHeight in FinalizationRequest.requests_to_be_confirmed[self.chainId] def waiting_for_finalize(self): - if self.chainId not in FinalizationRequest.requests_to_be_finalized.keys(): + if self.chainId not in FinalizationRequest.requests_to_be_finalized: return False return self.blockHeight in FinalizationRequest.requests_to_be_finalized[self.chainId] diff --git a/src/finalizer.py b/src/finalizer.py index 3b0424e..29853cb 100644 --- a/src/finalizer.py +++ b/src/finalizer.py @@ -21,8 +21,7 @@ def wait_for_next_observer_chain_block(self): if bn > self.observer_chain_block_height: self.observer_chain_block_height = bn return - else: - time.sleep(4.0) + time.sleep(4.0) except Exception as ex: self.logger.critical(''.join(traceback.format_exception(ex))) time.sleep(4.0) @@ -40,7 +39,6 @@ def __main_loop(self): else: open_session_count += 1 - if len(ready_to_finalize) == 0: self.logger.debug(f"Nothing ready to finalize height={self.observer_chain_block_height} openSessions={open_session_count}") return @@ -55,7 +53,7 @@ def run(self) -> None: while True: try: self.__main_loop() - except: + except RecursionError: # this should never happen pass @@ -83,4 +81,3 @@ def _attempt_to_finalize(self, fr): fr.confirm_later() except Exception as ex: self.logger.critical(''.join(traceback.format_exception(ex))) - diff --git a/src/logformat.py b/src/logformat.py index 86dc147..b5934d8 100644 --- a/src/logformat.py +++ b/src/logformat.py @@ -1,9 +1,8 @@ import logging -import os import sys -import pathlib import functools + class LogFormat(logging.Formatter): ANSI_RESET = "\x1b[0m" ANSI_BOLD = "\x1b[1m" @@ -24,10 +23,12 @@ def format(self, record): formatter = self.FORMATTERS.get(record.levelno) return formatter.format(record) + @functools.cache def get_logger(class_name): return _build_logger(class_name) + def _build_logger(class_name): logger = logging.getLogger(class_name) diff --git a/src/main.py b/src/main.py index 18b3696..879d9af 100644 --- a/src/main.py +++ b/src/main.py @@ -1,12 +1,12 @@ import logging import time import sys +import os +from dotenv import load_dotenv from contract import ProofChainContract from dbmanager import DBManager from finalizer import Finalizer -import os -from dotenv import load_dotenv def is_any_thread_alive(threads):