diff --git a/operate/bridge/providers/native_bridge_provider.py b/operate/bridge/providers/native_bridge_provider.py index 016f01f4..1fcf5431 100644 --- a/operate/bridge/providers/native_bridge_provider.py +++ b/operate/bridge/providers/native_bridge_provider.py @@ -364,7 +364,7 @@ def find_bridge_finalized_tx( def get_message_id( self, from_ledger_api: LedgerApi, bridge_request: BridgeRequest - ) -> t.Optional[bytes]: + ) -> t.Optional[str]: """Get the bridge message id.""" if not bridge_request.execution_data: return None @@ -406,7 +406,9 @@ def get_explorer_link( message_id = self.get_message_id(from_ledger_api, bridge_request) if not message_id: return None - return f"https://bridge.gnosischain.com/bridge-explorer/transaction/0x{message_id.hex()}" + return ( + f"https://bridge.gnosischain.com/bridge-explorer/transaction/{message_id}" + ) class NativeBridgeProvider(BridgeProvider): diff --git a/operate/data/contracts/foreign_omnibridge/contract.py b/operate/data/contracts/foreign_omnibridge/contract.py index a1d8d354..2fd66b37 100644 --- a/operate/data/contracts/foreign_omnibridge/contract.py +++ b/operate/data/contracts/foreign_omnibridge/contract.py @@ -109,7 +109,7 @@ def get_tokens_bridging_initiated_message_id( sender: str, value: int, raise_on_try: bool = False, - ) -> Optional[bytes]: + ) -> Optional[str]: """Get the 'messageId' for the matching 'TokensBridgingInitiated' within the transaction 'tx_hash'.""" contract_instance = cls.get_instance( ledger_api=ledger_api, contract_address=contract_address @@ -125,6 +125,6 @@ def get_tokens_bridging_initiated_message_id( and args["sender"].lower() == sender.lower() and int(args["value"]) == value ): - return args["messageId"] + return "0x" + args["messageId"].hex() return None diff --git a/operate/data/contracts/foreign_omnibridge/contract.yaml b/operate/data/contracts/foreign_omnibridge/contract.yaml index 2d3dcfed..aedb2d48 100644 --- a/operate/data/contracts/foreign_omnibridge/contract.yaml +++ b/operate/data/contracts/foreign_omnibridge/contract.yaml @@ -8,7 +8,7 @@ aea_version: '>=1.0.0, <2.0.0' fingerprint: __init__.py: bafybeibsmumov3s36vfo24xp2niilcp3ywju2d4yqfadllyjncqtgtndly build/ForeignOmnibridge.json: bafybeibmcflt7w5p5szgii7glbtrvjahweclowz2k7e6qjq7yfbvszy6em - contract.py: bafybeihywi67spsgsmcbqgjrcqlwgiq2e36ymssznqubfxwedforxek4ri + contract.py: bafybeicyccimmstipoba3irqzpyfntxnpvfvgrxsnihygbs7xln5l6auma fingerprint_ignore_patterns: [] contracts: [] class_name: ForeignOmnibridge diff --git a/operate/data/contracts/home_omnibridge/contract.py b/operate/data/contracts/home_omnibridge/contract.py index bf2080ce..5f8fb44c 100644 --- a/operate/data/contracts/home_omnibridge/contract.py +++ b/operate/data/contracts/home_omnibridge/contract.py @@ -43,7 +43,7 @@ def find_tokens_bridged_tx( token: str, recipient: str, value: int, - message_id: bytes, + message_id: str, from_block: BlockIdentifier = "earliest", to_block: BlockIdentifier = "latest", ) -> Optional[str]: @@ -56,7 +56,7 @@ def find_tokens_bridged_tx( event_signature_hash, # TokensBridged "0x" + token.lower()[2:].rjust(64, "0"), # token "0x" + recipient.lower()[2:].rjust(64, "0"), # recipient - "0x" + message_id.hex().rjust(64, "0"), # messageId + "0x" + message_id.lower()[2:].rjust(64, "0"), # messageId ] non_indexed_types = ["uint256"] non_indexed_values = [ diff --git a/operate/data/contracts/home_omnibridge/contract.yaml b/operate/data/contracts/home_omnibridge/contract.yaml index a628b2fd..fd727ba4 100644 --- a/operate/data/contracts/home_omnibridge/contract.yaml +++ b/operate/data/contracts/home_omnibridge/contract.yaml @@ -8,7 +8,7 @@ aea_version: '>=1.0.0, <2.0.0' fingerprint: __init__.py: bafybeigrlrmwk3dhnoe4o5ovygtmudik7ybhsx2etqqjpvdi65rtlfpuhe build/HomeOmnibridge.json: bafybeihm4ff4mhoca2iwcogg5srqe2x6p674uxxc3v5dcci4emxfgc7qpm - contract.py: bafybeignqvstktpvbliopzztan4a46crvf3ig5o4yt4fxhjpgljtlyrzga + contract.py: bafybeifitn7z4oqvycixw56lvrzvifydqyhwtph3nlaivzcm22ogn4rmfq fingerprint_ignore_patterns: [] contracts: [] class_name: HomeOmnibridge