Skip to content

fix: preserve array suffix for tuple[] types in abi encoding #589

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
gosuto-inzasheru wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: preserve array suffix for tuple[] types in abi encoding #589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions src/safe_cli/tx_builder/tx_builder_file_decoder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,16 @@ def _parse_types_to_encoding_types(contract_fields: List[Dict[str, Any]]) -> Lis
types = []

for field in contract_fields:
if is_tuple_field_type(field["type"]):
field_type = field["type"]
if is_tuple_field_type(field_type):
component_types = ",".join(
component["type"] for component in field["components"]
)
types.append(f"({component_types})")
# preserve array suffix (e.g., "[]" for tuple[], "[5]" for tuple[5])
suffix = field_type[5:] # everything after "tuple"
types.append(f"({component_types}){suffix}")
else:
types.append(field["type"])
types.append(field_type)

return types

Expand Down
18 changes: 18 additions & 0 deletions tests/test_tx_builder_file_decoder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
from safe_cli.tx_builder.tx_builder_file_decoder import (
SafeProposedTx,
_get_base_field_type,
_parse_types_to_encoding_types,
convert_to_proposed_transactions,
encode_contract_method_to_hex_data,
parse_array_of_values,
Expand Down Expand Up @@ -78,6 +79,23 @@ def test_get_base_field_type(self):
with self.assertRaises(SoliditySyntaxError):
_get_base_field_type("")

def test_parse_types_to_encoding_types_tuple_array(self):
contract_fields = [
{
"type": "tuple[]",
"name": "ops",
"components": [
{"type": "uint8", "name": "kind"},
{"type": "address", "name": "asset"},
{"type": "uint256", "name": "amount"},
{"type": "address", "name": "sender"},
{"type": "address", "name": "recipient"},
],
}
]
result = _parse_types_to_encoding_types(contract_fields)
self.assertEqual(result, ["(uint8,address,uint256,address,address)[]"])

def test_parse_array_of_values(self):
self.assertEqual(parse_array_of_values("[1,2,3]", "uint[]"), [1, 2, 3])
self.assertEqual(
Expand Down