Version in onchain metrics

src/transport/msg_providers/onchain_transport.py

@@ -36,6 +36,10 @@
 }
 
 
+def _decode_version(version: bytes) -> str:
+    return version.decode('utf-8').rstrip('\x00')
+
+
 class EventParser(abc.ABC):
     """
     Abstract base class for parsing Ethereum event logs.
@@ -109,7 +113,7 @@ def __init__(self, w3: Web3):
         super().__init__(w3, self.DEPOSIT_V1_DATA_SCHEMA)
 
     def _create_message(self, parsed_data: tuple, guardian: str) -> DepositMessage:
-        block_number, block_hash, deposit_root, staking_module_id, nonce, (r, vs), app = parsed_data
+        block_number, block_hash, deposit_root, staking_module_id, nonce, (r, vs), (version,) = parsed_data
         return DepositMessage(
             type=MessageType.DEPOSIT,
             depositRoot=bytes_to_hex_string(deposit_root),
@@ -122,6 +126,9 @@ def _create_message(self, parsed_data: tuple, guardian: str) -> DepositMessage:
                 'r': bytes_to_hex_string(r),
                 '_vs': bytes_to_hex_string(vs),
             },
+            app={
+                'version': _decode_version(version),
+            },
         )
 
 
@@ -135,7 +142,7 @@ def __init__(self, w3: Web3):
         super().__init__(w3, self.UNVET_V1_DATA_SCHEMA)
 
     def _create_message(self, parsed_data: tuple, guardian: str) -> UnvetMessage:
-        block_number, block_hash, staking_module_id, nonce, operator_ids, vetted_keys_by_operator, (r, vs), app = parsed_data
+        block_number, block_hash, staking_module_id, nonce, operator_ids, vetted_keys_by_operator, (r, vs), (version,) = parsed_data
         return UnvetMessage(
             type=MessageType.UNVET,
             nonce=nonce,
@@ -148,6 +155,9 @@ def _create_message(self, parsed_data: tuple, guardian: str) -> UnvetMessage:
             },
             operatorIds=operator_ids,
             vettedKeysByOperator=vetted_keys_by_operator,
+            app={
+                'version': _decode_version(version),
+            },
         )
 
 
@@ -160,11 +170,14 @@ def __init__(self, w3: Web3):
         super().__init__(w3, self.PING_V1_DATA_SCHEMA)
 
     def _create_message(self, parsed_data: tuple, guardian: str) -> PingMessage:
-        block_number, app = parsed_data
+        block_number, (version,) = parsed_data
         return PingMessage(
             type=MessageType.PING,
             blockNumber=block_number,
             guardianAddress=guardian,
+            app={
+                'version': _decode_version(version),
+            },
         )
 
 
@@ -178,7 +191,7 @@ def __init__(self, w3: Web3):
         super().__init__(w3, self.PAUSE_V2_DATA_SCHEMA)
 
     def _create_message(self, parsed_data: tuple, guardian: str) -> dict:
-        block_number, block_hash, (r, vs), staking_module_id, app = parsed_data
+        block_number, block_hash, (r, vs), staking_module_id, (version,) = parsed_data
         return PauseMessage(
             type=MessageType.PAUSE,
             blockNumber=block_number,
@@ -188,6 +201,9 @@ def _create_message(self, parsed_data: tuple, guardian: str) -> dict:
                 'r': bytes_to_hex_string(r),
                 '_vs': bytes_to_hex_string(vs),
             },
+            app={
+                'version': _decode_version(version),
+            },
         )
 
 
@@ -201,7 +217,7 @@ def __init__(self, w3: Web3):
         super().__init__(w3, self.PAUSE_V3_DATA_SCHEMA)
 
     def _create_message(self, parsed_data: tuple, guardian: str) -> dict:
-        block_number, block_hash, (r, vs), app = parsed_data
+        block_number, block_hash, (r, vs), (version,) = parsed_data
         return PauseMessage(
             type=MessageType.PAUSE,
             blockNumber=block_number,
@@ -210,6 +226,9 @@ def _create_message(self, parsed_data: tuple, guardian: str) -> dict:
                 'r': r,
                 '_vs': vs,
             },
+            app={
+                'version': _decode_version(version),
+            },
         )
 
 

src/transport/msg_types/base.py

@@ -31,3 +31,4 @@ class Metadata(TypedDict):
     type: str
     transport: str
     chain_id: str
+    app: dict

src/variables.py

@@ -115,10 +115,12 @@
     'ACCOUNT': '' if ACCOUNT is None else ACCOUNT.address,
     'MELLOW_CONTRACT_ADDRESS': MELLOW_CONTRACT_ADDRESS,
     'VAULT_DIRECT_DEPOSIT_THRESHOLD': VAULT_DIRECT_DEPOSIT_THRESHOLD,
+    'ONCHAIN_TRANSPORT_ADDRESS': ONCHAIN_TRANSPORT_ADDRESS,
 }
 
 PRIVATE_ENV_VARS = {
     'WEB3_RPC_ENDPOINTS': WEB3_RPC_ENDPOINTS,
+    'ONCHAIN_TRANSPORT_RPC_ENDPOINTS': ONCHAIN_TRANSPORT_RPC_ENDPOINTS,
     'WALLET_PRIVATE_KEY': WALLET_PRIVATE_KEY,
     'RABBIT_MQ_URL': RABBIT_MQ_URL,
     'RABBIT_MQ_USERNAME': RABBIT_MQ_USERNAME,

tests/transport/test_data_bus.py

@@ -1,26 +1,21 @@
-from typing import cast
 from unittest import mock
 from unittest.mock import Mock
 
 import pytest
 import variables
-from blockchain.contracts.data_bus import DataBusContract
 from eth_typing import ChecksumAddress, HexAddress, HexStr
 from schema import Or, Schema
 from transport.msg_providers.onchain_transport import (
     DepositParser,
     OnchainTransportProvider,
     PingParser,
 )
-from transport.msg_types.deposit import DepositMessage, DepositMessageSchema
-from transport.msg_types.ping import PingMessage, PingMessageSchema
-from transport.msg_types.unvet import UnvetMessage
+from transport.msg_types.deposit import DepositMessageSchema
+from transport.msg_types.ping import PingMessageSchema
 from web3 import Web3
 from web3.types import EventData
 
-from tests.transport.onchain_sender import OnchainTransportSender
-
-_DEFAULT_GUARDIAN = '0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266'
+_DEFAULT_GUARDIAN = '0xf060ab3d5dCfdC6a0DFd5ca0645ac569b8f105CA'
 
 
 # Started with config: {
@@ -33,50 +28,7 @@ def test_data_bus_provider(web3_transaction_integration):
     Utilise this function for an adhoc testing of data bus transport
     """
     variables.ONCHAIN_TRANSPORT_RPC_ENDPOINTS = ['https://gnosis-chiado-rpc.publicnode.com']
-    variables.ONCHAIN_TRANSPORT_ADDRESS = ChecksumAddress(HexAddress(HexStr('0x42E1DEfC18388E3AA1fCADa851499A11405cf37f')))
-    data_bus_contract = cast(
-        DataBusContract,
-        web3_transaction_integration.eth.contract(
-            address=variables.ONCHAIN_TRANSPORT_ADDRESS,
-            ContractFactoryClass=DataBusContract,
-        ),
-    )
-
-    onchain_sender = OnchainTransportSender(w3=web3_transaction_integration, data_bus_contract=data_bus_contract)
-    onchain_sender.send_deposit(
-        deposit_mes=DepositMessage(
-            type='deposit',
-            depositRoot='0x0000000000000000000000000000000000000000000000000000000000000000',
-            nonce=40,
-            blockNumber=2,
-            blockHash='0x42eef33d13c4440627c3fab6e3abee85af796ae6f77dcade628b183640b519d0',
-            guardianAddress=_DEFAULT_GUARDIAN,
-            stakingModuleId=1,
-            app={'version': (1).to_bytes(32)},
-        )
-    )
-    onchain_sender.send_ping(
-        ping_mes=PingMessage(
-            type='ping',
-            blockNumber=2,
-            guardianAddress=_DEFAULT_GUARDIAN,
-            app={'version': (1).to_bytes(32)},
-        )
-    )
-    onchain_sender.send_unvet(
-        unvet_mes=UnvetMessage(
-            type='unvet',
-            blockNumber=2,
-            blockHash='0x42eef33d13c4440627c3fab6e3abee85af796ae6f77dcade628b183640b519d0',
-            guardianAddress=_DEFAULT_GUARDIAN,
-            stakingModuleId=1,
-            nonce=32,
-            operatorIds=bytes(32),
-            vettedKeysByOperator=bytes(32),
-            app={'version': (1).to_bytes(32)},
-        )
-    )
-    web3_transaction_integration.provider.make_request('anvil_mine', [10])
+    variables.ONCHAIN_TRANSPORT_ADDRESS = ChecksumAddress(HexAddress(HexStr('0x37De961D6bb5865867aDd416be07189D2Dd960e6')))
     provider = OnchainTransportProvider(
         w3=web3_transaction_integration,
         onchain_address=variables.ONCHAIN_TRANSPORT_ADDRESS,