Merge pull request #2629 from pyth-network/cprussin/use-wallet-to-send-tx-in-wallet-tester

fix(staking): use wallet's `sendTransaction` for wallet tester

Author: cprussin

apps/staking/package.json

@@ -27,7 +27,6 @@
     "@next/third-parties": "catalog:",
     "@pythnetwork/hermes-client": "workspace:*",
     "@pythnetwork/known-publishers": "workspace:*",
-    "@pythnetwork/solana-utils": "workspace:*",
     "@pythnetwork/staking-sdk": "workspace:*",
     "@react-hookz/web": "catalog:",
     "@solana/wallet-adapter-base": "catalog:",

apps/staking/src/components/WalletTester/index.tsx

@@ -3,14 +3,15 @@
 import type { Idl } from "@coral-xyz/anchor";
 import { Program, AnchorProvider } from "@coral-xyz/anchor";
 import { WalletIcon } from "@heroicons/react/24/outline";
-import {
-  TransactionBuilder,
-  sendTransactions,
-} from "@pythnetwork/solana-utils";
-import type { AnchorWallet } from "@solana/wallet-adapter-react";
+import type { PythStakingWallet } from "@pythnetwork/staking-sdk";
 import { useConnection } from "@solana/wallet-adapter-react";
 import { useWalletModal } from "@solana/wallet-adapter-react-ui";
-import { PublicKey, Connection } from "@solana/web3.js";
+import {
+  PublicKey,
+  Connection,
+  VersionedTransaction,
+  TransactionMessage,
+} from "@solana/web3.js";
 import type { ComponentProps } from "react";
 import { useCallback } from "react";
 
@@ -101,7 +102,7 @@ const ConnectWallet = ({ isLoading }: { isLoading?: boolean | undefined }) => {
   );
 };
 
-const WalletConnected = ({ wallet }: { wallet: AnchorWallet }) => {
+const WalletConnected = ({ wallet }: { wallet: PythStakingWallet }) => {
   const { connection } = useConnection();
 
   const testedStatus = useData(
@@ -139,7 +140,7 @@ const WalletConnected = ({ wallet }: { wallet: AnchorWallet }) => {
   }
 };
 
-const Tester = ({ wallet }: { wallet: AnchorWallet }) => {
+const Tester = ({ wallet }: { wallet: PythStakingWallet }) => {
   const toast = useToast();
   const { connection } = useConnection();
   const { state, execute } = useAsync(() => testWallet(connection, wallet));
@@ -195,7 +196,7 @@ const Tester = ({ wallet }: { wallet: AnchorWallet }) => {
 
 const getHasAlreadyTested = async (
   connection: Connection,
-  wallet: AnchorWallet,
+  wallet: PythStakingWallet,
 ) => {
   const receiptAddress = PublicKey.findProgramAddressSync(
     [wallet.publicKey.toBytes()],
@@ -205,28 +206,28 @@ const getHasAlreadyTested = async (
   return { hasTested: receipt !== null };
 };
 
-const testWallet = async (connection: Connection, wallet: AnchorWallet) => {
+const testWallet = async (
+  connection: Connection,
+  wallet: PythStakingWallet,
+) => {
   const walletTester = new Program(
     WalletTesterIDL as Idl,
     new AnchorProvider(connection, wallet),
   );
   const testMethod = walletTester.methods.test;
   if (testMethod) {
-    await sendTransactions(
-      await TransactionBuilder.batchIntoVersionedTransactions(
-        wallet.publicKey,
-        connection,
-        [
-          {
-            instruction: await testMethod().instruction(),
-            signers: [],
-          },
-        ],
-        {},
-      ),
-      connection,
-      wallet,
+    const instruction = await testMethod().instruction();
+    const { blockhash } = await connection.getLatestBlockhash({
+      commitment: "confirmed",
+    });
+    const transaction = new VersionedTransaction(
+      new TransactionMessage({
+        payerKey: wallet.publicKey,
+        recentBlockhash: blockhash,
+        instructions: [instruction],
+      }).compileToV0Message(),
     );
+    await wallet.sendTransaction(transaction, connection);
   } else {
     throw new Error("No test method found in program");
   }

apps/staking/src/hooks/use-api.tsx

@@ -1,9 +1,9 @@
 "use client";
 
 import { HermesClient } from "@pythnetwork/hermes-client";
+import type { PythStakingWallet } from "@pythnetwork/staking-sdk";
 import { PythnetClient, PythStakingClient } from "@pythnetwork/staking-sdk";
 import { useLocalStorageValue } from "@react-hookz/web";
-import type { AnchorWallet } from "@solana/wallet-adapter-react";
 import { useConnection, useWallet } from "@solana/wallet-adapter-react";
 import { Connection, PublicKey } from "@solana/web3.js";
 import type { ComponentProps } from "react";
@@ -36,18 +36,18 @@ const State = {
     type: StateType.WalletConnecting as const,
   }),
 
-  [StateType.NotLoaded]: (wallet: AnchorWallet) => ({
+  [StateType.NotLoaded]: (wallet: PythStakingWallet) => ({
     type: StateType.NotLoaded as const,
     wallet,
   }),
 
-  [StateType.LoadingStakeAccounts]: (wallet: AnchorWallet) => ({
+  [StateType.LoadingStakeAccounts]: (wallet: PythStakingWallet) => ({
     type: StateType.LoadingStakeAccounts as const,
     wallet,
   }),
 
   [StateType.LoadedNoStakeAccount]: (
-    wallet: AnchorWallet,
+    wallet: PythStakingWallet,
     isMainnet: boolean,
     client: PythStakingClient,
     pythnetClient: PythnetClient,
@@ -68,7 +68,7 @@ const State = {
   }),
 
   [StateType.Loaded]: (
-    wallet: AnchorWallet,
+    wallet: PythStakingWallet,
     isMainnet: boolean,
     client: PythStakingClient,
     pythnetClient: PythnetClient,
@@ -130,7 +130,7 @@ const State = {
   },
 
   [StateType.ErrorLoadingStakeAccounts]: (
-    wallet: AnchorWallet,
+    wallet: PythStakingWallet,
     error: LoadStakeAccountsError,
     reset: () => void,
   ) => ({

governance/pyth_staking_sdk/src/index.ts

@@ -7,3 +7,4 @@ export * from "./utils/clock.js";
 export * from "./utils/pool.js";
 export * from "./utils/position.js";
 export * from "./utils/vesting.js";
+export * from "./utils/wallet.js";