Compare commits

...

3 Commits

Author SHA1 Message Date
Fedor Ivanov f47f7b81e8
Apply suggestions 2024-03-12 11:43:51 +00:00
Fedor Ivanov 319a7950e8
Add regression test for `tuple` parsing 2024-03-12 11:40:13 +00:00
Fedor Ivanov 9beac096fc
Fix parsing tuples 2024-03-12 11:40:13 +00:00
2 changed files with 47 additions and 21 deletions

View File

@ -311,34 +311,28 @@ defmodule ABI.FunctionSelector do
end
end
@doc false
def parse_specification_type(%{"type" => "tuple", "components" => components}) do
sub_types = for component <- components, do: parse_specification_type(component)
defp replace_tuple({:array, inner}, sub_types) do
{:array, replace_tuple(inner, sub_types)}
end
defp replace_tuple({:array, inner, size}, sub_types) do
{:array, replace_tuple(inner, sub_types), size}
end
defp replace_tuple(:tuple, sub_types) do
{:tuple, sub_types}
end
def parse_specification_type(%{"type" => "tuple[]", "components" => components}) do
sub_types = for component <- components, do: parse_specification_type(component)
{:array, {:tuple, sub_types}}
defp replace_tuple(other, _) do
other
end
def parse_specification_type(%{"type" => "tuple[][]", "components" => components}) do
sub_types = for component <- components, do: parse_specification_type(component)
{:array, {:array, {:tuple, sub_types}}}
end
def parse_specification_type(%{
"type" => "tuple[" <> tail,
"components" => components
}) do
def parse_specification_type(%{"type" => "tuple" <> _ = type, "components" => components}) do
sub_types = for component <- components, do: parse_specification_type(component)
size =
tail
|> String.replace("]", "")
|> String.to_integer()
{:array, {:tuple, sub_types}, size}
type
|> decode_type()
|> replace_tuple(sub_types)
end
def parse_specification_type(%{"type" => type}), do: decode_type(type)

View File

@ -345,6 +345,38 @@ defmodule ABI.FunctionSelectorTest do
assert expected_type == selector.types
end
test "parses fixed 2D array of tuples" do
function = %{
"inputs" => [],
"name" => "createTupleArray",
"outputs" => [
%{
"components" => [
%{
"internalType" => "uint256",
"name" => "element1",
"type" => "uint256"
},
%{"internalType" => "bool", "name" => "element2", "type" => "bool"}
],
"internalType" => "struct StorageB.MyTuple[2][]",
"name" => "",
"type" => "tuple[2][]"
}
],
"stateMutability" => "pure",
"type" => "function"
}
expected = [
array: {:array, {:tuple, [{:uint, 256}, :bool]}, 2}
]
selector = FunctionSelector.parse_specification_item(function)
assert expected == selector.returns
end
test "with stateMutability set" do
~w(pure view nonpayable payable)
|> Enum.zip(~w(pure view non_payable payable)a)