fix: upgrade deprecated method

marinade-finance · Dec 13, 2024 · 59563d7 · 59563d7
1 parent 857f8ca
commit 59563d7
Show file tree

Hide file tree

Showing 5 changed files with 282 additions and 85 deletions.
diff --git a/packages/lib/anchor-common/package.json b/packages/lib/anchor-common/package.json
@@ -37,7 +37,8 @@
     "bn.js": "^5.2.1",
     "@coral-xyz/anchor": "^0.29.0",
     "@marinade.finance/ts-common": "workspace: 2.4.9",
-    "@marinade.finance/web3js-common": "workspace: 2.4.9"
+    "@marinade.finance/web3js-common": "workspace: 2.4.9",
+    "@anza-xyz/solana-rpc-get-stake-activation": "1.0.1"
   },
   "engines": {
     "node": ">=16"

diff --git a/packages/lib/anchor-common/src/validator.ts b/packages/lib/anchor-common/src/validator.ts
@@ -4,6 +4,7 @@ import fs from 'fs'
 import { sleep } from '@marinade.finance/ts-common'
 import { getStakeAccount } from '@marinade.finance/web3js-common'
 import { waitForEpoch } from '@marinade.finance/web3js-common'
+import { getStakeActivation } from '@anza-xyz/solana-rpc-get-stake-activation'
 
 export async function getAnchorValidatorInfo(
   connection: Connection,
@@ -87,10 +88,10 @@ export async function waitForStakeAccountActivation({
   // 1. waiting for the stake account to be activated
   {
     const startTime = Date.now()
-    let stakeStatus = await connection.getStakeActivation(stakeAccount)
-    while (stakeStatus.state !== 'active') {
+    let stakeStatus = await getStakeActivation(connection, stakeAccount)
+    while (stakeStatus.status !== 'active') {
       await sleep(1000)
-      stakeStatus = await connection.getStakeActivation(stakeAccount)
+      stakeStatus = await getStakeActivation(connection, stakeAccount)
       if (Date.now() - startTime > timeoutSeconds * 1000) {
         throw new Error(
           `Stake account ${stakeAccount.toBase58()} was not activated in timeout of ${timeoutSeconds} seconds`

diff --git a/packages/marinade-ts-cli/__tests__/setup/globalSetup.ts b/packages/marinade-ts-cli/__tests__/setup/globalSetup.ts
@@ -2,6 +2,7 @@ import { AnchorProvider } from '@coral-xyz/anchor'
 import NodeWallet from '@coral-xyz/anchor/dist/cjs/nodewallet'
 import { Marinade, MarinadeConfig } from '@marinade.finance/marinade-ts-sdk'
 import { getParsedStakeAccountInfo } from '@marinade.finance/marinade-ts-sdk/dist/src/util'
+import { getStakeActivation } from '@anza-xyz/solana-rpc-get-stake-activation'
 import {
   Keypair,
   PublicKey,
@@ -230,10 +231,10 @@ export async function waitForStakeAccountActivation({
   // 1. waiting for the stake account to be activated
   {
     const startTime = Date.now()
-    let stakeStatus = await connection.getStakeActivation(stakeAccount)
-    while (stakeStatus.state !== 'active') {
+    let stakeStatus = await getStakeActivation(connection, stakeAccount)
+    while (stakeStatus.status !== 'active') {
       await sleep(1000)
-      stakeStatus = await connection.getStakeActivation(stakeAccount)
+      stakeStatus = await getStakeActivation(connection, stakeAccount)
       if (Date.now() - startTime > timeoutSeconds * 1000) {
         throw new Error(
           `Stake account ${stakeAccount.toBase58()} was not activated in timeout of ${timeoutSeconds} seconds`

diff --git a/packages/marinade-ts-cli/package.json b/packages/marinade-ts-cli/package.json
@@ -43,7 +43,8 @@
         "@marinade.finance/ledger-utils": "^3.0.1",
         "@marinade.finance/cli-common": "workspace: 2.4.9",
         "@marinade.finance/web3js-common": "workspace: 2.4.9",
-        "@marinade.finance/marinade-ts-sdk": "5.0.7"
+        "@marinade.finance/marinade-ts-sdk": "5.0.7",
+        "@anza-xyz/solana-rpc-get-stake-activation": "1.0.1"
     },
     "devDependencies": {
         "@marinade.finance/jest-utils": "workspace: 2.4.9",