diff --git a/common/utils/bridge_utils.py b/common/utils/bridge_utils.py index 86a1786b7..5a5c79d0a 100644 --- a/common/utils/bridge_utils.py +++ b/common/utils/bridge_utils.py @@ -240,6 +240,8 @@ def parse_bedrock_bridge_l2_to_l1_transaction(transaction, token_info, native_to def format_value(amount, decimals=18): + if amount is None: + return "1" """Function to format the value, handling decimal places.""" formatted_value = f"{amount / 10 ** decimals:.6f}".rstrip("0").rstrip(".") return formatted_value if formatted_value else "0" diff --git a/indexer/jobs/base_job.py b/indexer/jobs/base_job.py index 75a7aac40..961ac7a52 100644 --- a/indexer/jobs/base_job.py +++ b/indexer/jobs/base_job.py @@ -211,6 +211,8 @@ def _collect_domains(self, domains: List[Domain]): self._collect_domain(domain) def _update_domains(self, domains: List[Domain]): + if not domains: + return key = domains[0].type() self._data_buff[key] = domains diff --git a/indexer/modules/bridge/morphl2/abi/function.py b/indexer/modules/bridge/morphl2/abi/function.py index 911d14117..1a8116de0 100644 --- a/indexer/modules/bridge/morphl2/abi/function.py +++ b/indexer/modules/bridge/morphl2/abi/function.py @@ -138,11 +138,10 @@ def decode_function_input_data(self, data: str) -> DepositedTransaction: bridge_to_address=x["_to"], amount=1, extra_info={ - "data": bytes_to_hex_str(x["_data"]), "token": {"token_type": "ERC721", "token_ids": [str(x["_tokenId"])]}, }, _type=1, - data=bytes_to_hex_str(x["_data"]), + data=None, ), ) @@ -168,14 +167,13 @@ def decode_function_input_data(self, data: str) -> DepositedTransaction: bridge_to_address=x["_to"], amount=len(x["_tokenIds"]), extra_info={ - "data": bytes_to_hex_str(x["_data"]), "token": { "token_type": "ERC721", "token_ids": [str(token_id) for token_id in x["_tokenIds"]], }, }, _type=1, - data=bytes_to_hex_str(x["_data"]), + data=None, ), ) @@ -202,11 +200,10 @@ def decode_function_input_data(self, data: str) -> DepositedTransaction: bridge_to_address=x["_to"], amount=x["_amount"], extra_info={ - "data": bytes_to_hex_str(x["_data"]), "token": {"token_type": "ERC1155", "token_ids": [str(x["_tokenId"])], "amounts": [str(x["_amount"])]}, }, _type=1, - data=bytes_to_hex_str(x["_data"]), + data=None, ), ) @@ -233,7 +230,6 @@ def decode_function_input_data(self, data: str) -> DepositedTransaction: bridge_to_address=x["_to"], amount=sum(x["_amounts"]), extra_info={ - "data": bytes_to_hex_str(x["_data"]), "token": { "token_type": "ERC1155", "token_ids": [str(token_id) for token_id in x["_tokenIds"]], @@ -241,7 +237,7 @@ def decode_function_input_data(self, data: str) -> DepositedTransaction: }, }, _type=1, - data=bytes_to_hex_str(x["_data"]), + data=None, ), ) @@ -328,11 +324,10 @@ def decode_function_input_data(self, data: str) -> DepositedTransaction: bridge_to_address=x["_to"], amount=1, extra_info={ - "data": bytes_to_hex_str(x["_data"]), "token": {"token_type": "ERC721", "token_ids": [str(x["_tokenId"])]}, }, _type=1, - data=bytes_to_hex_str(x["_data"]), + data=None, ), ) @@ -358,14 +353,13 @@ def decode_function_input_data(self, data: str) -> DepositedTransaction: bridge_to_address=x["_to"], amount=len(x["_tokenIds"]), extra_info={ - "data": bytes_to_hex_str(x["_data"]), "token": { "token_type": "ERC721", "token_ids": [str(token_id) for token_id in x["_tokenIds"]], }, }, _type=1, - data=bytes_to_hex_str(x["_data"]), + data=None, ), ) @@ -392,11 +386,10 @@ def decode_function_input_data(self, data: str) -> DepositedTransaction: bridge_to_address=x["_to"], amount=x["_amount"], extra_info={ - "data": bytes_to_hex_str(x["_data"]), "token": {"token_type": "ERC1155", "token_ids": [str(x["_tokenId"])], "amounts": [str(x["_amount"])]}, }, _type=1, - data=bytes_to_hex_str(x["_data"]), + data=None, ), ) @@ -423,7 +416,6 @@ def decode_function_input_data(self, data: str) -> DepositedTransaction: bridge_to_address=x["_to"], amount=sum(x["_amounts"]), extra_info={ - "data": bytes_to_hex_str(x["_data"]), "token": { "token_type": "ERC1155", "token_ids": [str(token_id) for token_id in x["_tokenIds"]], @@ -431,6 +423,6 @@ def decode_function_input_data(self, data: str) -> DepositedTransaction: }, }, _type=1, - data=bytes_to_hex_str(x["_data"]), + data=None, ), )