Skip to content

Commit 13e48bd

Browse files
guibescosguibescos
authored
Renames (#581)
1 parent f3925b4 commit 13e48bd

File tree

7 files changed

+45
-44
lines changed

7 files changed

+45
-44
lines changed

‎governance/xc_admin/packages/xc_admin_frontend/components/tabs/AddRemovePublishers.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import toast from 'react-hot-toast'
1212
import { getMultisigCluster, proposeInstructions } from 'xc_admin_common'
1313
import { ClusterContext } from '../../contexts/ClusterContext'
1414
import { usePythContext } from '../../contexts/PythContext'
15-
import { SECURITY_MULTISIG, useMultisig } from '../../hooks/useMultisig'
15+
import { PRICE_FEED_MULTISIG, useMultisig } from '../../hooks/useMultisig'
1616
import { capitalizeFirstLetter } from '../../utils/capitalizeFirstLetter'
1717
import ClusterSwitch from '../ClusterSwitch'
1818
import Modal from '../common/Modal'
@@ -189,7 +189,7 @@ const AddRemovePublishers = () => {
189189
.addPublisher(new PublicKey(publisherKey))
190190
.accounts({
191191
fundingAccount: squads?.getAuthorityPDA(
192-
SECURITY_MULTISIG[getMultisigCluster(cluster)],
192+
PRICE_FEED_MULTISIG[getMultisigCluster(cluster)],
193193
1
194194
),
195195
priceAccount: new PublicKey(
@@ -205,7 +205,7 @@ const AddRemovePublishers = () => {
205205
.delPublisher(new PublicKey(publisherKey))
206206
.accounts({
207207
fundingAccount: squads?.getAuthorityPDA(
208-
SECURITY_MULTISIG[getMultisigCluster(cluster)],
208+
PRICE_FEED_MULTISIG[getMultisigCluster(cluster)],
209209
1
210210
),
211211
priceAccount: new PublicKey(
@@ -221,7 +221,7 @@ const AddRemovePublishers = () => {
221221
try {
222222
const proposalPubkey = await proposeInstructions(
223223
squads,
224-
SECURITY_MULTISIG[getMultisigCluster(cluster)],
224+
PRICE_FEED_MULTISIG[getMultisigCluster(cluster)],
225225
instructions,
226226
false
227227
)

‎governance/xc_admin/packages/xc_admin_frontend/components/tabs/General.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {
1616
} from 'xc_admin_common'
1717
import { ClusterContext } from '../../contexts/ClusterContext'
1818
import { usePythContext } from '../../contexts/PythContext'
19-
import { SECURITY_MULTISIG, useMultisig } from '../../hooks/useMultisig'
19+
import { PRICE_FEED_MULTISIG, useMultisig } from '../../hooks/useMultisig'
2020
import { capitalizeFirstLetter } from '../../utils/capitalizeFirstLetter'
2121
import ClusterSwitch from '../ClusterSwitch'
2222
import Modal from '../common/Modal'
@@ -248,7 +248,7 @@ const General = () => {
248248
const instructions: TransactionInstruction[] = []
249249
Object.keys(dataChanges).forEach(async (symbol) => {
250250
const multisigAuthority = squads.getAuthorityPDA(
251-
SECURITY_MULTISIG[getMultisigCluster(cluster)],
251+
PRICE_FEED_MULTISIG[getMultisigCluster(cluster)],
252252
1
253253
)
254254
const fundingAccount = isRemote
@@ -404,7 +404,7 @@ const General = () => {
404404
try {
405405
const proposalPubkey = await proposeInstructions(
406406
squads,
407-
SECURITY_MULTISIG[getMultisigCluster(cluster)],
407+
PRICE_FEED_MULTISIG[getMultisigCluster(cluster)],
408408
instructions,
409409
isRemote,
410410
wormholeAddress

‎governance/xc_admin/packages/xc_admin_frontend/components/tabs/MinPublishers.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import toast from 'react-hot-toast'
1818
import { getMultisigCluster, proposeInstructions } from 'xc_admin_common'
1919
import { ClusterContext } from '../../contexts/ClusterContext'
2020
import { usePythContext } from '../../contexts/PythContext'
21-
import { SECURITY_MULTISIG, useMultisig } from '../../hooks/useMultisig'
21+
import { PRICE_FEED_MULTISIG, useMultisig } from '../../hooks/useMultisig'
2222
import { capitalizeFirstLetter } from '../../utils/capitalizeFirstLetter'
2323
import ClusterSwitch from '../ClusterSwitch'
2424
import Modal from '../common/Modal'
@@ -178,7 +178,7 @@ const MinPublishers = () => {
178178
.accounts({
179179
priceAccount: priceAccountPubkey,
180180
fundingAccount: squads?.getAuthorityPDA(
181-
SECURITY_MULTISIG[getMultisigCluster(cluster)],
181+
PRICE_FEED_MULTISIG[getMultisigCluster(cluster)],
182182
1
183183
),
184184
})
@@ -190,7 +190,7 @@ const MinPublishers = () => {
190190
try {
191191
const proposalPubkey = await proposeInstructions(
192192
squads,
193-
SECURITY_MULTISIG[getMultisigCluster(cluster)],
193+
PRICE_FEED_MULTISIG[getMultisigCluster(cluster)],
194194
instructions,
195195
false
196196
)

‎governance/xc_admin/packages/xc_admin_frontend/components/tabs/Proposals.tsx‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ const Proposal = ({
152152
const handleClickApprove = async () => {
153153
if (proposal && squads) {
154154
try {
155+
console.log(squads.wallet.publicKey.toBase58())
155156
await squads.approveTransaction(proposal.publicKey)
156157
toast.success(`Approved proposal ${proposal.publicKey.toBase58()}`)
157158
} catch (e: any) {
@@ -769,8 +770,8 @@ const Proposals = () => {
769770
const [currentProposal, setCurrentProposal] = useState<TransactionAccount>()
770771
const [currentProposalPubkey, setCurrentProposalPubkey] = useState<string>()
771772
const {
772-
securityMultisigAccount,
773-
securityMultisigProposals,
773+
priceFeedMultisigAccount,
774+
priceFeedMultisigProposals,
774775
isLoading: isMultisigLoading,
775776
} = useMultisigContext()
776777
const { connected } = useWallet()
@@ -795,12 +796,12 @@ const Proposals = () => {
795796

796797
useEffect(() => {
797798
if (currentProposalPubkey) {
798-
const currentProposal = securityMultisigProposals.find(
799+
const currentProposal = priceFeedMultisigProposals.find(
799800
(proposal) => proposal.publicKey.toBase58() === currentProposalPubkey
800801
)
801802
setCurrentProposal(currentProposal)
802803
}
803-
}, [currentProposalPubkey, securityMultisigProposals])
804+
}, [currentProposalPubkey, priceFeedMultisigProposals])
804805

805806
return (
806807
<div className="relative">
@@ -824,9 +825,9 @@ const Proposals = () => {
824825
<div className="mt-3">
825826
<Loadbar theme="light" />
826827
</div>
827-
) : securityMultisigProposals.length > 0 ? (
828+
) : priceFeedMultisigProposals.length > 0 ? (
828829
<div className="flex flex-col">
829-
{securityMultisigProposals.map((proposal, idx) => (
830+
{priceFeedMultisigProposals.map((proposal, idx) => (
830831
<ProposalRow
831832
key={idx}
832833
proposal={proposal}
@@ -835,7 +836,7 @@ const Proposals = () => {
835836
))}
836837
</div>
837838
) : (
838-
"No proposals found. If you're a member of the security multisig, you can create a proposal."
839+
"No proposals found. If you're a member of the price feed multisig, you can create a proposal."
839840
)}
840841
</div>
841842
</>
@@ -850,7 +851,7 @@ const Proposals = () => {
850851
<div className="relative mt-6">
851852
<Proposal
852853
proposal={currentProposal}
853-
multisig={securityMultisigAccount}
854+
multisig={priceFeedMultisigAccount}
854855
/>
855856
</div>
856857
</>

‎governance/xc_admin/packages/xc_admin_frontend/components/tabs/UpdateProductMetadata.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import toast from 'react-hot-toast'
1313
import { getMultisigCluster, proposeInstructions } from 'xc_admin_common'
1414
import { ClusterContext } from '../../contexts/ClusterContext'
1515
import { usePythContext } from '../../contexts/PythContext'
16-
import { SECURITY_MULTISIG, useMultisig } from '../../hooks/useMultisig'
16+
import { PRICE_FEED_MULTISIG, useMultisig } from '../../hooks/useMultisig'
1717
import { capitalizeFirstLetter } from '../../utils/capitalizeFirstLetter'
1818
import ClusterSwitch from '../ClusterSwitch'
1919
import Modal from '../common/Modal'
@@ -197,7 +197,7 @@ const UpdateProductMetadata = () => {
197197
.updProduct(newProductMetadata)
198198
.accounts({
199199
fundingAccount: squads?.getAuthorityPDA(
200-
SECURITY_MULTISIG[getMultisigCluster(cluster)],
200+
PRICE_FEED_MULTISIG[getMultisigCluster(cluster)],
201201
1
202202
),
203203
productAccount: symbolToProductAccountKeyMapping[symbol],
@@ -212,7 +212,7 @@ const UpdateProductMetadata = () => {
212212
try {
213213
const proposalPubkey = await proposeInstructions(
214214
squads,
215-
SECURITY_MULTISIG[getMultisigCluster(cluster)],
215+
PRICE_FEED_MULTISIG[getMultisigCluster(cluster)],
216216
instructions,
217217
false
218218
)

‎governance/xc_admin/packages/xc_admin_frontend/contexts/MultisigContext.tsx‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ interface MultisigContextProps {
1111
error: any // TODO: fix any
1212
squads: SquadsMesh | undefined
1313
upgradeMultisigAccount: MultisigAccount | undefined
14-
securityMultisigAccount: MultisigAccount | undefined
14+
priceFeedMultisigAccount: MultisigAccount | undefined
1515
upgradeMultisigProposals: TransactionAccount[]
16-
securityMultisigProposals: TransactionAccount[]
16+
priceFeedMultisigProposals: TransactionAccount[]
1717
}
1818

1919
const MultisigContext = createContext<MultisigContextProps>({
2020
upgradeMultisigAccount: undefined,
21-
securityMultisigAccount: undefined,
21+
priceFeedMultisigAccount: undefined,
2222
upgradeMultisigProposals: [],
23-
securityMultisigProposals: [],
23+
priceFeedMultisigProposals: [],
2424
isLoading: true,
2525
error: null,
2626
squads: undefined,
@@ -41,17 +41,17 @@ export const MultisigContextProvider: React.FC<
4141
error,
4242
squads,
4343
upgradeMultisigAccount,
44-
securityMultisigAccount,
44+
priceFeedMultisigAccount,
4545
upgradeMultisigProposals,
46-
securityMultisigProposals,
46+
priceFeedMultisigProposals,
4747
} = useMultisig(anchorWallet as Wallet)
4848

4949
const value = useMemo(
5050
() => ({
5151
upgradeMultisigAccount,
52-
securityMultisigAccount,
52+
priceFeedMultisigAccount,
5353
upgradeMultisigProposals,
54-
securityMultisigProposals,
54+
priceFeedMultisigProposals,
5555
isLoading,
5656
error,
5757
squads,
@@ -61,9 +61,9 @@ export const MultisigContextProvider: React.FC<
6161
isLoading,
6262
error,
6363
upgradeMultisigAccount,
64-
securityMultisigAccount,
64+
priceFeedMultisigAccount,
6565
upgradeMultisigProposals,
66-
securityMultisigProposals,
66+
priceFeedMultisigProposals,
6767
]
6868
)
6969

‎governance/xc_admin/packages/xc_admin_frontend/hooks/useMultisig.ts‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export const UPGRADE_MULTISIG: Record<Cluster | 'localnet', PublicKey> = {
1414
localnet: new PublicKey('FVQyHcooAtThJ83XFrNnv74BcinbRH3bRmfFamAHBfuj'),
1515
}
1616

17-
export const SECURITY_MULTISIG: Record<Cluster | 'localnet', PublicKey> = {
17+
export const PRICE_FEED_MULTISIG: Record<Cluster | 'localnet', PublicKey> = {
1818
'mainnet-beta': new PublicKey('92hQkq8kBgCUcF9yWN8URZB9RTmA4mZpDGtbiAWA74Z8'), // TODO: placeholder value for now, fix when vault is created
1919
testnet: new PublicKey('92hQkq8kBgCUcF9yWN8URZB9RTmA4mZpDGtbiAWA74Z8'), // TODO: placeholder value for now, fix when vault is created
2020
devnet: new PublicKey('92hQkq8kBgCUcF9yWN8URZB9RTmA4mZpDGtbiAWA74Z8'),
@@ -26,9 +26,9 @@ interface MultisigHookData {
2626
error: any // TODO: fix any
2727
squads: SquadsMesh | undefined
2828
upgradeMultisigAccount: MultisigAccount | undefined
29-
securityMultisigAccount: MultisigAccount | undefined
29+
priceFeedMultisigAccount: MultisigAccount | undefined
3030
upgradeMultisigProposals: TransactionAccount[]
31-
securityMultisigProposals: TransactionAccount[]
31+
priceFeedMultisigProposals: TransactionAccount[]
3232
}
3333

3434
const getSortedProposals = async (
@@ -46,12 +46,12 @@ export const useMultisig = (wallet: Wallet): MultisigHookData => {
4646
const [error, setError] = useState(null)
4747
const [upgradeMultisigAccount, setUpgradeMultisigAccount] =
4848
useState<MultisigAccount>()
49-
const [securityMultisigAccount, setSecurityMultisigAccount] =
49+
const [priceFeedMultisigAccount, setpriceFeedMultisigAccount] =
5050
useState<MultisigAccount>()
5151
const [upgradeMultisigProposals, setUpgradeMultisigProposals] = useState<
5252
TransactionAccount[]
5353
>([])
54-
const [securityMultisigProposals, setSecurityMultisigProposals] = useState<
54+
const [priceFeedMultisigProposals, setpriceFeedMultisigProposals] = useState<
5555
TransactionAccount[]
5656
>([])
5757
const [squads, setSquads] = useState<SquadsMesh>()
@@ -102,13 +102,13 @@ export const useMultisig = (wallet: Wallet): MultisigHookData => {
102102
)
103103
)
104104
if (cluster === 'devnet') {
105-
setSecurityMultisigAccount(
105+
setpriceFeedMultisigAccount(
106106
await squads.getMultisig(
107-
SECURITY_MULTISIG[getMultisigCluster(cluster)]
107+
PRICE_FEED_MULTISIG[getMultisigCluster(cluster)]
108108
)
109109
)
110110
} else {
111-
setSecurityMultisigAccount(undefined)
111+
setpriceFeedMultisigAccount(undefined)
112112
}
113113
if (cancelled) return
114114
setUpgradeMultisigProposals(
@@ -118,14 +118,14 @@ export const useMultisig = (wallet: Wallet): MultisigHookData => {
118118
)
119119
)
120120
if (cluster === 'devnet') {
121-
setSecurityMultisigProposals(
121+
setpriceFeedMultisigProposals(
122122
await getSortedProposals(
123123
squads,
124-
SECURITY_MULTISIG[getMultisigCluster(cluster)]
124+
PRICE_FEED_MULTISIG[getMultisigCluster(cluster)]
125125
)
126126
)
127127
} else {
128-
setSecurityMultisigProposals([])
128+
setpriceFeedMultisigProposals([])
129129
}
130130
setSquads(squads)
131131
setIsLoading(false)
@@ -156,8 +156,8 @@ export const useMultisig = (wallet: Wallet): MultisigHookData => {
156156
error,
157157
squads,
158158
upgradeMultisigAccount,
159-
securityMultisigAccount,
159+
priceFeedMultisigAccount,
160160
upgradeMultisigProposals,
161-
securityMultisigProposals,
161+
priceFeedMultisigProposals,
162162
}
163163
}

0 commit comments

Comments
 (0)