From 3235bdfe998bf464542ffa939de68f05df7dd0e9 Mon Sep 17 00:00:00 2001 From: F4ever <1590415904a@gmail.com> Date: Tue, 25 Apr 2023 10:11:38 +0200 Subject: [PATCH 1/6] fix circular import --- src/{web3py/extensions => providers}/consistency.py | 0 src/providers/http_provider.py | 2 +- src/web3py/extensions/__init__.py | 1 - src/web3py/extensions/fallback.py | 2 +- 4 files changed, 2 insertions(+), 3 deletions(-) rename src/{web3py/extensions => providers}/consistency.py (100%) diff --git a/src/web3py/extensions/consistency.py b/src/providers/consistency.py similarity index 100% rename from src/web3py/extensions/consistency.py rename to src/providers/consistency.py diff --git a/src/providers/http_provider.py b/src/providers/http_provider.py index dbaa56630..42b57cca6 100644 --- a/src/providers/http_provider.py +++ b/src/providers/http_provider.py @@ -10,7 +10,7 @@ from requests.exceptions import ConnectionError as RequestsConnectionError from urllib3 import Retry -from src.web3py.extensions.consistency import ProviderConsistencyModule +from src.providers.consistency import ProviderConsistencyModule logger = logging.getLogger(__name__) diff --git a/src/web3py/extensions/__init__.py b/src/web3py/extensions/__init__.py index 2edd2242c..30382e166 100644 --- a/src/web3py/extensions/__init__.py +++ b/src/web3py/extensions/__init__.py @@ -4,4 +4,3 @@ from src.web3py.extensions.contracts import LidoContracts from src.web3py.extensions.lido_validators import LidoValidatorsProvider from src.web3py.extensions.fallback import FallbackProviderModule -from src.web3py.extensions.consistency import ProviderConsistencyModule diff --git a/src/web3py/extensions/fallback.py b/src/web3py/extensions/fallback.py index 3a8959d29..275762394 100644 --- a/src/web3py/extensions/fallback.py +++ b/src/web3py/extensions/fallback.py @@ -1,7 +1,7 @@ from typing import Any from web3_multi_provider import FallbackProvider -from src.web3py.extensions.consistency import ProviderConsistencyModule +from src.providers.consistency import ProviderConsistencyModule from web3 import Web3 From aeb36cd67aa99f7379f9ded1c8bcd9d432c91863 Mon Sep 17 00:00:00 2001 From: F4ever <1590415904a@gmail.com> Date: Fri, 28 Apr 2023 12:45:49 +0200 Subject: [PATCH 2/6] Add execution requests timeout --- README.md | 1 + src/main.py | 5 ++++- src/variables.py | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5d4e3d1a9..ca7a641e2 100644 --- a/README.md +++ b/README.md @@ -168,6 +168,7 @@ In manual mode all sleeps are disabled and `ALLOW_REPORTING_IN_BUNKER_MODE` is T | `TX_GAS_ADDITION` | Used to modify gas parameter that used in transaction. (gas = estimated_gas + TX_GAS_ADDITION) | False | `100000` | | `CYCLE_SLEEP_IN_SECONDS` | The time between cycles of the oracle's activity | False | `12` | | `SUBMIT_DATA_DELAY_IN_SLOTS` | The difference in slots between submit data transactions from Oracles. It is used to prevent simultaneous sending of transactions and, as a result, transactions revert. | False | `6` | +| `HTTP_REQUEST_TIMEOUT_EXECUTION` | Timeout for HTTP execution layer requests | False | `120` | | `HTTP_REQUEST_TIMEOUT_CONSENSUS` | Timeout for HTTP consensus layer requests | False | `300` | | `HTTP_REQUEST_RETRY_COUNT_CONSENSUS` | Total number of retries to fetch data from endpoint for consensus layer requests | False | `5` | | `HTTP_REQUEST_SLEEP_BEFORE_RETRY_IN_SECONDS_CONSENSUS` | The delay http provider sleeps if API is stuck for consensus layer | False | `12` | diff --git a/src/main.py b/src/main.py index a96b2e913..01be0bcbb 100644 --- a/src/main.py +++ b/src/main.py @@ -57,7 +57,10 @@ def main(module_name: OracleModule): start_http_server(variables.PROMETHEUS_PORT) logger.info({'msg': 'Initialize multi web3 provider.'}) - web3 = Web3(FallbackProviderModule(variables.EXECUTION_CLIENT_URI)) + web3 = Web3(FallbackProviderModule( + variables.EXECUTION_CLIENT_URI, + request_kwargs={'timeout': variables.HTTP_REQUEST_TIMEOUT_EXECUTION} + )) logger.info({'msg': 'Modify web3 with custom contract function call.'}) tweak_w3_contracts(web3) diff --git a/src/variables.py b/src/variables.py index 3c7affd9e..1102aa679 100644 --- a/src/variables.py +++ b/src/variables.py @@ -51,6 +51,8 @@ CYCLE_SLEEP_IN_SECONDS = 0 # HTTP variables +HTTP_REQUEST_TIMEOUT_EXECUTION = int(os.getenv('HTTP_REQUEST_TIMEOUT_EXECUTION', 2 * 60)) + HTTP_REQUEST_TIMEOUT_CONSENSUS = int(os.getenv('HTTP_REQUEST_TIMEOUT_CONSENSUS', 5 * 60)) HTTP_REQUEST_RETRY_COUNT_CONSENSUS = int(os.getenv('HTTP_REQUEST_RETRY_COUNT_CONSENSUS', 5)) HTTP_REQUEST_SLEEP_BEFORE_RETRY_IN_SECONDS_CONSENSUS = int( From 4e10a9a4349b833b14ebe8f9dcfcc97a4d3a2e19 Mon Sep 17 00:00:00 2001 From: F4ever <1590415904a@gmail.com> Date: Fri, 28 Apr 2023 13:10:58 +0200 Subject: [PATCH 3/6] check web3 timeout fix --- src/modules/checks/suites/conftest.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/modules/checks/suites/conftest.py b/src/modules/checks/suites/conftest.py index 06468749a..9e31852f3 100644 --- a/src/modules/checks/suites/conftest.py +++ b/src/modules/checks/suites/conftest.py @@ -1,6 +1,5 @@ import pytest from _pytest._io import TerminalWriter -from web3_multi_provider import MultiProvider from xdist import is_xdist_controller # type: ignore[import] from xdist.dsession import TerminalDistReporter # type: ignore[import] @@ -10,8 +9,12 @@ from src.utils.slot import get_reference_blockstamp from src.web3py.contract_tweak import tweak_w3_contracts from src.web3py.extensions import ( - ConsensusClientModule, KeysAPIClientModule, LidoValidatorsProvider, TransactionUtils, + ConsensusClientModule, + KeysAPIClientModule, + LidoValidatorsProvider, + TransactionUtils, LidoContracts, + FallbackProviderModule, ) from src.web3py.typings import Web3 @@ -21,7 +24,10 @@ @pytest.fixture() def web3(): - web3 = Web3(MultiProvider(variables.EXECUTION_CLIENT_URI)) + web3 = Web3(FallbackProviderModule( + variables.EXECUTION_CLIENT_URI, + request_kwargs={'timeout': variables.HTTP_REQUEST_TIMEOUT_EXECUTION} + )) tweak_w3_contracts(web3) cc = ConsensusClientModule(variables.CONSENSUS_CLIENT_URI, web3) kac = KeysAPIClientModule(variables.KEYS_API_URI, web3) From 0e05c569a0cb97d9f9ef3f11a902fb34fb8f58a6 Mon Sep 17 00:00:00 2001 From: F4ever <1590415904a@gmail.com> Date: Mon, 1 May 2023 17:44:06 +0200 Subject: [PATCH 4/6] not fast lane skip report - fast lane send report --- ..._data_main_sleep_until_data_submitted.json | 252 +++++++++++++++++- .../test_process_report_submit_report.json | 252 +++++++++++++++++- src/modules/submodules/consensus.py | 28 +- src/providers/http_provider.py | 5 +- .../submodules/consensus/test_reports.py | 9 +- 5 files changed, 522 insertions(+), 24 deletions(-) diff --git a/fixtures/tests/modules/submodules/consensus/test_reports.py/test_process_report_data_main_sleep_until_data_submitted.json b/fixtures/tests/modules/submodules/consensus/test_reports.py/test_process_report_data_main_sleep_until_data_submitted.json index 464e24e70..9b77df200 100644 --- a/fixtures/tests/modules/submodules/consensus/test_reports.py/test_process_report_data_main_sleep_until_data_submitted.json +++ b/fixtures/tests/modules/submodules/consensus/test_reports.py/test_process_report_data_main_sleep_until_data_submitted.json @@ -1,9 +1,254 @@ [ + { + "method": "eth_getBlockByNumber", + "params": [ + "latest", + false + ], + "response": { + "jsonrpc": "2.0", + "id": 0, + "result": { + "baseFeePerGas": "0x411a80844", + "difficulty": "0x0", + "extraData": "0xd883010b04846765746888676f312e32302e32856c696e7578", + "gasLimit": "0x1c9c380", + "gasUsed": "0xd9f18f", + "hash": "0x7ae16868c38bcdd770b70e6db9065b4f28af2f998b3f3cd585fa90833ced5d63", + "logsBloom": "0x8034024a4182500c0010a410848100c4100c8000aa030a60018d00928811010c482224120400022401100028250c00c449620210085160628230de84c12422400012c02a0c7084cc5a02000ac00a822020058140400630008011a4c68090006140201080c206004008e810a4061c08001000084000284561a020c01882081849130021711064200a00400c00c280002248014001001406880005814711ca0804062000042820021002040002a000020200000202610c0a82818401ae22a0080790b144231005800c20022041051b4e4c44c83000028042102003a22018c2610010101228013202458800012020600808921010101b092243000ae8028a9000a1", + "miner": "0xc799be8de03f20b2d3b101e6f6516d614e6ffe06", + "mixHash": "0xe3a1bd115c6f7e05433923da009106096beb22a835c7c2a58c5734fd0f21c8b9", + "nonce": "0x0000000000000000", + "number": "0x882b58", + "parentHash": "0x7bf298cf80dc73e98fc9d82e61757e7d352e2979dbb8aa93b3f824077b873f09", + "receiptsRoot": "0x1e4a7e6a76eff2907318fd84a29fa6f444ef23983b217c7d82234e5eaef425d8", + "sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", + "size": "0x27be5", + "stateRoot": "0x1cbd6837c7b5f18b1042cbbe07dc4423bbf707f69ab49a5aaa78d89015be6cf3", + "timestamp": "0x644fdb7c", + "totalDifficulty": "0xa4a470", + "transactions": [ + "0x826f73ecdcc699435a6617d80e3a02532a412db546578614faabf8dda3cbff9a", + "0x539588f3f6f2daf4efb1ffe0b5c6ab32230f1b291ba5949accb38342202f0ceb", + "0x632488483772d0bb7e5b4573f137f6e83d88dafc0447ecc525bc95cca3a24cd1", + "0xd20f3218532a863cd1a800642a393afd16f74423e9f8a9e6c7c71fca03a521f3", + "0x1fe75169b1c74ecbd5b0e3c7cc4e174bd224926face3ba480318ac8f29e2e880", + "0xfb6ead544ff7adda831cd086cb8ca605e1dfdf92a20d50e416a47f1146ce2e01", + "0xd2a182052943e0b45a23780ee35e9d50dafc102f4f85ada8e4208eb78c29eb24", + "0x4fdfad4f56cd2ece89ad40801051a33788ac56e642bdf71517e20fcfe097c4e7", + "0xedbea0f52c94b010d8e72cb13ff8f4be5c0e9704996ee2dfaed6487d2e0535dd", + "0x705888b34939cd722f83656abe073931bc0c4ca98003053a88ec0c5e95812bf5", + "0xeaa08ec2ea8f58c6b132c60128a8ce5e527802a2589bbabd84b9cb64975bde38", + "0x97ab09db70279084da8e2fa33f864cd36f261961b2705a21373e0b96154dbe6e", + "0x498b48e817d21e5cbf8a64afbf07bda167c02ff0f478b8d2212790e90871d77d", + "0x04aff7f83d37a8a2efbd4c136db78ab7653fb47a039cc950e9d4d8e4043e1e99", + "0x30adb3408e2f4ca94988e5226d022cda8e6f4943e49d86ccf53be6d27e0b4a02", + "0x1c0fb74426420e3b5229cc3e72061d7e1036da5dfa0788c432f55c147d8f40b4", + "0xd811c57f8cf3a758ca83f36c6195d5bd285df35022c5b7972d1a180d355c66b6", + "0xf2bfe5231bda2713c9328fbc1450a0358a49a81f82d922767ec7b48802d50b70", + "0x8ffadcb841ba2f886ab071acf19a1f85b05aa5d4d0ca47aa1036a3d04e803d18", + "0x46b5f23beae80bde909c77d3513c93181644ae1d874e8fecb31104c8a560814b", + "0xde297eab7bd6912c6b1893a27d782a6e754b25e92e02f844b2b9e5c0fca07a40", + "0xdba600e835447cb417c119b49ff5d702d4bbe6d09aae2bfd0dfb4fb0cf29cf50", + "0xb53b953d05b5d3094032596bb84904459c1698d4703134366ee3a5aebe9577b0", + "0xadf190e3cdd154afdc78ffb97f7dd01e67f47dc6e117eda1608469b2ae68bbe1", + "0x107a9fe8c4d8e8f19ae5f6cf1008fdb40d2ba3eee98f4721d725ff7a8e00df55", + "0x9d3d1a7fc31e2c8740157d7c1fb935e5e96cebaaaec1a1fde26cbb3fa9aae3cc", + "0x318de58626be6939f2b6e2ccf3a6dae7ec9f09640575902a390b979afa1837ba", + "0x193f9c6a0a5c13c0cf5b8e039b6a143d0d5bd5a2e6144c1905f189df7c2ef8f6", + "0x421d4d2a2aca30ffa818155451d81102e10a21836cca48cada604d0d6ac92d23", + "0xf02f052717ff4f9f4658d5659515a51c8395eb6540b8e0d6c8fd5b682d146d58", + "0x4037aac9112ddb1995c9ad9850c71b949c962da233b076e06b0fde0e68a9b69f", + "0xc0b7e5f65c1c31bc3b665ea8ffdce2af5c7a901919a093155189c8399da08290", + "0xccc02f5ddd09a490e8145036f5c4ffbf43b9ee006fd339a6f221dbaac3d68546", + "0xb564cb65887764f44716bfedd27cf1323de65e5e91b7ba59f91c85dbaa0ffae9", + "0xcbd3dc4f2810e185d6891c8970680807ad8b03b78abe48d8d97581f63d28af7d", + "0xe90d5ff295ea0ff987acd9ade1e06a8cb1d9359f831ae08d73d42bc7db15cee3", + "0x2034c764a284f8da5a82e68c516a5c1aa1d282af3497440c9cca7f774d6edfa7", + "0x9fa474c0794779adabb78264069fab4fa3000487cde00e9938b6b4b2246e1e78", + "0x2cae5b0b54c7465c1b033579c6b155e7456f8dafe0827f6893c2a10d908d69b5", + "0x8387258f62f02f3d57d6565eb87822bae9683335fdcd2461ec2edf285639e04a", + "0x52374366fd7c638f27ecf448bc80351aa7526183861f907f470125fe2bd09123", + "0xdd1fbd583eb5b347b8ce849abb86564c8232b18f06f3d1b89f72394b267fd6ac", + "0xc746252916a67206727809c77cb8057d61b26ad3ead7f25fec5d4186357b0eb6", + "0x401db9df4abab97dc791d1b455d5f2924553109f34247c1e5759c2b97f67904a", + "0x511eec11b448b272864f75436bf25822edcd637cfe8169f3db45656aa41345fb", + "0x0df69d42ef157fe82ef00414dfa6665ead05d03365bd4bc139dd598897e003c3", + "0x69e27c0d24bfbd4035e9e31e6fcdb700b077c88ef8c13a66ab035fd2dcbbd5f4", + "0xe3b65376f0dd5291614b51a8bc29ad40ebf38ef91b325d6e4e388df60d7f7e7c", + "0x065013726c023745975915d754bd198183d0060539035afd88d692bf72e1ab3a", + "0xde7a107f7bfe30725b9d7713463a4151253be6b35a2f80f4c29e5c95642b86bd", + "0xda10a0d78159bd16b1a5bbaeb0a9ba1d9d4f9a0355d4ca38c9e00f4649e7d582" + ], + "transactionsRoot": "0xef6a0feb93b7f6780704de54cdd58719bb9c27bfa935f94372a2c4b07a7a799d", + "uncles": [], + "withdrawals": [ + { + "index": "0x413f4b", + "validatorIndex": "0x38d64", + "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", + "amount": "0x1b6bbf" + }, + { + "index": "0x413f4c", + "validatorIndex": "0x38d65", + "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", + "amount": "0x1dbb18" + }, + { + "index": "0x413f4d", + "validatorIndex": "0x38d66", + "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", + "amount": "0x1d698a" + }, + { + "index": "0x413f4e", + "validatorIndex": "0x38d67", + "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", + "amount": "0x1ca68a" + }, + { + "index": "0x413f4f", + "validatorIndex": "0x38d68", + "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", + "amount": "0x1d05f0" + }, + { + "index": "0x413f50", + "validatorIndex": "0x38d69", + "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", + "amount": "0x1cdf8d" + }, + { + "index": "0x413f51", + "validatorIndex": "0x38d6a", + "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", + "amount": "0x1d920a" + }, + { + "index": "0x413f52", + "validatorIndex": "0x38d6b", + "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", + "amount": "0x1d5070" + }, + { + "index": "0x413f53", + "validatorIndex": "0x38d6c", + "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", + "amount": "0x1ca3ea" + }, + { + "index": "0x413f54", + "validatorIndex": "0x38d6d", + "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", + "amount": "0x1d3236" + }, + { + "index": "0x413f55", + "validatorIndex": "0x38d6e", + "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", + "amount": "0x1c869e" + }, + { + "index": "0x413f56", + "validatorIndex": "0x38d6f", + "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", + "amount": "0x1c261c" + }, + { + "index": "0x413f57", + "validatorIndex": "0x38d70", + "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", + "amount": "0x1d4914" + }, + { + "index": "0x413f58", + "validatorIndex": "0x38d71", + "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", + "amount": "0x1d11f6" + }, + { + "index": "0x413f59", + "validatorIndex": "0x38d72", + "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", + "amount": "0x1d1669" + }, + { + "index": "0x413f5a", + "validatorIndex": "0x38d73", + "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", + "amount": "0x1d148e" + } + ], + "withdrawalsRoot": "0xa6e7d6a5b639748861d7e0c4260adb671bbb9480b3c4230b20146f34ec25970e" + } + } + }, + { + "method": "eth_feeHistory", + "params": [ + "0x1", + "latest", + [ + 3 + ] + ], + "response": { + "jsonrpc": "2.0", + "id": 1, + "result": { + "oldestBlock": "0x882b58", + "reward": [ + [ + "0x1124b53c" + ] + ], + "baseFeePerGas": [ + "0x411a80844", + "0x40b6f0cdd" + ], + "gasUsedRatio": [ + 0.4761050333333333 + ] + } + } + }, + { + "method": "eth_getTransactionCount", + "params": [ + "0xF6d4bA61810778fF95BeA0B7DB2F103Dc042C5f7", + "latest" + ], + "response": { + "jsonrpc": "2.0", + "id": 2, + "result": "0x0" + } + }, + { + "method": "eth_estimateGas", + "params": [ + { + "from": "0xF6d4bA61810778fF95BeA0B7DB2F103Dc042C5f7", + "to": "0x3FD30E8360e2E637be3428fB78A3d8D0ad157197", + "data": "0xfc7377cd00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000001e000000000000000000000000000000000000000000000000000000000000002400000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000b00000000000000000000000000000000000000000000000000000000000002a0000000000000000000000000000000000000000000000000000000000000000d0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000700000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000c" + } + ], + "response": { + "jsonrpc": "2.0", + "id": 3, + "result": "0x6018" + } + }, { "method": "eth_call", "params": [ { "from": "0xF6d4bA61810778fF95BeA0B7DB2F103Dc042C5f7", + "maxFeePerGas": "0x83474c5c4", + "maxPriorityFeePerGas": "0x1124b53c", + "nonce": "0x0", + "gas": "0x1e6b8", "to": "0x3FD30E8360e2E637be3428fB78A3d8D0ad157197", "data": "0xfc7377cd00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000001e000000000000000000000000000000000000000000000000000000000000002400000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000b00000000000000000000000000000000000000000000000000000000000002a0000000000000000000000000000000000000000000000000000000000000000d0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000700000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000c" }, @@ -11,11 +256,10 @@ ], "response": { "jsonrpc": "2.0", - "id": 0, + "id": 4, "error": { - "code": 3, - "message": "execution reverted", - "data": "0x23dada53" + "code": -32000, + "message": "insufficient funds for gas * price + value: address 0xF6d4bA61810778fF95BeA0B7DB2F103Dc042C5f7 have 0 want 4390879877938400" } } } diff --git a/fixtures/tests/modules/submodules/consensus/test_reports.py/test_process_report_submit_report.json b/fixtures/tests/modules/submodules/consensus/test_reports.py/test_process_report_submit_report.json index 464e24e70..9b77df200 100644 --- a/fixtures/tests/modules/submodules/consensus/test_reports.py/test_process_report_submit_report.json +++ b/fixtures/tests/modules/submodules/consensus/test_reports.py/test_process_report_submit_report.json @@ -1,9 +1,254 @@ [ + { + "method": "eth_getBlockByNumber", + "params": [ + "latest", + false + ], + "response": { + "jsonrpc": "2.0", + "id": 0, + "result": { + "baseFeePerGas": "0x411a80844", + "difficulty": "0x0", + "extraData": "0xd883010b04846765746888676f312e32302e32856c696e7578", + "gasLimit": "0x1c9c380", + "gasUsed": "0xd9f18f", + "hash": "0x7ae16868c38bcdd770b70e6db9065b4f28af2f998b3f3cd585fa90833ced5d63", + "logsBloom": "0x8034024a4182500c0010a410848100c4100c8000aa030a60018d00928811010c482224120400022401100028250c00c449620210085160628230de84c12422400012c02a0c7084cc5a02000ac00a822020058140400630008011a4c68090006140201080c206004008e810a4061c08001000084000284561a020c01882081849130021711064200a00400c00c280002248014001001406880005814711ca0804062000042820021002040002a000020200000202610c0a82818401ae22a0080790b144231005800c20022041051b4e4c44c83000028042102003a22018c2610010101228013202458800012020600808921010101b092243000ae8028a9000a1", + "miner": "0xc799be8de03f20b2d3b101e6f6516d614e6ffe06", + "mixHash": "0xe3a1bd115c6f7e05433923da009106096beb22a835c7c2a58c5734fd0f21c8b9", + "nonce": "0x0000000000000000", + "number": "0x882b58", + "parentHash": "0x7bf298cf80dc73e98fc9d82e61757e7d352e2979dbb8aa93b3f824077b873f09", + "receiptsRoot": "0x1e4a7e6a76eff2907318fd84a29fa6f444ef23983b217c7d82234e5eaef425d8", + "sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", + "size": "0x27be5", + "stateRoot": "0x1cbd6837c7b5f18b1042cbbe07dc4423bbf707f69ab49a5aaa78d89015be6cf3", + "timestamp": "0x644fdb7c", + "totalDifficulty": "0xa4a470", + "transactions": [ + "0x826f73ecdcc699435a6617d80e3a02532a412db546578614faabf8dda3cbff9a", + "0x539588f3f6f2daf4efb1ffe0b5c6ab32230f1b291ba5949accb38342202f0ceb", + "0x632488483772d0bb7e5b4573f137f6e83d88dafc0447ecc525bc95cca3a24cd1", + "0xd20f3218532a863cd1a800642a393afd16f74423e9f8a9e6c7c71fca03a521f3", + "0x1fe75169b1c74ecbd5b0e3c7cc4e174bd224926face3ba480318ac8f29e2e880", + "0xfb6ead544ff7adda831cd086cb8ca605e1dfdf92a20d50e416a47f1146ce2e01", + "0xd2a182052943e0b45a23780ee35e9d50dafc102f4f85ada8e4208eb78c29eb24", + "0x4fdfad4f56cd2ece89ad40801051a33788ac56e642bdf71517e20fcfe097c4e7", + "0xedbea0f52c94b010d8e72cb13ff8f4be5c0e9704996ee2dfaed6487d2e0535dd", + "0x705888b34939cd722f83656abe073931bc0c4ca98003053a88ec0c5e95812bf5", + "0xeaa08ec2ea8f58c6b132c60128a8ce5e527802a2589bbabd84b9cb64975bde38", + "0x97ab09db70279084da8e2fa33f864cd36f261961b2705a21373e0b96154dbe6e", + "0x498b48e817d21e5cbf8a64afbf07bda167c02ff0f478b8d2212790e90871d77d", + "0x04aff7f83d37a8a2efbd4c136db78ab7653fb47a039cc950e9d4d8e4043e1e99", + "0x30adb3408e2f4ca94988e5226d022cda8e6f4943e49d86ccf53be6d27e0b4a02", + "0x1c0fb74426420e3b5229cc3e72061d7e1036da5dfa0788c432f55c147d8f40b4", + "0xd811c57f8cf3a758ca83f36c6195d5bd285df35022c5b7972d1a180d355c66b6", + "0xf2bfe5231bda2713c9328fbc1450a0358a49a81f82d922767ec7b48802d50b70", + "0x8ffadcb841ba2f886ab071acf19a1f85b05aa5d4d0ca47aa1036a3d04e803d18", + "0x46b5f23beae80bde909c77d3513c93181644ae1d874e8fecb31104c8a560814b", + "0xde297eab7bd6912c6b1893a27d782a6e754b25e92e02f844b2b9e5c0fca07a40", + "0xdba600e835447cb417c119b49ff5d702d4bbe6d09aae2bfd0dfb4fb0cf29cf50", + "0xb53b953d05b5d3094032596bb84904459c1698d4703134366ee3a5aebe9577b0", + "0xadf190e3cdd154afdc78ffb97f7dd01e67f47dc6e117eda1608469b2ae68bbe1", + "0x107a9fe8c4d8e8f19ae5f6cf1008fdb40d2ba3eee98f4721d725ff7a8e00df55", + "0x9d3d1a7fc31e2c8740157d7c1fb935e5e96cebaaaec1a1fde26cbb3fa9aae3cc", + "0x318de58626be6939f2b6e2ccf3a6dae7ec9f09640575902a390b979afa1837ba", + "0x193f9c6a0a5c13c0cf5b8e039b6a143d0d5bd5a2e6144c1905f189df7c2ef8f6", + "0x421d4d2a2aca30ffa818155451d81102e10a21836cca48cada604d0d6ac92d23", + "0xf02f052717ff4f9f4658d5659515a51c8395eb6540b8e0d6c8fd5b682d146d58", + "0x4037aac9112ddb1995c9ad9850c71b949c962da233b076e06b0fde0e68a9b69f", + "0xc0b7e5f65c1c31bc3b665ea8ffdce2af5c7a901919a093155189c8399da08290", + "0xccc02f5ddd09a490e8145036f5c4ffbf43b9ee006fd339a6f221dbaac3d68546", + "0xb564cb65887764f44716bfedd27cf1323de65e5e91b7ba59f91c85dbaa0ffae9", + "0xcbd3dc4f2810e185d6891c8970680807ad8b03b78abe48d8d97581f63d28af7d", + "0xe90d5ff295ea0ff987acd9ade1e06a8cb1d9359f831ae08d73d42bc7db15cee3", + "0x2034c764a284f8da5a82e68c516a5c1aa1d282af3497440c9cca7f774d6edfa7", + "0x9fa474c0794779adabb78264069fab4fa3000487cde00e9938b6b4b2246e1e78", + "0x2cae5b0b54c7465c1b033579c6b155e7456f8dafe0827f6893c2a10d908d69b5", + "0x8387258f62f02f3d57d6565eb87822bae9683335fdcd2461ec2edf285639e04a", + "0x52374366fd7c638f27ecf448bc80351aa7526183861f907f470125fe2bd09123", + "0xdd1fbd583eb5b347b8ce849abb86564c8232b18f06f3d1b89f72394b267fd6ac", + "0xc746252916a67206727809c77cb8057d61b26ad3ead7f25fec5d4186357b0eb6", + "0x401db9df4abab97dc791d1b455d5f2924553109f34247c1e5759c2b97f67904a", + "0x511eec11b448b272864f75436bf25822edcd637cfe8169f3db45656aa41345fb", + "0x0df69d42ef157fe82ef00414dfa6665ead05d03365bd4bc139dd598897e003c3", + "0x69e27c0d24bfbd4035e9e31e6fcdb700b077c88ef8c13a66ab035fd2dcbbd5f4", + "0xe3b65376f0dd5291614b51a8bc29ad40ebf38ef91b325d6e4e388df60d7f7e7c", + "0x065013726c023745975915d754bd198183d0060539035afd88d692bf72e1ab3a", + "0xde7a107f7bfe30725b9d7713463a4151253be6b35a2f80f4c29e5c95642b86bd", + "0xda10a0d78159bd16b1a5bbaeb0a9ba1d9d4f9a0355d4ca38c9e00f4649e7d582" + ], + "transactionsRoot": "0xef6a0feb93b7f6780704de54cdd58719bb9c27bfa935f94372a2c4b07a7a799d", + "uncles": [], + "withdrawals": [ + { + "index": "0x413f4b", + "validatorIndex": "0x38d64", + "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", + "amount": "0x1b6bbf" + }, + { + "index": "0x413f4c", + "validatorIndex": "0x38d65", + "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", + "amount": "0x1dbb18" + }, + { + "index": "0x413f4d", + "validatorIndex": "0x38d66", + "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", + "amount": "0x1d698a" + }, + { + "index": "0x413f4e", + "validatorIndex": "0x38d67", + "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", + "amount": "0x1ca68a" + }, + { + "index": "0x413f4f", + "validatorIndex": "0x38d68", + "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", + "amount": "0x1d05f0" + }, + { + "index": "0x413f50", + "validatorIndex": "0x38d69", + "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", + "amount": "0x1cdf8d" + }, + { + "index": "0x413f51", + "validatorIndex": "0x38d6a", + "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", + "amount": "0x1d920a" + }, + { + "index": "0x413f52", + "validatorIndex": "0x38d6b", + "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", + "amount": "0x1d5070" + }, + { + "index": "0x413f53", + "validatorIndex": "0x38d6c", + "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", + "amount": "0x1ca3ea" + }, + { + "index": "0x413f54", + "validatorIndex": "0x38d6d", + "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", + "amount": "0x1d3236" + }, + { + "index": "0x413f55", + "validatorIndex": "0x38d6e", + "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", + "amount": "0x1c869e" + }, + { + "index": "0x413f56", + "validatorIndex": "0x38d6f", + "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", + "amount": "0x1c261c" + }, + { + "index": "0x413f57", + "validatorIndex": "0x38d70", + "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", + "amount": "0x1d4914" + }, + { + "index": "0x413f58", + "validatorIndex": "0x38d71", + "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", + "amount": "0x1d11f6" + }, + { + "index": "0x413f59", + "validatorIndex": "0x38d72", + "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", + "amount": "0x1d1669" + }, + { + "index": "0x413f5a", + "validatorIndex": "0x38d73", + "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", + "amount": "0x1d148e" + } + ], + "withdrawalsRoot": "0xa6e7d6a5b639748861d7e0c4260adb671bbb9480b3c4230b20146f34ec25970e" + } + } + }, + { + "method": "eth_feeHistory", + "params": [ + "0x1", + "latest", + [ + 3 + ] + ], + "response": { + "jsonrpc": "2.0", + "id": 1, + "result": { + "oldestBlock": "0x882b58", + "reward": [ + [ + "0x1124b53c" + ] + ], + "baseFeePerGas": [ + "0x411a80844", + "0x40b6f0cdd" + ], + "gasUsedRatio": [ + 0.4761050333333333 + ] + } + } + }, + { + "method": "eth_getTransactionCount", + "params": [ + "0xF6d4bA61810778fF95BeA0B7DB2F103Dc042C5f7", + "latest" + ], + "response": { + "jsonrpc": "2.0", + "id": 2, + "result": "0x0" + } + }, + { + "method": "eth_estimateGas", + "params": [ + { + "from": "0xF6d4bA61810778fF95BeA0B7DB2F103Dc042C5f7", + "to": "0x3FD30E8360e2E637be3428fB78A3d8D0ad157197", + "data": "0xfc7377cd00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000001e000000000000000000000000000000000000000000000000000000000000002400000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000b00000000000000000000000000000000000000000000000000000000000002a0000000000000000000000000000000000000000000000000000000000000000d0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000700000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000c" + } + ], + "response": { + "jsonrpc": "2.0", + "id": 3, + "result": "0x6018" + } + }, { "method": "eth_call", "params": [ { "from": "0xF6d4bA61810778fF95BeA0B7DB2F103Dc042C5f7", + "maxFeePerGas": "0x83474c5c4", + "maxPriorityFeePerGas": "0x1124b53c", + "nonce": "0x0", + "gas": "0x1e6b8", "to": "0x3FD30E8360e2E637be3428fB78A3d8D0ad157197", "data": "0xfc7377cd00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000001e000000000000000000000000000000000000000000000000000000000000002400000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000b00000000000000000000000000000000000000000000000000000000000002a0000000000000000000000000000000000000000000000000000000000000000d0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000700000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000c" }, @@ -11,11 +256,10 @@ ], "response": { "jsonrpc": "2.0", - "id": 0, + "id": 4, "error": { - "code": 3, - "message": "execution reverted", - "data": "0x23dada53" + "code": -32000, + "message": "insufficient funds for gas * price + value: address 0xF6d4bA61810778fF95BeA0B7DB2F103Dc042C5f7 have 0 want 4390879877938400" } } } diff --git a/src/modules/submodules/consensus.py b/src/modules/submodules/consensus.py index 79cdc3f0a..2d8b002b5 100644 --- a/src/modules/submodules/consensus.py +++ b/src/modules/submodules/consensus.py @@ -270,6 +270,7 @@ def process_report(self, blockstamp: ReferenceBlockStamp) -> None: if not self.is_reporting_allowed(blockstamp): logger.warning({'msg': 'Reporting checks are not passed. Report will not be sent.'}) return + self._process_report_hash(blockstamp, report_hash) # Even if report hash transaction was failed we have to check if we can report data for current frame self._process_report_data(blockstamp, report_data, report_hash) @@ -277,22 +278,27 @@ def process_report(self, blockstamp: ReferenceBlockStamp) -> None: def _process_report_hash(self, blockstamp: ReferenceBlockStamp, report_hash: HexBytes) -> None: latest_blockstamp, member_info = self._get_latest_data() - # Check if current slot is newer than (member slot + slots_delay) - if not member_info.is_fast_lane: - if latest_blockstamp.slot_number < member_info.current_frame_ref_slot + member_info.fast_lane_length_slot: - logger.info({'msg': f'Member is not in fast lane, so report will be postponed for [{member_info.fast_lane_length_slot}] slots.'}) - return None - if not member_info.is_report_member: logger.info({'msg': 'Account can`t submit report hash.'}) return None - if HexBytes(member_info.current_frame_member_report) != report_hash: - logger.info({'msg': f'Send report hash. Consensus version: [{self.CONSENSUS_VERSION}]'}) - self._send_report_hash(blockstamp, report_hash, self.CONSENSUS_VERSION) - else: - logger.info({'msg': 'Provided hash already submitted.'}) + if HexBytes(member_info.current_frame_member_report) == report_hash: + logger.info({'msg': 'Account already submitted provided hash.'}) + return None + + if not member_info.is_fast_lane: + # Check if current slot is newer than (member slot + slots_delay) + if latest_blockstamp.slot_number < member_info.current_frame_ref_slot + member_info.fast_lane_length_slot: + logger.info({'msg': f'Member is not in fast lane, so report will be postponed ' + f'for [{member_info.fast_lane_length_slot}] slots.'}) + return None + + if HexBytes(member_info.current_frame_consensus_report) == report_hash: + logger.info({'msg': 'Consensus reached with provided hash.'}) + return None + logger.info({'msg': f'Send report hash. Consensus version: [{self.CONSENSUS_VERSION}]'}) + self._send_report_hash(blockstamp, report_hash, self.CONSENSUS_VERSION) return None def _process_report_data(self, blockstamp: ReferenceBlockStamp, report_data: tuple, report_hash: HexBytes): diff --git a/src/providers/http_provider.py b/src/providers/http_provider.py index 42b57cca6..9f97632cd 100644 --- a/src/providers/http_provider.py +++ b/src/providers/http_provider.py @@ -7,7 +7,6 @@ from prometheus_client import Histogram from requests import Session, JSONDecodeError from requests.adapters import HTTPAdapter -from requests.exceptions import ConnectionError as RequestsConnectionError from urllib3 import Retry from src.providers.consistency import ProviderConsistencyModule @@ -126,8 +125,8 @@ def _get_without_fallbacks( params=query_params, timeout=self.request_timeout, ) - except RequestsConnectionError as error: - logger.debug({'msg': str(error)}) + except Exception as error: + logger.error({'msg': str(error)}) t.labels( endpoint=endpoint, code=0, diff --git a/tests/modules/submodules/consensus/test_reports.py b/tests/modules/submodules/consensus/test_reports.py index bda8145a1..40544ce58 100644 --- a/tests/modules/submodules/consensus/test_reports.py +++ b/tests/modules/submodules/consensus/test_reports.py @@ -73,7 +73,11 @@ def test_report_hash(web3, consensus, tx_utils, set_report_account): def test_report_hash_member_not_in_fast_lane(web3, consensus, caplog): blockstamp = ReferenceBlockStampFactory.build() consensus._get_latest_blockstamp = Mock(return_value=blockstamp) - member_info = MemberInfoFactory.build(is_fast_lane=False, current_frame_ref_slot=blockstamp.slot_number - 1) + member_info = MemberInfoFactory.build( + is_fast_lane=False, + current_frame_ref_slot=blockstamp.slot_number - 1, + is_report_member=True, + ) consensus.get_member_info = Mock(return_value=member_info) consensus._process_report_hash(blockstamp, HexBytes(int.to_bytes(1, 32))) @@ -102,7 +106,7 @@ def test_do_not_report_same_hash(consensus, caplog, mock_latest_data): consensus.get_member_info = Mock(return_value=member_info) consensus._process_report_hash(blockstamp, HexBytes(int.to_bytes(1, 32))) - assert "Provided hash already submitted" in caplog.messages[-1] + assert "Account already submitted provided hash." in caplog.messages[-1] # -------- Process report data --------- @@ -140,6 +144,7 @@ def test_process_report_data_main_data_submitted(consensus, caplog, mock_latest_ blockstamp = ReferenceBlockStampFactory.build() report_data = tuple() report_hash = int.to_bytes(1, 32) + consensus._get_slot_delay_before_data_submit = Mock(return_value=0) consensus.is_main_data_submitted = Mock(side_effect=[False, True]) From 256870d1de5409a3761ffe997fa50d359097c265 Mon Sep 17 00:00:00 2001 From: F4ever <1590415904a@gmail.com> Date: Mon, 1 May 2023 23:11:53 +0200 Subject: [PATCH 5/6] fix mocks --- ..._data_main_sleep_until_data_submitted.json | 266 ------------------ .../test_process_report_submit_report.json | 266 ------------------ .../submodules/consensus/test_reports.py | 3 + 3 files changed, 3 insertions(+), 532 deletions(-) delete mode 100644 fixtures/tests/modules/submodules/consensus/test_reports.py/test_process_report_data_main_sleep_until_data_submitted.json delete mode 100644 fixtures/tests/modules/submodules/consensus/test_reports.py/test_process_report_submit_report.json diff --git a/fixtures/tests/modules/submodules/consensus/test_reports.py/test_process_report_data_main_sleep_until_data_submitted.json b/fixtures/tests/modules/submodules/consensus/test_reports.py/test_process_report_data_main_sleep_until_data_submitted.json deleted file mode 100644 index 9b77df200..000000000 --- a/fixtures/tests/modules/submodules/consensus/test_reports.py/test_process_report_data_main_sleep_until_data_submitted.json +++ /dev/null @@ -1,266 +0,0 @@ -[ - { - "method": "eth_getBlockByNumber", - "params": [ - "latest", - false - ], - "response": { - "jsonrpc": "2.0", - "id": 0, - "result": { - "baseFeePerGas": "0x411a80844", - "difficulty": "0x0", - "extraData": "0xd883010b04846765746888676f312e32302e32856c696e7578", - "gasLimit": "0x1c9c380", - "gasUsed": "0xd9f18f", - "hash": "0x7ae16868c38bcdd770b70e6db9065b4f28af2f998b3f3cd585fa90833ced5d63", - "logsBloom": "0x8034024a4182500c0010a410848100c4100c8000aa030a60018d00928811010c482224120400022401100028250c00c449620210085160628230de84c12422400012c02a0c7084cc5a02000ac00a822020058140400630008011a4c68090006140201080c206004008e810a4061c08001000084000284561a020c01882081849130021711064200a00400c00c280002248014001001406880005814711ca0804062000042820021002040002a000020200000202610c0a82818401ae22a0080790b144231005800c20022041051b4e4c44c83000028042102003a22018c2610010101228013202458800012020600808921010101b092243000ae8028a9000a1", - "miner": "0xc799be8de03f20b2d3b101e6f6516d614e6ffe06", - "mixHash": "0xe3a1bd115c6f7e05433923da009106096beb22a835c7c2a58c5734fd0f21c8b9", - "nonce": "0x0000000000000000", - "number": "0x882b58", - "parentHash": "0x7bf298cf80dc73e98fc9d82e61757e7d352e2979dbb8aa93b3f824077b873f09", - "receiptsRoot": "0x1e4a7e6a76eff2907318fd84a29fa6f444ef23983b217c7d82234e5eaef425d8", - "sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", - "size": "0x27be5", - "stateRoot": "0x1cbd6837c7b5f18b1042cbbe07dc4423bbf707f69ab49a5aaa78d89015be6cf3", - "timestamp": "0x644fdb7c", - "totalDifficulty": "0xa4a470", - "transactions": [ - "0x826f73ecdcc699435a6617d80e3a02532a412db546578614faabf8dda3cbff9a", - "0x539588f3f6f2daf4efb1ffe0b5c6ab32230f1b291ba5949accb38342202f0ceb", - "0x632488483772d0bb7e5b4573f137f6e83d88dafc0447ecc525bc95cca3a24cd1", - "0xd20f3218532a863cd1a800642a393afd16f74423e9f8a9e6c7c71fca03a521f3", - "0x1fe75169b1c74ecbd5b0e3c7cc4e174bd224926face3ba480318ac8f29e2e880", - "0xfb6ead544ff7adda831cd086cb8ca605e1dfdf92a20d50e416a47f1146ce2e01", - "0xd2a182052943e0b45a23780ee35e9d50dafc102f4f85ada8e4208eb78c29eb24", - "0x4fdfad4f56cd2ece89ad40801051a33788ac56e642bdf71517e20fcfe097c4e7", - "0xedbea0f52c94b010d8e72cb13ff8f4be5c0e9704996ee2dfaed6487d2e0535dd", - "0x705888b34939cd722f83656abe073931bc0c4ca98003053a88ec0c5e95812bf5", - "0xeaa08ec2ea8f58c6b132c60128a8ce5e527802a2589bbabd84b9cb64975bde38", - "0x97ab09db70279084da8e2fa33f864cd36f261961b2705a21373e0b96154dbe6e", - "0x498b48e817d21e5cbf8a64afbf07bda167c02ff0f478b8d2212790e90871d77d", - "0x04aff7f83d37a8a2efbd4c136db78ab7653fb47a039cc950e9d4d8e4043e1e99", - "0x30adb3408e2f4ca94988e5226d022cda8e6f4943e49d86ccf53be6d27e0b4a02", - "0x1c0fb74426420e3b5229cc3e72061d7e1036da5dfa0788c432f55c147d8f40b4", - "0xd811c57f8cf3a758ca83f36c6195d5bd285df35022c5b7972d1a180d355c66b6", - "0xf2bfe5231bda2713c9328fbc1450a0358a49a81f82d922767ec7b48802d50b70", - "0x8ffadcb841ba2f886ab071acf19a1f85b05aa5d4d0ca47aa1036a3d04e803d18", - "0x46b5f23beae80bde909c77d3513c93181644ae1d874e8fecb31104c8a560814b", - "0xde297eab7bd6912c6b1893a27d782a6e754b25e92e02f844b2b9e5c0fca07a40", - "0xdba600e835447cb417c119b49ff5d702d4bbe6d09aae2bfd0dfb4fb0cf29cf50", - "0xb53b953d05b5d3094032596bb84904459c1698d4703134366ee3a5aebe9577b0", - "0xadf190e3cdd154afdc78ffb97f7dd01e67f47dc6e117eda1608469b2ae68bbe1", - "0x107a9fe8c4d8e8f19ae5f6cf1008fdb40d2ba3eee98f4721d725ff7a8e00df55", - "0x9d3d1a7fc31e2c8740157d7c1fb935e5e96cebaaaec1a1fde26cbb3fa9aae3cc", - "0x318de58626be6939f2b6e2ccf3a6dae7ec9f09640575902a390b979afa1837ba", - "0x193f9c6a0a5c13c0cf5b8e039b6a143d0d5bd5a2e6144c1905f189df7c2ef8f6", - "0x421d4d2a2aca30ffa818155451d81102e10a21836cca48cada604d0d6ac92d23", - "0xf02f052717ff4f9f4658d5659515a51c8395eb6540b8e0d6c8fd5b682d146d58", - "0x4037aac9112ddb1995c9ad9850c71b949c962da233b076e06b0fde0e68a9b69f", - "0xc0b7e5f65c1c31bc3b665ea8ffdce2af5c7a901919a093155189c8399da08290", - "0xccc02f5ddd09a490e8145036f5c4ffbf43b9ee006fd339a6f221dbaac3d68546", - "0xb564cb65887764f44716bfedd27cf1323de65e5e91b7ba59f91c85dbaa0ffae9", - "0xcbd3dc4f2810e185d6891c8970680807ad8b03b78abe48d8d97581f63d28af7d", - "0xe90d5ff295ea0ff987acd9ade1e06a8cb1d9359f831ae08d73d42bc7db15cee3", - "0x2034c764a284f8da5a82e68c516a5c1aa1d282af3497440c9cca7f774d6edfa7", - "0x9fa474c0794779adabb78264069fab4fa3000487cde00e9938b6b4b2246e1e78", - "0x2cae5b0b54c7465c1b033579c6b155e7456f8dafe0827f6893c2a10d908d69b5", - "0x8387258f62f02f3d57d6565eb87822bae9683335fdcd2461ec2edf285639e04a", - "0x52374366fd7c638f27ecf448bc80351aa7526183861f907f470125fe2bd09123", - "0xdd1fbd583eb5b347b8ce849abb86564c8232b18f06f3d1b89f72394b267fd6ac", - "0xc746252916a67206727809c77cb8057d61b26ad3ead7f25fec5d4186357b0eb6", - "0x401db9df4abab97dc791d1b455d5f2924553109f34247c1e5759c2b97f67904a", - "0x511eec11b448b272864f75436bf25822edcd637cfe8169f3db45656aa41345fb", - "0x0df69d42ef157fe82ef00414dfa6665ead05d03365bd4bc139dd598897e003c3", - "0x69e27c0d24bfbd4035e9e31e6fcdb700b077c88ef8c13a66ab035fd2dcbbd5f4", - "0xe3b65376f0dd5291614b51a8bc29ad40ebf38ef91b325d6e4e388df60d7f7e7c", - "0x065013726c023745975915d754bd198183d0060539035afd88d692bf72e1ab3a", - "0xde7a107f7bfe30725b9d7713463a4151253be6b35a2f80f4c29e5c95642b86bd", - "0xda10a0d78159bd16b1a5bbaeb0a9ba1d9d4f9a0355d4ca38c9e00f4649e7d582" - ], - "transactionsRoot": "0xef6a0feb93b7f6780704de54cdd58719bb9c27bfa935f94372a2c4b07a7a799d", - "uncles": [], - "withdrawals": [ - { - "index": "0x413f4b", - "validatorIndex": "0x38d64", - "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", - "amount": "0x1b6bbf" - }, - { - "index": "0x413f4c", - "validatorIndex": "0x38d65", - "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", - "amount": "0x1dbb18" - }, - { - "index": "0x413f4d", - "validatorIndex": "0x38d66", - "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", - "amount": "0x1d698a" - }, - { - "index": "0x413f4e", - "validatorIndex": "0x38d67", - "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", - "amount": "0x1ca68a" - }, - { - "index": "0x413f4f", - "validatorIndex": "0x38d68", - "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", - "amount": "0x1d05f0" - }, - { - "index": "0x413f50", - "validatorIndex": "0x38d69", - "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", - "amount": "0x1cdf8d" - }, - { - "index": "0x413f51", - "validatorIndex": "0x38d6a", - "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", - "amount": "0x1d920a" - }, - { - "index": "0x413f52", - "validatorIndex": "0x38d6b", - "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", - "amount": "0x1d5070" - }, - { - "index": "0x413f53", - "validatorIndex": "0x38d6c", - "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", - "amount": "0x1ca3ea" - }, - { - "index": "0x413f54", - "validatorIndex": "0x38d6d", - "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", - "amount": "0x1d3236" - }, - { - "index": "0x413f55", - "validatorIndex": "0x38d6e", - "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", - "amount": "0x1c869e" - }, - { - "index": "0x413f56", - "validatorIndex": "0x38d6f", - "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", - "amount": "0x1c261c" - }, - { - "index": "0x413f57", - "validatorIndex": "0x38d70", - "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", - "amount": "0x1d4914" - }, - { - "index": "0x413f58", - "validatorIndex": "0x38d71", - "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", - "amount": "0x1d11f6" - }, - { - "index": "0x413f59", - "validatorIndex": "0x38d72", - "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", - "amount": "0x1d1669" - }, - { - "index": "0x413f5a", - "validatorIndex": "0x38d73", - "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", - "amount": "0x1d148e" - } - ], - "withdrawalsRoot": "0xa6e7d6a5b639748861d7e0c4260adb671bbb9480b3c4230b20146f34ec25970e" - } - } - }, - { - "method": "eth_feeHistory", - "params": [ - "0x1", - "latest", - [ - 3 - ] - ], - "response": { - "jsonrpc": "2.0", - "id": 1, - "result": { - "oldestBlock": "0x882b58", - "reward": [ - [ - "0x1124b53c" - ] - ], - "baseFeePerGas": [ - "0x411a80844", - "0x40b6f0cdd" - ], - "gasUsedRatio": [ - 0.4761050333333333 - ] - } - } - }, - { - "method": "eth_getTransactionCount", - "params": [ - "0xF6d4bA61810778fF95BeA0B7DB2F103Dc042C5f7", - "latest" - ], - "response": { - "jsonrpc": "2.0", - "id": 2, - "result": "0x0" - } - }, - { - "method": "eth_estimateGas", - "params": [ - { - "from": "0xF6d4bA61810778fF95BeA0B7DB2F103Dc042C5f7", - "to": "0x3FD30E8360e2E637be3428fB78A3d8D0ad157197", - "data": "0xfc7377cd00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000001e000000000000000000000000000000000000000000000000000000000000002400000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000b00000000000000000000000000000000000000000000000000000000000002a0000000000000000000000000000000000000000000000000000000000000000d0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000700000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000c" - } - ], - "response": { - "jsonrpc": "2.0", - "id": 3, - "result": "0x6018" - } - }, - { - "method": "eth_call", - "params": [ - { - "from": "0xF6d4bA61810778fF95BeA0B7DB2F103Dc042C5f7", - "maxFeePerGas": "0x83474c5c4", - "maxPriorityFeePerGas": "0x1124b53c", - "nonce": "0x0", - "gas": "0x1e6b8", - "to": "0x3FD30E8360e2E637be3428fB78A3d8D0ad157197", - "data": "0xfc7377cd00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000001e000000000000000000000000000000000000000000000000000000000000002400000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000b00000000000000000000000000000000000000000000000000000000000002a0000000000000000000000000000000000000000000000000000000000000000d0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000700000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000c" - }, - "latest" - ], - "response": { - "jsonrpc": "2.0", - "id": 4, - "error": { - "code": -32000, - "message": "insufficient funds for gas * price + value: address 0xF6d4bA61810778fF95BeA0B7DB2F103Dc042C5f7 have 0 want 4390879877938400" - } - } - } -] \ No newline at end of file diff --git a/fixtures/tests/modules/submodules/consensus/test_reports.py/test_process_report_submit_report.json b/fixtures/tests/modules/submodules/consensus/test_reports.py/test_process_report_submit_report.json deleted file mode 100644 index 9b77df200..000000000 --- a/fixtures/tests/modules/submodules/consensus/test_reports.py/test_process_report_submit_report.json +++ /dev/null @@ -1,266 +0,0 @@ -[ - { - "method": "eth_getBlockByNumber", - "params": [ - "latest", - false - ], - "response": { - "jsonrpc": "2.0", - "id": 0, - "result": { - "baseFeePerGas": "0x411a80844", - "difficulty": "0x0", - "extraData": "0xd883010b04846765746888676f312e32302e32856c696e7578", - "gasLimit": "0x1c9c380", - "gasUsed": "0xd9f18f", - "hash": "0x7ae16868c38bcdd770b70e6db9065b4f28af2f998b3f3cd585fa90833ced5d63", - "logsBloom": "0x8034024a4182500c0010a410848100c4100c8000aa030a60018d00928811010c482224120400022401100028250c00c449620210085160628230de84c12422400012c02a0c7084cc5a02000ac00a822020058140400630008011a4c68090006140201080c206004008e810a4061c08001000084000284561a020c01882081849130021711064200a00400c00c280002248014001001406880005814711ca0804062000042820021002040002a000020200000202610c0a82818401ae22a0080790b144231005800c20022041051b4e4c44c83000028042102003a22018c2610010101228013202458800012020600808921010101b092243000ae8028a9000a1", - "miner": "0xc799be8de03f20b2d3b101e6f6516d614e6ffe06", - "mixHash": "0xe3a1bd115c6f7e05433923da009106096beb22a835c7c2a58c5734fd0f21c8b9", - "nonce": "0x0000000000000000", - "number": "0x882b58", - "parentHash": "0x7bf298cf80dc73e98fc9d82e61757e7d352e2979dbb8aa93b3f824077b873f09", - "receiptsRoot": "0x1e4a7e6a76eff2907318fd84a29fa6f444ef23983b217c7d82234e5eaef425d8", - "sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", - "size": "0x27be5", - "stateRoot": "0x1cbd6837c7b5f18b1042cbbe07dc4423bbf707f69ab49a5aaa78d89015be6cf3", - "timestamp": "0x644fdb7c", - "totalDifficulty": "0xa4a470", - "transactions": [ - "0x826f73ecdcc699435a6617d80e3a02532a412db546578614faabf8dda3cbff9a", - "0x539588f3f6f2daf4efb1ffe0b5c6ab32230f1b291ba5949accb38342202f0ceb", - "0x632488483772d0bb7e5b4573f137f6e83d88dafc0447ecc525bc95cca3a24cd1", - "0xd20f3218532a863cd1a800642a393afd16f74423e9f8a9e6c7c71fca03a521f3", - "0x1fe75169b1c74ecbd5b0e3c7cc4e174bd224926face3ba480318ac8f29e2e880", - "0xfb6ead544ff7adda831cd086cb8ca605e1dfdf92a20d50e416a47f1146ce2e01", - "0xd2a182052943e0b45a23780ee35e9d50dafc102f4f85ada8e4208eb78c29eb24", - "0x4fdfad4f56cd2ece89ad40801051a33788ac56e642bdf71517e20fcfe097c4e7", - "0xedbea0f52c94b010d8e72cb13ff8f4be5c0e9704996ee2dfaed6487d2e0535dd", - "0x705888b34939cd722f83656abe073931bc0c4ca98003053a88ec0c5e95812bf5", - "0xeaa08ec2ea8f58c6b132c60128a8ce5e527802a2589bbabd84b9cb64975bde38", - "0x97ab09db70279084da8e2fa33f864cd36f261961b2705a21373e0b96154dbe6e", - "0x498b48e817d21e5cbf8a64afbf07bda167c02ff0f478b8d2212790e90871d77d", - "0x04aff7f83d37a8a2efbd4c136db78ab7653fb47a039cc950e9d4d8e4043e1e99", - "0x30adb3408e2f4ca94988e5226d022cda8e6f4943e49d86ccf53be6d27e0b4a02", - "0x1c0fb74426420e3b5229cc3e72061d7e1036da5dfa0788c432f55c147d8f40b4", - "0xd811c57f8cf3a758ca83f36c6195d5bd285df35022c5b7972d1a180d355c66b6", - "0xf2bfe5231bda2713c9328fbc1450a0358a49a81f82d922767ec7b48802d50b70", - "0x8ffadcb841ba2f886ab071acf19a1f85b05aa5d4d0ca47aa1036a3d04e803d18", - "0x46b5f23beae80bde909c77d3513c93181644ae1d874e8fecb31104c8a560814b", - "0xde297eab7bd6912c6b1893a27d782a6e754b25e92e02f844b2b9e5c0fca07a40", - "0xdba600e835447cb417c119b49ff5d702d4bbe6d09aae2bfd0dfb4fb0cf29cf50", - "0xb53b953d05b5d3094032596bb84904459c1698d4703134366ee3a5aebe9577b0", - "0xadf190e3cdd154afdc78ffb97f7dd01e67f47dc6e117eda1608469b2ae68bbe1", - "0x107a9fe8c4d8e8f19ae5f6cf1008fdb40d2ba3eee98f4721d725ff7a8e00df55", - "0x9d3d1a7fc31e2c8740157d7c1fb935e5e96cebaaaec1a1fde26cbb3fa9aae3cc", - "0x318de58626be6939f2b6e2ccf3a6dae7ec9f09640575902a390b979afa1837ba", - "0x193f9c6a0a5c13c0cf5b8e039b6a143d0d5bd5a2e6144c1905f189df7c2ef8f6", - "0x421d4d2a2aca30ffa818155451d81102e10a21836cca48cada604d0d6ac92d23", - "0xf02f052717ff4f9f4658d5659515a51c8395eb6540b8e0d6c8fd5b682d146d58", - "0x4037aac9112ddb1995c9ad9850c71b949c962da233b076e06b0fde0e68a9b69f", - "0xc0b7e5f65c1c31bc3b665ea8ffdce2af5c7a901919a093155189c8399da08290", - "0xccc02f5ddd09a490e8145036f5c4ffbf43b9ee006fd339a6f221dbaac3d68546", - "0xb564cb65887764f44716bfedd27cf1323de65e5e91b7ba59f91c85dbaa0ffae9", - "0xcbd3dc4f2810e185d6891c8970680807ad8b03b78abe48d8d97581f63d28af7d", - "0xe90d5ff295ea0ff987acd9ade1e06a8cb1d9359f831ae08d73d42bc7db15cee3", - "0x2034c764a284f8da5a82e68c516a5c1aa1d282af3497440c9cca7f774d6edfa7", - "0x9fa474c0794779adabb78264069fab4fa3000487cde00e9938b6b4b2246e1e78", - "0x2cae5b0b54c7465c1b033579c6b155e7456f8dafe0827f6893c2a10d908d69b5", - "0x8387258f62f02f3d57d6565eb87822bae9683335fdcd2461ec2edf285639e04a", - "0x52374366fd7c638f27ecf448bc80351aa7526183861f907f470125fe2bd09123", - "0xdd1fbd583eb5b347b8ce849abb86564c8232b18f06f3d1b89f72394b267fd6ac", - "0xc746252916a67206727809c77cb8057d61b26ad3ead7f25fec5d4186357b0eb6", - "0x401db9df4abab97dc791d1b455d5f2924553109f34247c1e5759c2b97f67904a", - "0x511eec11b448b272864f75436bf25822edcd637cfe8169f3db45656aa41345fb", - "0x0df69d42ef157fe82ef00414dfa6665ead05d03365bd4bc139dd598897e003c3", - "0x69e27c0d24bfbd4035e9e31e6fcdb700b077c88ef8c13a66ab035fd2dcbbd5f4", - "0xe3b65376f0dd5291614b51a8bc29ad40ebf38ef91b325d6e4e388df60d7f7e7c", - "0x065013726c023745975915d754bd198183d0060539035afd88d692bf72e1ab3a", - "0xde7a107f7bfe30725b9d7713463a4151253be6b35a2f80f4c29e5c95642b86bd", - "0xda10a0d78159bd16b1a5bbaeb0a9ba1d9d4f9a0355d4ca38c9e00f4649e7d582" - ], - "transactionsRoot": "0xef6a0feb93b7f6780704de54cdd58719bb9c27bfa935f94372a2c4b07a7a799d", - "uncles": [], - "withdrawals": [ - { - "index": "0x413f4b", - "validatorIndex": "0x38d64", - "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", - "amount": "0x1b6bbf" - }, - { - "index": "0x413f4c", - "validatorIndex": "0x38d65", - "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", - "amount": "0x1dbb18" - }, - { - "index": "0x413f4d", - "validatorIndex": "0x38d66", - "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", - "amount": "0x1d698a" - }, - { - "index": "0x413f4e", - "validatorIndex": "0x38d67", - "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", - "amount": "0x1ca68a" - }, - { - "index": "0x413f4f", - "validatorIndex": "0x38d68", - "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", - "amount": "0x1d05f0" - }, - { - "index": "0x413f50", - "validatorIndex": "0x38d69", - "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", - "amount": "0x1cdf8d" - }, - { - "index": "0x413f51", - "validatorIndex": "0x38d6a", - "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", - "amount": "0x1d920a" - }, - { - "index": "0x413f52", - "validatorIndex": "0x38d6b", - "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", - "amount": "0x1d5070" - }, - { - "index": "0x413f53", - "validatorIndex": "0x38d6c", - "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", - "amount": "0x1ca3ea" - }, - { - "index": "0x413f54", - "validatorIndex": "0x38d6d", - "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", - "amount": "0x1d3236" - }, - { - "index": "0x413f55", - "validatorIndex": "0x38d6e", - "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", - "amount": "0x1c869e" - }, - { - "index": "0x413f56", - "validatorIndex": "0x38d6f", - "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", - "amount": "0x1c261c" - }, - { - "index": "0x413f57", - "validatorIndex": "0x38d70", - "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", - "amount": "0x1d4914" - }, - { - "index": "0x413f58", - "validatorIndex": "0x38d71", - "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", - "amount": "0x1d11f6" - }, - { - "index": "0x413f59", - "validatorIndex": "0x38d72", - "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", - "amount": "0x1d1669" - }, - { - "index": "0x413f5a", - "validatorIndex": "0x38d73", - "address": "0x8f0844fd51e31ff6bf5babe21dccf7328e19fd9f", - "amount": "0x1d148e" - } - ], - "withdrawalsRoot": "0xa6e7d6a5b639748861d7e0c4260adb671bbb9480b3c4230b20146f34ec25970e" - } - } - }, - { - "method": "eth_feeHistory", - "params": [ - "0x1", - "latest", - [ - 3 - ] - ], - "response": { - "jsonrpc": "2.0", - "id": 1, - "result": { - "oldestBlock": "0x882b58", - "reward": [ - [ - "0x1124b53c" - ] - ], - "baseFeePerGas": [ - "0x411a80844", - "0x40b6f0cdd" - ], - "gasUsedRatio": [ - 0.4761050333333333 - ] - } - } - }, - { - "method": "eth_getTransactionCount", - "params": [ - "0xF6d4bA61810778fF95BeA0B7DB2F103Dc042C5f7", - "latest" - ], - "response": { - "jsonrpc": "2.0", - "id": 2, - "result": "0x0" - } - }, - { - "method": "eth_estimateGas", - "params": [ - { - "from": "0xF6d4bA61810778fF95BeA0B7DB2F103Dc042C5f7", - "to": "0x3FD30E8360e2E637be3428fB78A3d8D0ad157197", - "data": "0xfc7377cd00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000001e000000000000000000000000000000000000000000000000000000000000002400000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000b00000000000000000000000000000000000000000000000000000000000002a0000000000000000000000000000000000000000000000000000000000000000d0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000700000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000c" - } - ], - "response": { - "jsonrpc": "2.0", - "id": 3, - "result": "0x6018" - } - }, - { - "method": "eth_call", - "params": [ - { - "from": "0xF6d4bA61810778fF95BeA0B7DB2F103Dc042C5f7", - "maxFeePerGas": "0x83474c5c4", - "maxPriorityFeePerGas": "0x1124b53c", - "nonce": "0x0", - "gas": "0x1e6b8", - "to": "0x3FD30E8360e2E637be3428fB78A3d8D0ad157197", - "data": "0xfc7377cd00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000001e000000000000000000000000000000000000000000000000000000000000002400000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000b00000000000000000000000000000000000000000000000000000000000002a0000000000000000000000000000000000000000000000000000000000000000d0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000700000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000c" - }, - "latest" - ], - "response": { - "jsonrpc": "2.0", - "id": 4, - "error": { - "code": -32000, - "message": "insufficient funds for gas * price + value: address 0xF6d4bA61810778fF95BeA0B7DB2F103Dc042C5f7 have 0 want 4390879877938400" - } - } - } -] \ No newline at end of file diff --git a/tests/modules/submodules/consensus/test_reports.py b/tests/modules/submodules/consensus/test_reports.py index 40544ce58..bff035970 100644 --- a/tests/modules/submodules/consensus/test_reports.py +++ b/tests/modules/submodules/consensus/test_reports.py @@ -169,6 +169,7 @@ def test_process_report_data_main_sleep_until_data_submitted(consensus, caplog, consensus.is_main_data_submitted = Mock(return_value=False) consensus._get_slot_delay_before_data_submit = Mock(return_value=100) + consensus._submit_report = Mock() consensus._process_report_data(blockstamp, report_data, report_hash) assert "Sleep for 100 slots before sending data." in caplog.text @@ -208,6 +209,8 @@ def test_process_report_submit_report(consensus, tx_utils, caplog, mock_latest_d consensus.is_main_data_submitted = Mock(side_effect=main_data_submitted_base) consensus._get_slot_delay_before_data_submit = Mock(return_value=0) + consensus._submit_report = Mock() + consensus._process_report_data(blockstamp, report_data, report_hash) assert "Send report data. Contract version: [1]" in caplog.text From a7bb234f2e193dd06493e046ed9e138d690ec2ef Mon Sep 17 00:00:00 2001 From: Raman Siamionau Date: Tue, 2 May 2023 11:25:22 +0200 Subject: [PATCH 6/6] remove git package --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 87b71e1a0..e9c181d1a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends -qq \ gcc=4:10.2.1-1 \ libffi-dev=3.3-6 \ g++=4:10.2.1-1 \ - git=1:2.30.2-1 \ curl=7.74.0-1.3+deb11u7 \ && apt-get clean \ && rm -rf /var/lib/apt/lists/*