feat(xc_admin_cli): make deactivate stake take in vote accounts (#2036)

* feat: make deactivate stake take in vote accounts * fix node version
pyth-network · Oct 16, 2024 · c7d5cf0 · c7d5cf0
1 parent 9973287
commit c7d5cf0
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 15 deletions.
diff --git a/.github/workflows/ci-ethereum-contract.yml b/.github/workflows/ci-ethereum-contract.yml
@@ -21,6 +21,9 @@ jobs:
         working-directory: target_chains/ethereum/contracts/
     steps:
       - uses: actions/checkout@v3
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: "package.json"
 
       - uses: pnpm/action-setup@v4
         name: Install pnpm

diff --git a/governance/xc_admin/packages/xc_admin_cli/src/index.ts b/governance/xc_admin/packages/xc_admin_cli/src/index.ts
@@ -41,6 +41,7 @@ import {
   PROGRAM_AUTHORITY_ESCROW,
   createDetermisticPriceStoreInitializePublisherInstruction,
   createPriceStoreInstruction,
+  fetchStakeAccounts,
   findDetermisticStakeAccountAddress,
   getMultisigCluster,
   getProposalInstructions,
@@ -59,6 +60,7 @@ import {
   DEFAULT_PRIORITY_FEE_CONFIG,
   TransactionBuilder,
 } from "@pythnetwork/solana-utils";
+import { bs58 } from "@coral-xyz/anchor/dist/cjs/utils/bytes";
 
 export async function loadHotWalletOrLedger(
   wallet: string,
@@ -389,8 +391,8 @@ multisigCommand(
   "Deactivate the delegated stake from the account"
 )
   .requiredOption(
-    "-s, --stake-accounts <comma_separated_stake_account>",
-    "stake accounts to be deactivated"
+    "-d, --vote-pubkeys <comma_separated_voter_pubkeys>",
+    "vote account unstake from"
   )
   .action(async (options: any) => {
     const vault = await loadVaultFromOptions(options);
@@ -399,20 +401,25 @@ multisigCommand(
       cluster
     );
 
-    const stakeAccounts = options.stakeAccounts
-      ? options.stakeAccounts.split(",").map((m: string) => new PublicKey(m))
+    const voteAccounts: PublicKey[] = options.votePubkeys
+      ? options.votePubkeys.split(",").map((m: string) => new PublicKey(m))
       : [];
 
-    const instructions = stakeAccounts.reduce(
-      (instructions: TransactionInstruction[], stakeAccount: PublicKey) => {
-        const transaction = StakeProgram.deactivate({
-          stakePubkey: stakeAccount,
-          authorizedPubkey,
-        });
+    const stakeAccounts = (
+      await Promise.all(
+        voteAccounts.map((voteAccount: PublicKey) =>
+          fetchStakeAccounts(
+            new Connection(getPythClusterApiUrl(cluster)),
+            voteAccount
+          )
+        )
+      )
+    ).flat();
 
-        return instructions.concat(transaction.instructions);
-      },
-      []
+    const instructions = stakeAccounts.flatMap(
+      (stakeAccount) =>
+        StakeProgram.deactivate({ stakePubkey: stakeAccount, authorizedPubkey })
+          .instructions
     );
 
     await vault.proposeInstructions(

diff --git a/...min/packages/xc_admin_common/src/multisig_transaction/SolanaStakingMultisigInstruction.ts b/...min/packages/xc_admin_common/src/multisig_transaction/SolanaStakingMultisigInstruction.ts
@@ -1,11 +1,17 @@
-import { TransactionInstruction } from "@solana/web3.js";
+import {
+  Connection,
+  PublicKey,
+  StakeProgram,
+  TransactionInstruction,
+} from "@solana/web3.js";
 import {
   MultisigInstruction,
   MultisigInstructionProgram,
   UNRECOGNIZED_INSTRUCTION,
 } from ".";
 import { AnchorAccounts } from "./anchor";
 import { StakeInstruction } from "@solana/web3.js";
+import { bs58 } from "@coral-xyz/anchor/dist/cjs/utils/bytes";
 
 export class SolanaStakingMultisigInstruction implements MultisigInstruction {
   readonly program = MultisigInstructionProgram.SolanaStakingProgram;
@@ -115,3 +121,31 @@ export class SolanaStakingMultisigInstruction implements MultisigInstruction {
     }
   }
 }
+
+export async function fetchStakeAccounts(
+  connection: Connection,
+  voterAccount: PublicKey
+) {
+  const stakeAccounts = await connection.getProgramAccounts(
+    StakeProgram.programId,
+    {
+      encoding: "base64",
+      filters: [
+        {
+          memcmp: {
+            offset: 0,
+            bytes: bs58.encode(Buffer.from([2, 0, 0, 0])),
+          },
+        },
+        {
+          memcmp: {
+            offset: 124,
+            bytes: voterAccount.toBase58(),
+          },
+        },
+      ],
+    }
+  );
+
+  return stakeAccounts.map((account) => account.pubkey);
+}
diff --git a/governance/xc_admin/packages/xc_admin_common/src/multisig_transaction/index.ts b/governance/xc_admin/packages/xc_admin_common/src/multisig_transaction/index.ts
@@ -173,4 +173,7 @@ export { PythMultisigInstruction } from "./PythMultisigInstruction";
 export { AnchorMultisigInstruction } from "./MessageBufferMultisigInstruction";
 export { SystemProgramMultisigInstruction } from "./SystemProgramInstruction";
 export { BpfUpgradableLoaderInstruction } from "./BpfUpgradableLoaderMultisigInstruction";
-export { SolanaStakingMultisigInstruction } from "./SolanaStakingMultisigInstruction";
+export {
+  SolanaStakingMultisigInstruction,
+  fetchStakeAccounts,
+} from "./SolanaStakingMultisigInstruction";