fix

governance/pyth_staking_sdk/integration-tests/start-validator.ts

@@ -57,7 +57,9 @@ export async function startValidatorRaw() {
   const internalController: AbortController = new AbortController();
   const { signal } = internalController;
 
-  const user = loadKeypair("integration-tests/keypairs/localnet-authority.json");
+  const user = loadKeypair(
+    "integration-tests/keypairs/localnet-authority.json",
+  );
 
   const command = `solana-test-validator \
     --ledger ${ledgerDir} \

governance/pyth_staking_sdk/jest.config.js

@@ -7,6 +7,6 @@ export default base({
   global: {
     config: {
       testTimeout: 10_000,
-    }
-  }
+    },
+  },
 });

governance/pyth_staking_sdk/src/index.ts

@@ -1,4 +1,3 @@
-export * from "./staking/accounts";
 export * from "./pyth-staking-client";
 export * from "./utils/clock";
 export * from "./utils/position";

governance/pyth_staking_sdk/src/pyth-staking-client.ts

@@ -18,12 +18,14 @@ import {
   getStakeAccountCustodyAddress,
   getStakeAccountMetadataAddress,
 } from "./pdas";
-import {
-  type StakeAccountPositions,
-  StakeAccountPositionsAnchor,
-} from "./staking/accounts";
-import type { GlobalConfig, PoolConfig, PoolDataAccount } from "./types";
+import type {
+  GlobalConfig,
+  PoolConfig,
+  PoolDataAccount,
+  StakeAccountPositions,
+} from "./types";
 import { convertBigIntToBN, convertBNToBigInt } from "./utils/bn";
+import { deserializeStakeAccountPositions } from "./utils/position";
 import { getUnlockSchedule } from "./utils/vesting";
 import * as IntegrityPoolIdl from "../idl/integrity-pool.json";
 import * as PublisherCapsIdl from "../idl/publisher-caps.json";
@@ -120,14 +122,13 @@ export class PythStakingClient {
           ],
         },
       );
-    return res.map((account) => {
-      const stakeAccountPositionsAnchor = new StakeAccountPositionsAnchor(
+    return res.map((account) =>
+      deserializeStakeAccountPositions(
         account.pubkey,
         account.account.data,
         this.stakingProgram.idl,
-      );
-      return stakeAccountPositionsAnchor.toStakeAccountPositions();
-    });
+      ),
+    );
   }
 
   public async getStakeAccountPositions(
@@ -142,12 +143,11 @@ export class PythStakingClient {
       throw new Error("Stake account not found");
     }
 
-    const stakeAccountPositionsAnchor = new StakeAccountPositionsAnchor(
+    return deserializeStakeAccountPositions(
       stakeAccountPositions,
       account.data,
       this.stakingProgram.idl,
     );
-    return stakeAccountPositionsAnchor.toStakeAccountPositions();
   }
 
   public async getStakeAccountCustody(

governance/pyth_staking_sdk/src/types.ts

@@ -1,4 +1,5 @@
 import type { BN, IdlAccounts, IdlTypes } from "@coral-xyz/anchor";
+import { PublicKey } from "@solana/web3.js";
 
 import type { IntegrityPool } from "../types/integrity-pool";
 import type { Staking } from "../types/staking";
@@ -45,10 +46,18 @@ export type UnlockSchedule = {
   amount: bigint;
 }[];
 
+export type StakeAccountPositions = {
+  address: PublicKey;
+  data: {
+    owner: PublicKey;
+    positions: Position[];
+  };
+};
+
 export enum PositionState {
-  UNLOCKED = 0,
-  LOCKING = 1,
-  LOCKED = 2,
-  PREUNLOCKING = 3,
-  UNLOCKING = 4,
+  UNLOCKED,
+  LOCKING,
+  LOCKED,
+  PREUNLOCKING,
+  UNLOCKING,
 }

governance/pyth_staking_sdk/src/utils/position.ts

@@ -1,7 +1,14 @@
-import type { StakeAccountPositions } from "../staking/accounts";
+import { BorshCoder } from "@coral-xyz/anchor";
+import { PublicKey } from "@solana/web3.js";
+
+import { convertBNToBigInt } from "./bn";
+import type { Staking } from "../../types/staking";
+import { POSITION_BUFFER_SIZE, POSITIONS_ACCOUNT_SIZE } from "../constants";
 import {
   type Position,
+  type PositionAnchor,
   PositionState,
+  type StakeAccountPositions,
   type TargetWithParameters,
 } from "../types";
 
@@ -53,3 +60,32 @@ export const getAmountByTargetAndState = (options: {
     .map((p) => p.amount)
     .reduce((sum, amount) => sum + amount, 0n);
 };
+
+export const deserializeStakeAccountPositions = (
+  address: PublicKey,
+  data: Buffer,
+  idl: Staking,
+) => {
+  const coder = new BorshCoder(idl);
+  let i = 8; // Skip discriminator
+  const owner = new PublicKey(data.slice(i, i + 32));
+  const numberOfPositions = Math.floor(
+    (data.length - POSITIONS_ACCOUNT_SIZE) / POSITION_BUFFER_SIZE,
+  );
+  i += 32;
+  const positions: PositionAnchor[] = [];
+  for (let j = 0; j < numberOfPositions; j++) {
+    if (data[i] === 1) {
+      positions.push(coder.types.decode("position", data.subarray(i + 1)));
+    }
+    i += POSITION_BUFFER_SIZE;
+  }
+
+  return {
+    address,
+    data: {
+      owner,
+      positions: positions.map((p) => convertBNToBigInt(p)),
+    },
+  };
+};