pr feedback

Author: buffalu

.github/workflows/build.yaml

@@ -76,7 +76,7 @@ jobs:
           cache-workspaces:
             ./mev-programs/
       - name: install solana toolsuite
-        run: sh -c "$(curl -sSfL https://release.anza.xyz/v3.1.1/install)"
+        run: sh -c "$(curl -sSfL https://release.anza.xyz/v2.2.13/install)"
       - name: add to path
         run: echo "/home/runner/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH
       - name: Install anchor
@@ -114,9 +114,6 @@ jobs:
 
       # Slow anchor tests
       - run: solana-keygen new --no-bip39-passphrase # needed for tests
-      - name: Run priority-fee-distribution test
-        working-directory: ./mev-programs
-        run: RUSTUP_TOOLCHAIN=nightly-2025-04-16 anchor test --run tests/priority-fee-distribution.ts
       - name: Run Anchor test
         working-directory: ./mev-programs
         run: RUSTUP_TOOLCHAIN=nightly-2025-04-16 anchor test

mev-programs/Cargo.lock

@@ -69,9 +69,9 @@ pub mod jito_priority_fee_distribution {
             return Err(MaxValidatorCommissionFeeBpsExceeded.into());
         }
 
-        let valdiator_vote_account_node_pubkey =
+        let validator_vote_account_node_pubkey =
             VoteState::deserialize_node_pubkey(&ctx.accounts.validator_vote_account)?;
-        if valdiator_vote_account_node_pubkey != *ctx.accounts.signer.key {
+        if validator_vote_account_node_pubkey != *ctx.accounts.signer.key {
             return Err(Unauthorized.into());
         }
 

mev-programs/programs/priority-fee-distribution/src/lib.rs

@@ -66,9 +66,9 @@ pub mod jito_tip_distribution {
             return Err(MaxValidatorCommissionFeeBpsExceeded.into());
         }
 
-        let vote_account_node_pubkey =
+        let validator_vote_account_node_pubkey =
             VoteState::deserialize_node_pubkey(&ctx.accounts.validator_vote_account)?;
-        if vote_account_node_pubkey != *ctx.accounts.signer.key {
+        if validator_vote_account_node_pubkey != *ctx.accounts.signer.key {
             return Err(Unauthorized.into());
         }
 

mev-programs/programs/tip-distribution/src/lib.rs

@@ -56,21 +56,21 @@ describe("tests priority_fee_distribution", () => {
 
     // then
     try {
-      await priorityFeeDistribution.methods
-        .initialize(
-          authority.publicKey,
-          expiredFundsAccount.publicKey,
-          numEpochsValid,
-          maxValidatorCommissionBps,
-          configBump
-        )
-        .accounts({
-          config: configAccount,
-          systemProgram: SystemProgram.programId,
-          initializer: initializer.publicKey,
-        })
-        .signers([initializer])
-        .rpc();
+      await priorityFeeDistribution.rpc.initialize(
+        authority.publicKey,
+        expiredFundsAccount.publicKey,
+        numEpochsValid,
+        maxValidatorCommissionBps,
+        configBump,
+        {
+          accounts: {
+            config: configAccount,
+            systemProgram: SystemProgram.programId,
+            initializer: initializer.publicKey,
+          },
+          signers: [initializer],
+        }
+      );
     } catch (e) {
       assert.fail("unexpected error: " + e);
     }
@@ -267,19 +267,19 @@ describe("tests priority_fee_distribution", () => {
 
     await sleepForEpochs(1);
     try {
-      await priorityFeeDistribution.methods
-        .uploadMerkleRoot(
-          root.toJSON().data,
-          maxTotalClaim,
-          maxNumNodes
-        )
-        .accounts({
-          priorityFeeDistributionAccount,
-          merkleRootUploadAuthority: validatorVoteAccount.publicKey,
-          config: configAccount,
-        })
-        .signers([validatorVoteAccount])
-        .rpc();
+      await priorityFeeDistribution.rpc.uploadMerkleRoot(
+        root.toJSON().data,
+        maxTotalClaim,
+        maxNumNodes,
+        {
+          accounts: {
+            priorityFeeDistributionAccount,
+            merkleRootUploadAuthority: validatorVoteAccount.publicKey,
+            config: configAccount,
+          },
+          signers: [validatorVoteAccount],
+        }
+      );
     } catch (e) {
       assert.fail("Unexpected error: " + e);
     }
@@ -1230,7 +1230,7 @@ describe("tests priority_fee_distribution", () => {
     );
   });
 
-  describe("After go_live_epoch", () => {
+  describe("After go_live_epoch", async () => {
     before(async () => {
       // Update Config.go_live_epoch to use current epoch
       const [currentConfig, epochInfo] = await Promise.all([
@@ -1516,21 +1516,21 @@ const call_initTipDistributionAccount = async ({
   priorityFeeDistributionAccount,
   bump,
 }) => {
-  return await priorityFeeDistribution.methods
-    .initializePriorityFeeDistributionAccount(
-      merkleRootUploadAuthority,
-      validatorCommissionBps,
-      bump
-    )
-    .accounts({
-      config,
-      systemProgram,
-      signer: validatorIdentityKeypair.publicKey,
-      validatorVoteAccount: validatorVoteAccount.publicKey,
-      priorityFeeDistributionAccount,
-    })
-    .signers([validatorIdentityKeypair])
-    .rpc();
+  return await priorityFeeDistribution.rpc.initializePriorityFeeDistributionAccount(
+    merkleRootUploadAuthority,
+    validatorCommissionBps,
+    bump,
+    {
+      accounts: {
+        config,
+        systemProgram,
+        signer: validatorIdentityKeypair.publicKey,
+        validatorVoteAccount: validatorVoteAccount.publicKey,
+        priorityFeeDistributionAccount,
+      },
+      signers: [validatorIdentityKeypair],
+    }
+  );
 };
 
 const setupWithUploadedMerkleRoot = async () => {