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/4823 validator profile #4849

Merged
merged 52 commits into from
Sep 13, 2023
Merged

Fix/4823 validator profile #4849

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
03c6e81
fix update validator
chrlschwb Aug 29, 2023
e81b513
lint fix
chrlschwb Aug 29, 2023
ed17b5d
update validator
chrlschwb Aug 29, 2023
6e20a7a
isVerified is false
chrlschwb Aug 29, 2023
321aa4c
git error
chrlschwb Aug 29, 2023
0d88ad7
fix git error
chrlschwb Aug 30, 2023
da59458
TEST update|
chrlschwb Aug 30, 2023
a2eb659
pretter on network-test folder
chrlschwb Aug 30, 2023
0209d49
git fix test error
chrlschwb Aug 30, 2023
2fbcbd9
fix git
chrlschwb Aug 30, 2023
27dcd24
add commit for git error fix
chrlschwb Aug 30, 2023
e675f3a
test
chrlschwb Aug 30, 2023
578e849
test
chrlschwb Aug 30, 2023
de56562
profo file changed
chrlschwb Aug 30, 2023
031eea6
membership file change
chrlschwb Aug 30, 2023
bca92db
test
chrlschwb Aug 30, 2023
9631880
test
chrlschwb Aug 30, 2023
6360a23
update membership
chrlschwb Aug 31, 2023
582f8ca
update graphql file
chrlschwb Sep 1, 2023
609317c
fix mappings validator of membership
chrlschwb Sep 1, 2023
d937322
update test files
chrlschwb Sep 1, 2023
e9c4a6e
add test file
chrlschwb Sep 1, 2023
a1ac5aa
lint fix error
chrlschwb Sep 1, 2023
20c6695
fix error
chrlschwb Sep 1, 2023
a97377e
remove .env change
chrlschwb Sep 1, 2023
bf20c3c
test
chrlschwb Sep 3, 2023
7a03c0e
fix error
chrlschwb Sep 4, 2023
12ffd6d
fix lint error
chrlschwb Sep 4, 2023
e3f81be
test file changed
chrlschwb Sep 5, 2023
4eb8fed
fix lint error
chrlschwb Sep 5, 2023
af30676
replace yarn.lock
chrlschwb Sep 5, 2023
8e6bb26
readd validatorAccount test
chrlschwb Sep 6, 2023
66075aa
update metadata test file
chrlschwb Sep 6, 2023
5cffc23
fix error
chrlschwb Sep 7, 2023
38caf6e
fix error
chrlschwb Sep 7, 2023
75b2502
lint fix error
chrlschwb Sep 7, 2023
962ac30
fix membership test error
chrlschwb Sep 7, 2023
730e207
ont
chrlschwb Sep 7, 2023
cd8f4e5
test
chrlschwb Sep 7, 2023
eeb9fb1
test
chrlschwb Sep 7, 2023
1afca20
fix
chrlschwb Sep 7, 2023
bda7607
lock file gitignore
chrlschwb Sep 7, 2023
0b49b49
update
chrlschwb Sep 7, 2023
26eb57e
Merge branch 'fix/4823-validator' of https://github.com/chrlschwb/joy…
chrlschwb Sep 7, 2023
bdc3c8f
fix test error
chrlschwb Sep 8, 2023
b9ee09c
fix test error
chrlschwb Sep 8, 2023
5f8c523
test fix
chrlschwb Sep 8, 2023
dda8d15
Update tests/network-tests/src/fixtures/membership/utils.ts
chrlschwb Sep 8, 2023
b9a6763
update
chrlschwb Sep 8, 2023
837f7f1
Update tests/network-tests/src/flows/membership/updatingProfile.ts
chrlschwb Sep 8, 2023
3a2f203
ignore files
chrlschwb Sep 11, 2023
be58380
Merge branch 'fix/4823-validator' of https://github.com/chrlschwb/joy…
chrlschwb Sep 11, 2023
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
1 change: 1 addition & 0 deletions .yarnrc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodeLinker: node-modules
17 changes: 17 additions & 0 deletions distributor-node/src/services/networking/query-node/schema.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2024,6 +2024,8 @@ type MemberMetadata implements BaseGraphQLObject {
about: String
member: Membership
externalResources: [MembershipExternalResource!]
isVerified: Boolean!
validatorAccount: String!
membercreatedeventmetadata: [MemberCreatedEvent!]
memberinvitedeventmetadata: [MemberInvitedEvent!]
memberprofileupdatedeventnewMetadata: [MemberProfileUpdatedEvent!]
Expand Down Expand Up @@ -17711,6 +17713,13 @@ input MemberMetadataWhereInput {
about_startsWith: String
about_endsWith: String
about_in: [String!]
isVerified_eq: Boolean
isVerified_in: [Boolean!]
validatorAccount_eq: String
validatorAccount_contains: String
validatorAccount_startsWith: String
validatorAccount_endsWith: String
validatorAccount_in: [String!]
member: MembershipWhereInput
externalResources_none: MembershipExternalResourceWhereInput
externalResources_some: MembershipExternalResourceWhereInput
Expand Down Expand Up @@ -17743,12 +17752,16 @@ input MemberMetadataCreateInput {
name: String
avatar: JSONObject!
about: String
isVerified: Boolean!
validatorAccount: String!
}

input MemberMetadataUpdateInput {
name: String
avatar: JSONObject
about: String
isVerified: Boolean
validatorAccount: String
}

input MembershipGiftedEventWhereInput {
Expand Down Expand Up @@ -30451,6 +30464,10 @@ enum MemberMetadataOrderByInput {
name_DESC
about_ASC
about_DESC
isVerified_ASC
isVerified_DESC
validatorAccount_ASC
validatorAccount_DESC
}

enum MemberProfileUpdatedEventOrderByInput {
Expand Down
5 changes: 5 additions & 0 deletions metadata-protobuf/proto/Membership.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,9 @@ message MembershipMetadata {
optional string value = 2;
}
repeated ExternalResource externalResources = 5;

optional bool isVerified = 6;
optional string validatorAccount = 7;
}


6 changes: 5 additions & 1 deletion query-node/chain-metadata/1001.json
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion query-node/chain-metadata/2001.json
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions query-node/mappings/src/membership.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,8 @@ async function saveMembershipMetadata(
id: undefined,
avatar,
externalResources: undefined,
isVerified: false,
validatorAccount: metadata?.validatorAccount || undefined,
})

await store.save<MemberMetadata>(metadataEntity)
Expand Down Expand Up @@ -326,6 +328,11 @@ export async function members_MemberProfileUpdated({ store, event }: EventContex
}
}

if (typeof metadata?.validatorAccount === 'string') {
member.metadata.validatorAccount = (metadata.validatorAccount || null) as string
Copy link
Member

Choose a reason for hiding this comment

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

This could be:

Suggested change
if (typeof metadata?.validatorAccount === 'string') {
member.metadata.validatorAccount = (metadata.validatorAccount || null) as string
if (typeof metadata?.validatorAccount === 'string' && metadata.validatorAccount !== member.metadata.validatorAccount) {
member.metadata.validatorAccount = metadata.validatorAccount || undefined

To prevent resetting the verification by mistake when the same account is passed and to allow removing the validator account by passing an empty string.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

removing null creates error during membership update test where validatorAccount should be set to null

Copy link
Member

@thesan thesan Sep 8, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Nice catch ! I'm not sure of this but maybe null actually unset the value on hydra while undefined is ignored (I think I read an issue about something like that a while ago).

member.metadata.isVerified = false
}

if (newHandle.isSome) {
member.handle = bytesToString(newHandle.unwrap())
}
Expand Down
2 changes: 1 addition & 1 deletion query-node/schemas/content.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ type Channel @entity {

"List of all claimed rewards"
claimedRewards: [ChannelRewardClaimedEvent!] @derivedFrom(field: "channel")

"Number of videos ever created in this channel"
totalVideosCreated: Int!
}
Expand Down
3 changes: 3 additions & 0 deletions query-node/schemas/membership.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ type MemberMetadata @entity {

"Social media handles, email address..."
externalResources: [MembershipExternalResource] @derivedFrom(field: "memberMetadata")

isVerified: Boolean!
Copy link
Member

Choose a reason for hiding this comment

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

Since this is not in a separate entity anymore. Please rename it to something more explicit like isVerifiedValidator

validatorAccount: String!
}

type MembershipEntryPaid @variant {
Expand Down
17 changes: 17 additions & 0 deletions storage-node/src/services/queryNode/schema.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2024,6 +2024,8 @@ type MemberMetadata implements BaseGraphQLObject {
about: String
member: Membership
externalResources: [MembershipExternalResource!]
isVerified: Boolean!
validatorAccount: String!
membercreatedeventmetadata: [MemberCreatedEvent!]
memberinvitedeventmetadata: [MemberInvitedEvent!]
memberprofileupdatedeventnewMetadata: [MemberProfileUpdatedEvent!]
Expand Down Expand Up @@ -17711,6 +17713,13 @@ input MemberMetadataWhereInput {
about_startsWith: String
about_endsWith: String
about_in: [String!]
isVerified_eq: Boolean
isVerified_in: [Boolean!]
validatorAccount_eq: String
validatorAccount_contains: String
validatorAccount_startsWith: String
validatorAccount_endsWith: String
validatorAccount_in: [String!]
member: MembershipWhereInput
externalResources_none: MembershipExternalResourceWhereInput
externalResources_some: MembershipExternalResourceWhereInput
Expand Down Expand Up @@ -17743,12 +17752,16 @@ input MemberMetadataCreateInput {
name: String
avatar: JSONObject!
about: String
isVerified: Boolean!
validatorAccount: String!
}

input MemberMetadataUpdateInput {
name: String
avatar: JSONObject
about: String
isVerified: Boolean
validatorAccount: String
}

input MembershipGiftedEventWhereInput {
Expand Down Expand Up @@ -30451,6 +30464,10 @@ enum MemberMetadataOrderByInput {
name_DESC
about_ASC
about_DESC
isVerified_ASC
isVerified_DESC
validatorAccount_ASC
validatorAccount_DESC
}

enum MemberProfileUpdatedEventOrderByInput {
Expand Down
Loading