Merge pull request #52 from pyth-network/feedback

Address some feedback
pyth-network · Nov 28, 2023 · e7140f9 · e7140f9
2 parents 64c9447 + 352ef9d
commit e7140f9
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 16 deletions.
diff --git a/hooks/useVotingPlugins.ts b/hooks/useVotingPlugins.ts
@@ -42,7 +42,7 @@ export function useVotingPlugins() {
     handleSetNftRegistrar,
     handleSetGatewayRegistrar,
     handleSetCurrentRealmVotingClient,
-    handleSetPythClient
+    handleSetPythClient,
   } = useVotePluginsClientStore()
 
   const [
@@ -69,7 +69,7 @@ export function useVotingPlugins() {
     nftClient,
     nftMintRegistrar,
     heliumVsrClient,
-    pythClient
+    pythClient,
   ] = useVotePluginsClientStore((s) => [
     s.state.currentRealmVotingClient,
     s.state.vsrClient,
@@ -132,6 +132,18 @@ export function useVotingPlugins() {
     [usedCollectionsPks]
   )
 
+  // initialise pyth plugin
+  useEffect(() => {
+    if (
+      wallet &&
+      connection &&
+      currentPluginPk &&
+      PYTH_PLUGIN_PK.includes(currentPluginPk.toBase58())
+    ) {
+      handleSetPythClient(wallet, connection)
+    }
+  }, [connection, currentPluginPk, handleSetPythClient, wallet])
+
   useEffect(() => {
     if (wallet && connection) {
       if (currentPluginPk) {
@@ -141,9 +153,6 @@ export function useVotingPlugins() {
         if (HELIUM_VSR_PLUGINS_PKS.includes(currentPluginPk.toBase58())) {
           handleSetHeliumVsrClient(wallet, connection, currentPluginPk)
         }
-        if (PYTH_PLUGIN_PK.includes(currentPluginPk.toBase58())) {
-          handleSetPythClient(wallet, connection)
-        }
       }
       handleSetNftClient(wallet, connection)
       handleSetGatewayClient(wallet, connection)
@@ -155,7 +164,6 @@ export function useVotingPlugins() {
     handleSetHeliumVsrClient,
     handleSetNftClient,
     handleSetVsrClient,
-    handleSetPythClient,
     wallet,
   ])
 
@@ -280,6 +288,7 @@ export function useVotingPlugins() {
     voterPk,
     realm,
     vsrClient,
+    pythClient,
   ])
 
   const handleMaxVoterWeight = useCallback(async () => {

diff --git a/utils/uiTypes/VotePlugin.ts b/utils/uiTypes/VotePlugin.ts
@@ -161,7 +161,7 @@ export class VotingClient {
     tokenOwnerRecord: PublicKey,
     type: UpdateVoterWeightRecordTypes,
     createNftActionTicketIxs?: TransactionInstruction[],
-    voterWeightTarget?: PublicKey
+    pythVoterWeightTarget?: PublicKey
   ): Promise<ProgramAddresses | undefined> => {
     if (this.noClient) return
 
@@ -215,7 +215,11 @@ export class VotingClient {
       )
 
       for (const pos of this.heliumVsrVotingPositions) {
-        const tokenAccount = await getAssociatedTokenAddress(pos.mint, walletPk, true)
+        const tokenAccount = await getAssociatedTokenAddress(
+          pos.mint,
+          walletPk,
+          true
+        )
 
         remainingAccounts.push(
           new AccountData(tokenAccount),
@@ -325,9 +329,7 @@ export class VotingClient {
       return { voterWeightPk, maxVoterWeightRecord: undefined }
     }
     if (this.client instanceof PythClient) {
-      const stakeAccount = await this.client!.getMainAccount(
-        walletPk
-      )
+      const stakeAccount = await this.client!.getMainAccount(walletPk)
 
       const {
         voterWeightAccount,
@@ -336,7 +338,7 @@ export class VotingClient {
         instructions,
         stakeAccount!,
         { [type]: {} },
-        voterWeightTarget
+        pythVoterWeightTarget
       )
 
       return {
@@ -424,7 +426,11 @@ export class VotingClient {
 
       for (let i = 0; i < unusedPositions.length; i++) {
         const pos = unusedPositions[i]
-        const tokenAccount = await getAssociatedTokenAddress(pos.mint, walletPk, true)
+        const tokenAccount = await getAssociatedTokenAddress(
+          pos.mint,
+          walletPk,
+          true
+        )
         const [nftVoteRecord] = nftVoteRecordKey(
           proposal.pubkey,
           pos.mint,
@@ -463,9 +469,7 @@ export class VotingClient {
     }
 
     if (this.client instanceof PythClient) {
-      const stakeAccount = await this.client!.getMainAccount(
-        walletPk
-      )
+      const stakeAccount = await this.client!.getMainAccount(walletPk)
 
       const {
         voterWeightAccount,