Merge branch 'master' into copilot/fix-54

Author: 0xrinegade

package-lock.json

@@ -39,6 +39,7 @@
   "homepage": "https://github.com/openSVM/svmp2p#readme",
   "dependencies": {
     "@coral-xyz/anchor": "0.31.0",
+    "@coral-xyz/anchor-cli": "^0.31.2",
     "@project-serum/anchor": "^0.26.0",
     "@solana/wallet-adapter-base": "0.9.24",
     "@solana/wallet-adapter-react": "0.15.36",

package.json

@@ -275,7 +275,6 @@ pub fn cast_vote(ctx: Context<CastVote>, vote_for_buyer: bool) -> Result<()> {
     if juror_index >= 3 {
         return Err(error!(ErrorCode::NotAJuror));
     }
-    
     // Double-check that this specific juror hasn't been counted already
     // This is extra safety on top of PDA-based duplicate prevention
     let mut vote_count = 0;
@@ -290,8 +289,9 @@ pub fn cast_vote(ctx: Context<CastVote>, vote_for_buyer: bool) -> Result<()> {
 
     // Validate that the juror has not already voted
     // Check by using Vote PDA - if the account exists, they've already voted
-    // This is handled by the PDA constraint in the CastVote accounts struct
-
+    // This is handled by the PDA constraint in the CastVote accounts struct=======
+    // Note: PDA-based duplicate prevention ensures jurors can't vote twice
+    // The vote account PDA will fail to initialize if the juror already voted
     // Initialize vote data (PDA prevents duplicate votes)
     vote.dispute = dispute.key();
     vote.juror = juror.key();

programs/p2p-exchange/src/instructions/disputes.rs

@@ -1,6 +1,6 @@
 import React, { useState, useContext } from 'react';
 import { useConnection } from '@solana/wallet-adapter-react';
-import { SystemProgram, Keypair, LAMPORTS_PER_SOL } from '@solana/web3.js';
+import { SystemProgram, Keypair, LAMPORTS_PER_SOL, PublicKey } from '@solana/web3.js';
 // Import BN from @coral-xyz/anchor as a fallback for @project-serum/anchor
 import { BN } from '@coral-xyz/anchor';
 import { AppContext } from '../contexts/AppContext';
@@ -98,8 +98,14 @@ const OfferCreation = ({ onStartGuidedWorkflow }) => {
       // Generate a new account for the offer
       const offer = Keypair.generate();
 
-      // Generate a new account for the escrow
-      const escrow = Keypair.generate();
+      // Calculate PDA for escrow account
+      const [escrowAccount] = PublicKey.findProgramAddressSync(
+        [
+          Buffer.from("escrow"),
+          offer.publicKey.toBuffer()
+        ],
+        program.programId
+      );
 
       // Current timestamp
       const now = new BN(Math.floor(Date.now() / 1000));
@@ -118,10 +124,10 @@ const OfferCreation = ({ onStartGuidedWorkflow }) => {
         .accounts({
           offer: offer.publicKey,
           seller: wallet.publicKey,
-          escrowAccount: escrow.publicKey,
+          escrowAccount: escrowAccount,
           systemProgram: SystemProgram.programId,
         })
-        .signers([offer, escrow])
+        .signers([offer])
         .rpc();
 
       setTxHash(createTx);

src/components/OfferCreation.js

@@ -18,7 +18,7 @@
         {
           "name": "escrowAccount",
           "isMut": true,
-          "isSigner": true
+          "isSigner": false
         },
         {
           "name": "systemProgram",