Fix sender

lidofinance · Sep 4, 2024 · 9bf3920 · 9bf3920
1 parent f9796fc
commit 9bf3920
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 12 deletions.
diff --git a/src/transport/msg_providers/onchain_sender.py b/src/transport/msg_providers/onchain_sender.py
@@ -53,43 +53,43 @@ def send_pause_v2(self, pause_mes: PauseMessage):
             pause_mes['blockNumber'],
             pause_mes['blockHash'],
             pause_mes['stakingModuleId'],
-            pause_mes['app']['version'],
+            (pause_mes['app']['version'],),
         )
         mes = self._w3.codec.encode(
             types=[PAUSE_V2_DATA_SCHEMA],
-            args=[deposit_root, nonce, block_number, block_hash, self._DEFAULT_SIGNATURE, staking_module_id, app],
+            args=[(deposit_root, nonce, block_number, block_hash, self._DEFAULT_SIGNATURE, staking_module_id, app)],
         )
         tx = self._data_bus.functions.sendMessage(pause_topic, mes)
-        return self._w3.transaction.send(tx, False, 6)
+        return tx.transact()
 
     def send_pause_v3(self, pause_mes: PauseMessage):
         pause_topic = self._w3.keccak(text=OnchainTransportSinks.PAUSE_V3)
         block_number, version = pause_mes['blockNumber'], pause_mes['app']['version']
-        mes = self._w3.codec.encode(types=[PAUSE_V3_DATA_SCHEMA], args=[block_number, self._DEFAULT_SIGNATURE, version])
+        mes = self._w3.codec.encode(types=[PAUSE_V3_DATA_SCHEMA], args=[(block_number, self._DEFAULT_SIGNATURE, (version,))])
         tx = self._data_bus.functions.sendMessage(pause_topic, mes)
-        return self._w3.transaction.send(tx, False, 6)
+        return tx.transact()
 
     def send_unvet(self, unvet_mes: UnvetMessage):
         unvet_topic = self._w3.keccak(text=OnchainTransportSinks.UNVET_V1)
-        block_number, block_hash, staking_module_id, nonce, operator_ids, vetted_keys, version = (
+        nonce, block_number, block_hash, staking_module_id, operator_ids, vetted_keys, version = (
+            unvet_mes['nonce'],
             unvet_mes['blockNumber'],
             unvet_mes['blockHash'],
             unvet_mes['stakingModuleId'],
-            unvet_mes['nonce'],
             unvet_mes['operatorIds'],
             unvet_mes['vettedKeysByOperator'],
             unvet_mes['app']['version'],
         )
         mes = self._w3.codec.encode(
             types=[UNVET_V1_DATA_SCHEMA],
-            args=[block_number, block_hash, self._DEFAULT_SIGNATURE, staking_module_id, nonce, operator_ids, vetted_keys, (version,)],
+            args=[(nonce, block_number, block_hash, staking_module_id, self._DEFAULT_SIGNATURE, operator_ids, vetted_keys, (version,))],
         )
         tx = self._data_bus.functions.sendMessage(unvet_topic, mes)
-        return self._w3.transaction.send(tx, False, 6)
+        return tx.transact()
 
     def send_ping(self, ping_mes: PingMessage):
         ping_topic = self._w3.keccak(text=OnchainTransportSinks.PING_V1)
         block_number, version = ping_mes['blockNumber'], ping_mes['app']['version']
-        mes = self._w3.codec.encode(types=[PING_V1_DATA_SCHEMA], args=[block_number, (version,)])
+        mes = self._w3.codec.encode(types=[PING_V1_DATA_SCHEMA], args=[(block_number, (version,))])
         tx = self._data_bus.functions.sendMessage(ping_topic, mes)
-        return self._w3.transaction.send(tx, False, 6)
+        return tx.transact()
diff --git a/tests/transport/test_data_bus.py b/tests/transport/test_data_bus.py
@@ -14,7 +14,8 @@
     OnchainTransportSinks,
 )
 from transport.msg_types.deposit import DepositMessage, DepositMessageSchema
-from transport.msg_types.ping import PingMessageSchema
+from transport.msg_types.ping import PingMessage, PingMessageSchema
+from transport.msg_types.unvet import UnvetMessage
 from web3 import Web3
 from web3.types import EventData
 
@@ -51,6 +52,27 @@ def test_data_bus_provider(web3_transaction_integration):
             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])
     provider = OnchainTransportProvider(
         w3=web3_transaction_integration,