Merge pull request #318 from lidofinance/develop

Develop

Author: F4ever

.github/CODEOWNERS

@@ -1 +1,2 @@
+* @lidofinance/lido-valset-oracles
 .github @lidofinance/review-gh-workflows

.github/workflows/integration-tests.yml

@@ -32,7 +32,7 @@ jobs:
       - name: Integration tests with pytest
         if: success() || failure()
         run: |
-          poetry run pytest tests -m integration
+          poetry run pytest tests -m integration -v -s --log-cli-level=INFO --tb=short
         env:
           WEB3_RPC_ENDPOINTS: ${{ secrets.WEB3_RPC_ENDPOINT }}
           TESTNET_WEB3_RPC_ENDPOINTS: 'https://ethereum-holesky-rpc.publicnode.com'

Dockerfile

@@ -4,7 +4,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends -qq \
     gcc=4:12.2.0-3 \
     libffi-dev=3.4.4-1 \
     g++=4:12.2.0-3 \
-    curl=7.88.1-10+deb12u8 \
+    curl=7.88.1-10+deb12u14 \
  && apt-get clean \
  && rm -rf /var/lib/apt/lists/*
 

README.md

@@ -67,6 +67,7 @@ Unvetting is the proces of decreasing approved depositable signing keys.
 
 | Variable                          | Default       | Description                                                                                                              |
 |-----------------------------------|---------------|--------------------------------------------------------------------------------------------------------------------------|
+| BLOCKS_BETWEEN_EXECUTION          | 1             | Number of blocks in the interval of bot execution                                                                        |
 | MIN_PRIORITY_FEE                  | 50 mwei       | Min priority fee that will be used in tx                                                                                 |
 | MAX_PRIORITY_FEE                  | 10 gwei       | Max priority fee that will be used in tx                                                                                 |
 | MAX_GAS_FEE                       | 100 gwei      | Bot will wait for a lower price. Treshold for gas_fee                                                                    |

poetry.lock

@@ -11,14 +11,14 @@ include = [
 package-mode = false
 
 [tool.poetry.dependencies]
-python = ">=3.10,<3.13"
+python = ">=3.12,<4.0"
 numpy = "1.26.4"
-prometheus-client = "0.20.0"
-web3-multi-provider = "^0.6.0"
+prometheus-client = "0.21.1"
+web3-multi-provider = { version = "^2.2.0", extras = ["metrics"] }
 schema = "^0.7.5"
 websocket-client = "^1.4.1"
 confluent-kafka = "^2.2.0"
-web3 = "^6.10.0"
+web3 = "^7.0.0"
 
 [tool.poetry.group.dev.dependencies]
 ruff = "^0.4.4"

pyproject.toml

@@ -6,6 +6,7 @@
 from eth_account.account import VRS
 from eth_typing import Hash32
 from transport.msg_types.deposit import DepositMessage
+from utils.bytes import from_hex_string_to_bytes
 from web3.contract.contract import ContractFunction
 
 logger = logging.getLogger(__name__)
@@ -37,8 +38,8 @@ def prepare_and_send(
 
     def _prepare_general_tx(self, quorum: list[DepositMessage]):
         block_number = quorum[0]['blockNumber']
-        block_hash = Hash32(bytes.fromhex(quorum[0]['blockHash'][2:]))
-        deposit_root = Hash32(bytes.fromhex(quorum[0]['depositRoot'][2:]))
+        block_hash = Hash32(from_hex_string_to_bytes(quorum[0]['blockHash']))
+        deposit_root = Hash32(from_hex_string_to_bytes(quorum[0]['depositRoot']))
         staking_module_id = quorum[0]['stakingModuleId']
         staking_module_nonce = quorum[0]['nonce']
         payload = b''

src/blockchain/deposit_strategy/deposit_transaction_sender.py

@@ -82,7 +82,7 @@ def _build_mev_send_bundle_params(self, tx: SignedTransaction, timeout_in_blocks
         """
         return [
             {
-                'tx': tx.rawTransaction.hex(),
+                'tx': tx.raw_transaction.hex(),
                 'maxBlockNumber': hex(self.w3.eth.get_block('pending')['number'] + timeout_in_blocks),
                 'preferences': {
                     'builders': [

src/blockchain/web3_extentions/middleware.py

@@ -118,7 +118,7 @@ def relay_send(self, signed_tx: SignedTransaction, timeout_in_blocks: int) -> bo
 
     def classic_send(self, signed_tx: SignedTransaction, timeout_in_blocks: int) -> bool:
         try:
-            tx_hash = self.w3.eth.send_raw_transaction(signed_tx.rawTransaction)
+            tx_hash = self.w3.eth.send_raw_transaction(signed_tx.raw_transaction)
         except Exception as error:
             logger.error({'msg': 'Transaction reverted.', 'value': str(error)})
             return False