diff --git a/distributor-node/src/services/networking/query-node/schema.graphql b/distributor-node/src/services/networking/query-node/schema.graphql index 8fd682617b..236286bdd8 100644 --- a/distributor-node/src/services/networking/query-node/schema.graphql +++ b/distributor-node/src/services/networking/query-node/schema.graphql @@ -2028,7 +2028,6 @@ type MemberMetadata implements BaseGraphQLObject { member: Membership externalResources: [MembershipExternalResource!] isVerifiedValidator: Boolean - validatorAccount: String membercreatedeventmetadata: [MemberCreatedEvent!] memberinvitedeventmetadata: [MemberInvitedEvent!] memberprofileupdatedeventnewMetadata: [MemberProfileUpdatedEvent!] @@ -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 @@ -17764,7 +17758,6 @@ input MemberMetadataCreateInput { avatar: JSONObject! about: String isVerifiedValidator: Boolean - validatorAccount: String } input MemberMetadataUpdateInput { @@ -17772,7 +17765,6 @@ input MemberMetadataUpdateInput { avatar: JSONObject about: String isVerifiedValidator: Boolean - validatorAccount: String } input MembershipGiftedEventWhereInput { @@ -30477,8 +30469,6 @@ enum MemberMetadataOrderByInput { about_DESC isVerifiedValidator_ASC isVerifiedValidator_DESC - validatorAccount_ASC - validatorAccount_DESC } enum MemberProfileUpdatedEventOrderByInput { diff --git a/metadata-protobuf/proto/Membership.proto b/metadata-protobuf/proto/Membership.proto index cda8600b36..c4acad7d58 100644 --- a/metadata-protobuf/proto/Membership.proto +++ b/metadata-protobuf/proto/Membership.proto @@ -28,7 +28,6 @@ message MembershipMetadata { repeated ExternalResource externalResources = 5; - optional string validatorAccount = 6; } diff --git a/query-node/mappings/src/membership.ts b/query-node/mappings/src/membership.ts index cd99d3b53c..b41d356d61 100644 --- a/query-node/mappings/src/membership.ts +++ b/query-node/mappings/src/membership.ts @@ -159,7 +159,6 @@ async function saveMembershipMetadata( avatar, externalResources: undefined, isVerifiedValidator: false, - validatorAccount: metadata?.validatorAccount || undefined, }) await store.save(metadataEntity) @@ -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()) diff --git a/query-node/schemas/membership.graphql b/query-node/schemas/membership.graphql index c517130e4c..6e124bd733 100644 --- a/query-node/schemas/membership.graphql +++ b/query-node/schemas/membership.graphql @@ -49,7 +49,6 @@ type MemberMetadata @entity { externalResources: [MembershipExternalResource] @derivedFrom(field: "memberMetadata") isVerifiedValidator: Boolean - validatorAccount: String } type MembershipEntryPaid @variant { diff --git a/storage-node/src/services/queryNode/schema.graphql b/storage-node/src/services/queryNode/schema.graphql index 8fd682617b..236286bdd8 100644 --- a/storage-node/src/services/queryNode/schema.graphql +++ b/storage-node/src/services/queryNode/schema.graphql @@ -2028,7 +2028,6 @@ type MemberMetadata implements BaseGraphQLObject { member: Membership externalResources: [MembershipExternalResource!] isVerifiedValidator: Boolean - validatorAccount: String membercreatedeventmetadata: [MemberCreatedEvent!] memberinvitedeventmetadata: [MemberInvitedEvent!] memberprofileupdatedeventnewMetadata: [MemberProfileUpdatedEvent!] @@ -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 @@ -17764,7 +17758,6 @@ input MemberMetadataCreateInput { avatar: JSONObject! about: String isVerifiedValidator: Boolean - validatorAccount: String } input MemberMetadataUpdateInput { @@ -17772,7 +17765,6 @@ input MemberMetadataUpdateInput { avatar: JSONObject about: String isVerifiedValidator: Boolean - validatorAccount: String } input MembershipGiftedEventWhereInput { @@ -30477,8 +30469,6 @@ enum MemberMetadataOrderByInput { about_DESC isVerifiedValidator_ASC isVerifiedValidator_DESC - validatorAccount_ASC - validatorAccount_DESC } enum MemberProfileUpdatedEventOrderByInput { diff --git a/tests/network-tests/src/fixtures/membership/GiftMembershipHappyCaseFixture.ts b/tests/network-tests/src/fixtures/membership/GiftMembershipHappyCaseFixture.ts index a9e0edd29a..989a098b6e 100644 --- a/tests/network-tests/src/fixtures/membership/GiftMembershipHappyCaseFixture.ts +++ b/tests/network-tests/src/fixtures/membership/GiftMembershipHappyCaseFixture.ts @@ -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, @@ -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) }) } diff --git a/tests/network-tests/src/fixtures/membership/InviteMembersHappyCaseFixture.ts b/tests/network-tests/src/fixtures/membership/InviteMembersHappyCaseFixture.ts index 07252bb128..05bbe2de70 100644 --- a/tests/network-tests/src/fixtures/membership/InviteMembersHappyCaseFixture.ts +++ b/tests/network-tests/src/fixtures/membership/InviteMembersHappyCaseFixture.ts @@ -61,13 +61,14 @@ 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) @@ -75,7 +76,7 @@ export class InviteMembersHappyCaseFixture extends StandardizedFixture { assert.equal(about, metadata.about) assert.equal(inviteCount, 0) assert.equal(avatar?.avatarUri, metadata.avatarUri || undefined) - assert.equal(validatorAccount, metadata.validatorAccount) + assert.includeDeepMembers( externalResources ?? [], metadata.externalResources?.map(asMembershipExternalResource) ?? [] diff --git a/tests/network-tests/src/fixtures/membership/UpdateProfileHappyCaseFixture.ts b/tests/network-tests/src/fixtures/membership/UpdateProfileHappyCaseFixture.ts index 859be58afd..c7afd88d9a 100644 --- a/tests/network-tests/src/fixtures/membership/UpdateProfileHappyCaseFixture.ts +++ b/tests/network-tests/src/fixtures/membership/UpdateProfileHappyCaseFixture.ts @@ -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 { @@ -57,7 +56,6 @@ export class UpdateProfileHappyCaseFixture extends BaseQueryNodeFixture { ) assert.isFalse(Utils.hasDuplicates(metadata.externalResources?.map(({ type }) => type))) assert.equal(metadata.isVerifiedValidator, false) - assert.equal(metadata.validatorAccount, expected.validatorAccount) } public getExpectedValues(): MemberProfileData { @@ -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, } } @@ -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, diff --git a/tests/network-tests/src/fixtures/membership/utils.ts b/tests/network-tests/src/fixtures/membership/utils.ts index e199e637eb..4ec3a1c621 100644 --- a/tests/network-tests/src/fixtures/membership/utils.ts +++ b/tests/network-tests/src/fixtures/membership/utils.ts @@ -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 @@ -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, @@ -51,9 +50,9 @@ export function generateParamsFromAccountId(accountId: string, isFoundingMember about, avatarUri, externalResources, - validatorAccount, metadata: metadataBytes, is_founding_member: isFoundingMember, + isVerifiedValidator, } } diff --git a/tests/network-tests/src/flows/membership/updatingProfile.ts b/tests/network-tests/src/flows/membership/updatingProfile.ts index 385a210740..40f1174949 100644 --- a/tests/network-tests/src/flows/membership/updatingProfile.ts +++ b/tests/network-tests/src/flows/membership/updatingProfile.ts @@ -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', @@ -38,7 +37,6 @@ export default async function updatingProfile({ api, query }: FlowProps): Promis value: 'A@example.com', }, ], - validatorAccount: '', }, // Full update { diff --git a/tests/network-tests/src/graphql/queries/membership.graphql b/tests/network-tests/src/graphql/queries/membership.graphql index 77f0a197f8..b06e592bcd 100644 --- a/tests/network-tests/src/graphql/queries/membership.graphql +++ b/tests/network-tests/src/graphql/queries/membership.graphql @@ -11,7 +11,6 @@ fragment MemberMetadataFields on MemberMetadata { value } isVerifiedValidator - validatorAccount } fragment MembershipFields on Membership {