Skip to content

[xc-admin-frontend] Fix race condition once and for all #847

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

Merged
merged 1 commit into from
May 27, 2023
Merged

[xc-admin-frontend] Fix race condition once and for all #847

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
65 changes: 33 additions & 32 deletions governance/xc_admin/packages/xc_admin_frontend/components/tabs/General.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,18 +324,16 @@ const General = ({ proposerServerUrl }: { proposerServerUrl: string }) => {
)

// create add publisher instruction if there are any publishers
if (newChanges.priceAccounts[0].publishers.length > 0) {
newChanges.priceAccounts[0].publishers.forEach(
(publisherKey: string) => {
pythProgramClient.methods
.addPublisher(new PublicKey(publisherKey))
.accounts({
fundingAccount,
priceAccount: priceAccountKey,
})
.instruction()
.then((instruction) => instructions.push(instruction))
}

for (let publisherKey of newChanges.priceAccounts[0].publishers) {
instructions.push(
await pythProgramClient.methods
.addPublisher(new PublicKey(publisherKey))
.accounts({
fundingAccount,
priceAccount: priceAccountKey,
})
.instruction()
)
}

Expand Down Expand Up @@ -438,28 +436,31 @@ const General = ({ proposerServerUrl }: { proposerServerUrl: string }) => {
)

// add instructions to remove publishers
publisherKeysToRemove.forEach((publisherKey: string) => {
pythProgramClient.methods
.delPublisher(new PublicKey(publisherKey))
.accounts({
fundingAccount,
priceAccount: new PublicKey(prev.priceAccounts[0].address),
})
.instruction()
.then((instruction) => instructions.push(instruction))
})

for (let publisherKey of publisherKeysToRemove) {
instructions.push(
await pythProgramClient.methods
.delPublisher(new PublicKey(publisherKey))
.accounts({
fundingAccount,
priceAccount: new PublicKey(prev.priceAccounts[0].address),
})
.instruction()
)
}

// add instructions to add new publishers
publisherKeysToAdd.forEach((publisherKey: string) => {
pythProgramClient.methods
.addPublisher(new PublicKey(publisherKey))
.accounts({
fundingAccount,
priceAccount: new PublicKey(prev.priceAccounts[0].address),
})
.instruction()
.then((instruction) => instructions.push(instruction))
})
for (let publisherKey of publisherKeysToAdd) {
instructions.push(
await pythProgramClient.methods
.addPublisher(new PublicKey(publisherKey))
.accounts({
fundingAccount,
priceAccount: new PublicKey(prev.priceAccounts[0].address),
})
.instruction()
)
}
}
}

Expand Down