Skip to content

Remove validator account from the QN #4915

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

Closed
chrlschwb wants to merge 10 commits into from
Closed

Remove validator account from the QN #4915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0acfb0e
update verify validator
chrlschwb Oct 9, 2023
21ec85c
fix lint
chrlschwb Oct 9, 2023
e04877d
update
chrlschwb Oct 9, 2023
90a5768
update fixed
chrlschwb Oct 9, 2023
2c1f33a
fix update
chrlschwb Oct 9, 2023
1c2268c
update
chrlschwb Oct 9, 2023
b6f070f
fix update
chrlschwb Oct 10, 2023
546553a
update
chrlschwb Oct 12, 2023
bfb028e
Apply suggestions from code review
chrlschwb Oct 12, 2023
62162d1
update
chrlschwb Oct 12, 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
10 changes: 0 additions & 10 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 @@ -2028,7 +2028,6 @@ type MemberMetadata implements BaseGraphQLObject {
member: Membership
externalResources: [MembershipExternalResource!]
isVerifiedValidator: Boolean
validatorAccount: String
membercreatedeventmetadata: [MemberCreatedEvent!]
memberinvitedeventmetadata: [MemberInvitedEvent!]
memberprofileupdatedeventnewMetadata: [MemberProfileUpdatedEvent!]
Expand Down Expand Up @@ -17726,11 +17725,6 @@ input MemberMetadataWhereInput {
about_in: [String!]
isVerifiedValidator_eq: Boolean
isVerifiedValidator_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 @@ -17764,15 +17758,13 @@ input MemberMetadataCreateInput {
avatar: JSONObject!
about: String
isVerifiedValidator: Boolean
validatorAccount: String
}

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

input MembershipGiftedEventWhereInput {
Expand Down Expand Up @@ -30477,8 +30469,6 @@ enum MemberMetadataOrderByInput {
about_DESC
isVerifiedValidator_ASC
isVerifiedValidator_DESC
validatorAccount_ASC
validatorAccount_DESC
}

enum MemberProfileUpdatedEventOrderByInput {
Expand Down
1 change: 0 additions & 1 deletion metadata-protobuf/proto/Membership.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ message MembershipMetadata {

repeated ExternalResource externalResources = 5;

optional string validatorAccount = 6;
}


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

await store.save<MemberMetadata>(metadataEntity)
Expand Down Expand Up @@ -332,13 +331,7 @@ export async function members_MemberProfileUpdated({ store, event }: EventContex
}
}

if (
typeof metadata?.validatorAccount === 'string' &&
metadata.validatorAccount !== member.metadata.validatorAccount
) {
member.metadata.validatorAccount = (metadata.validatorAccount || null) as string | undefined
member.metadata.isVerifiedValidator = false
}
member.metadata.isVerifiedValidator = false

if (newHandle.isSome) {
member.handle = bytesToString(newHandle.unwrap())
Expand Down
1 change: 0 additions & 1 deletion query-node/schemas/membership.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ type MemberMetadata @entity {
externalResources: [MembershipExternalResource] @derivedFrom(field: "memberMetadata")

isVerifiedValidator: Boolean
validatorAccount: String
}

type MembershipEntryPaid @variant {
Expand Down
10 changes: 0 additions & 10 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 @@ -2028,7 +2028,6 @@ type MemberMetadata implements BaseGraphQLObject {
member: Membership
externalResources: [MembershipExternalResource!]
isVerifiedValidator: Boolean
validatorAccount: String
membercreatedeventmetadata: [MemberCreatedEvent!]
memberinvitedeventmetadata: [MemberInvitedEvent!]
memberprofileupdatedeventnewMetadata: [MemberProfileUpdatedEvent!]
Expand Down Expand Up @@ -17726,11 +17725,6 @@ input MemberMetadataWhereInput {
about_in: [String!]
isVerifiedValidator_eq: Boolean
isVerifiedValidator_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 @@ -17764,15 +17758,13 @@ input MemberMetadataCreateInput {
avatar: JSONObject!
about: String
isVerifiedValidator: Boolean
validatorAccount: String
}

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

input MembershipGiftedEventWhereInput {
Expand Down Expand Up @@ -30477,8 +30469,6 @@ enum MemberMetadataOrderByInput {
about_DESC
isVerifiedValidator_ASC
isVerifiedValidator_DESC
validatorAccount_ASC
validatorAccount_DESC
}

enum MemberProfileUpdatedEventOrderByInput {
Expand Down
3 changes: 1 addition & 2 deletions tests/network-tests/src/fixtures/membership/GiftMembershipHappyCaseFixture.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export class GiftMembershipHappyCaseFixture extends StandardizedFixture {
handle,
rootAccount,
controllerAccount,
metadata: { name, about, avatar, externalResources, validatorAccount },
metadata: { name, about, avatar, externalResources },
isVerified,
isFoundingMember,
entry,
Expand All @@ -81,7 +81,6 @@ export class GiftMembershipHappyCaseFixture extends StandardizedFixture {
Utils.assert(entry.__typename === 'MembershipEntryGifted', 'Query node: Invalid membership entry method')
Utils.assert(entry.membershipGiftedEvent)
assert.equal(entry.membershipGiftedEvent.id, qEvent.id)
assert.equal(validatorAccount, metadata.validatorAccount)

@thesan thesan Oct 11, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

And here too

@chrlschwb chrlschwb Oct 13, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

here same

})
}

Expand Down
5 changes: 3 additions & 2 deletions tests/network-tests/src/fixtures/membership/InviteMembersHappyCaseFixture.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,21 +61,22 @@ export class InviteMembersHappyCaseFixture extends StandardizedFixture {
handle,
rootAccount,
controllerAccount,
metadata: { name, about, avatar, externalResources, validatorAccount },
metadata: { name, about, avatar, externalResources },
isVerified,
entry,
invitedBy,
inviteCount,
} = qMember
const metadata = Utils.metadataFromBytes(MembershipMetadata, txParams.metadata)

assert.equal(handle, txParams.handle)
assert.equal(rootAccount, txParams.root_account)
assert.equal(controllerAccount, txParams.controller_account)
assert.equal(name, metadata.name)
assert.equal(about, metadata.about)
assert.equal(inviteCount, 0)
assert.equal(avatar?.avatarUri, metadata.avatarUri || undefined)
assert.equal(validatorAccount, metadata.validatorAccount)

@thesan thesan Oct 11, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Please check assert.equal(metadata.isVerifiedValidator, false) here too

@chrlschwb chrlschwb Oct 13, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I can't add command. because isVerifiedValidator is not defined.


assert.includeDeepMembers(
externalResources ?? [],
metadata.externalResources?.map(asMembershipExternalResource) ?? []
Expand Down
6 changes: 0 additions & 6 deletions tests/network-tests/src/fixtures/membership/UpdateProfileHappyCaseFixture.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ export type MemberProfileData = {
about?: string | null
avatarUri?: string | null
externalResources?: MembershipMetadata.IExternalResource[] | null
validatorAccount?: string | null
}

export class UpdateProfileHappyCaseFixture extends BaseQueryNodeFixture {
Expand Down Expand Up @@ -57,7 +56,6 @@ export class UpdateProfileHappyCaseFixture extends BaseQueryNodeFixture {
)
assert.isFalse(Utils.hasDuplicates(metadata.externalResources?.map(({ type }) => type)))
assert.equal(metadata.isVerifiedValidator, false)

@thesan thesan Oct 11, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Please keep this assert.equal(metadata.isVerifiedValidator, false). Even though it doesn't mean what we thought it did, this value should still be set tofalse when any metadata changes.

assert.equal(metadata.validatorAccount, expected.validatorAccount)
}

public getExpectedValues(): MemberProfileData {
Expand All @@ -69,9 +67,6 @@ export class UpdateProfileHappyCaseFixture extends BaseQueryNodeFixture {
externalResources: isSet(this.newValues.externalResources)
? this.newValues.externalResources || null
: this.oldValues.externalResources,
validatorAccount: isSet(this.newValues.validatorAccount)
? this.newValues.validatorAccount || null
: this.oldValues.validatorAccount,
}
}

Expand Down Expand Up @@ -107,7 +102,6 @@ export class UpdateProfileHappyCaseFixture extends BaseQueryNodeFixture {
about: this.newValues.about,
avatarUri: this.newValues.avatarUri,
externalResources: this.newValues.externalResources,
validatorAccount: this.newValues.validatorAccount,
})
this.tx = this.api.tx.members.updateProfile(
this.memberContext.memberId,
Expand Down
9 changes: 4 additions & 5 deletions tests/network-tests/src/fixtures/membership/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ type MemberCreationParams = {
externalResources?: MembershipMetadata.IExternalResource[] | null
metadata: Bytes
is_founding_member: boolean
validatorAccount?: string
isVerifiedValidator: boolean
}

// Common code for Membership fixtures
Expand All @@ -34,15 +34,14 @@ export function generateParamsFromAccountId(accountId: string, isFoundingMember
value: `https://${affix}.com`,
},
]
const validatorAccount = `validator address`
const isVerifiedValidator = false

const metadataBytes = Utils.metadataToBytes(MembershipMetadata, {
name,
about,
avatarUri,
externalResources,
validatorAccount,
})

return {
root_account: accountId,
controller_account: accountId,
Expand All @@ -51,9 +50,9 @@ export function generateParamsFromAccountId(accountId: string, isFoundingMember
about,
avatarUri,
externalResources,
validatorAccount,
metadata: metadataBytes,
is_founding_member: isFoundingMember,
isVerifiedValidator,
}
}

Expand Down
2 changes: 0 additions & 2 deletions tests/network-tests/src/flows/membership/updatingProfile.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ export default async function updatingProfile({ api, query }: FlowProps): Promis
{
handle: 'New handle 1',
name: 'New name',
validatorAccount: 'validator address',
},
{
handle: 'New handle 2',
Expand All @@ -38,7 +37,6 @@ export default async function updatingProfile({ api, query }: FlowProps): Promis
value: 'A@example.com',
},
],
validatorAccount: '',
},
// Full update
{
Expand Down
1 change: 0 additions & 1 deletion tests/network-tests/src/graphql/queries/membership.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ fragment MemberMetadataFields on MemberMetadata {
value
}
isVerifiedValidator
validatorAccount
}

fragment MembershipFields on Membership {
Expand Down