Skip to content

Fix morphl2 bridge #301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ideal93 wants to merge 3 commits into
base: pre-release/v0.6.0
Choose a base branch
from
Open

Fix morphl2 bridge #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99753dc
Fix morphl2 bridge
ideal93 Dec 19, 2024
311dcfa
Fix
ideal93 Dec 19, 2024
6278030
Try Fix
ideal93 Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions common/utils/bridge_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Copy link
Contributor

@shanshuo0918 shanshuo0918 Dec 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why 1? not 0?

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"
Expand Down
2 changes: 2 additions & 0 deletions indexer/jobs/base_job.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
24 changes: 8 additions & 16 deletions indexer/modules/bridge/morphl2/abi/function.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
)

Expand All @@ -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,
),
)

Expand All @@ -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,
),
)

Expand All @@ -233,15 +230,14 @@ 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"]],
"amounts": [str(amount) for amount in x["_amounts"]],
},
},
_type=1,
data=bytes_to_hex_str(x["_data"]),
data=None,
),
)

Expand Down Expand Up @@ -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,
),
)

Expand All @@ -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,
),
)

Expand All @@ -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,
),
)

Expand All @@ -423,14 +416,13 @@ 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"]],
"amounts": [str(amount) for amount in x["_amounts"]],
},
},
_type=1,
data=bytes_to_hex_str(x["_data"]),
data=None,
),
)