Skip to content
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

Jump to bottom

Fix encode type for array types (Open Sea and Evmos governance site were affected) (uplift to 1.42.x) #14258

Merged
merged 1 commit into from
Jul 21, 2022
Merged

Fix encode type for array types (Open Sea and Evmos governance site were affected) (uplift to 1.42.x) #14258

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
12 changes: 10 additions & 2 deletions components/brave_wallet/common/eth_sign_typed_data_helper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,16 @@ void EthSignTypedDataHelper::FindAllDependencyTypes(

for (const auto& field : anchor_type->GetList()) {
const std::string* type = field.FindStringKey("type");
if (type && !known_types->contains(*type)) {
FindAllDependencyTypes(known_types, *type);
if (type) {
auto type_split = base::SplitString(*type, "[", base::KEEP_WHITESPACE,
base::SPLIT_WANT_ALL);
std::string lookup_type = *type;
if (type_split.size() == 2)
lookup_type = type_split[0];

if (!known_types->contains(lookup_type)) {
FindAllDependencyTypes(known_types, lookup_type);
}
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion components/brave_wallet/common/eth_sign_typed_data_helper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ class EthSignTypedDataHelper {
const base::Value& domain_separator) const;

private:
FRIEND_TEST_ALL_PREFIXES(EthSignedTypedDataHelperUnitTest, Types);
FRIEND_TEST_ALL_PREFIXES(EthSignedTypedDataHelperUnitTest, EncodeTypes);
FRIEND_TEST_ALL_PREFIXES(EthSignedTypedDataHelperUnitTest, EncodeTypesArrays);
FRIEND_TEST_ALL_PREFIXES(EthSignedTypedDataHelperUnitTest, EncodeField);

explicit EthSignTypedDataHelper(const base::Value& types, Version version);
Expand Down
36 changes: 35 additions & 1 deletion components/brave_wallet/common/eth_sign_typed_data_helper_unittest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

namespace brave_wallet {

TEST(EthSignedTypedDataHelperUnitTest, Types) {
TEST(EthSignedTypedDataHelperUnitTest, EncodeTypes) {
const std::string types_json(R"({
"Mail": [
{"name": "from", "type": "Person"},
Expand Down Expand Up @@ -52,6 +52,40 @@ TEST(EthSignedTypedDataHelperUnitTest, Types) {
EXPECT_EQ(typed_hash_v3, typed_hash_v4);
}

TEST(EthSignedTypedDataHelperUnitTest, EncodeTypesArrays) {
const std::string types_json(R"({
"Mail": [
{"name": "to", "type": "Person[]"},
],
"Person": [
{"name": "name", "type": "string"},
{"name": "wallet", "type": "address"}
]})");

auto types_value =
base::JSONReader::Read(types_json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
base::JSON_ALLOW_TRAILING_COMMAS);
ASSERT_TRUE(types_value);

std::unique_ptr<EthSignTypedDataHelper> helper =
EthSignTypedDataHelper::Create(*types_value,
EthSignTypedDataHelper::Version::kV4);
ASSERT_TRUE(helper);
const std::string encoded_types_v4 = helper->EncodeTypes("Mail");
EXPECT_EQ(encoded_types_v4,
"Mail(Person[] to)Person(string name,address wallet)");
auto typed_hash_v4 = helper->GetTypeHash("Mail");
EXPECT_EQ(base::ToLowerASCII(base::HexEncode(typed_hash_v4)),
"08dde06d30a2d7c005e313f9d36bef353674e06b4ae1a923fb086f2da5b40cce");

// v3 should be same as v4
helper->SetVersion(EthSignTypedDataHelper::Version::kV3);
const std::string encoded_types_v3 = helper->EncodeTypes("Mail");
EXPECT_EQ(encoded_types_v4, encoded_types_v3);
auto typed_hash_v3 = helper->GetTypeHash("Mail");
EXPECT_EQ(typed_hash_v3, typed_hash_v4);
}

TEST(EthSignedTypedDataHelperUnitTest, EncodedData) {
const std::string types_json(R"({
"Mail": [
Expand Down