fix: more realistic autovote

Author: jaybuidl

contracts/scripts/shutterAutoVote.ts

@@ -1,4 +1,4 @@
-import { createPublicClient, createWalletClient, http, Hex, getContract } from "viem";
+import { createPublicClient, createWalletClient, http, Hex, getContract, Address, decodeEventLog } from "viem";
 import { mnemonicToAccount } from "viem/accounts";
 import { hardhat } from "viem/chains";
 import { encrypt, decrypt, DECRYPTION_DELAY } from "./shutter";
@@ -11,11 +11,10 @@ const SEPARATOR = "␟"; // U+241F
 // Store encrypted votes for later decryption
 type EncryptedVote = {
   coreDisputeID: bigint;
-  encryptedCommitment: string;
+  juror: Address;
   identity: Hex;
+  encryptedVote: string;
   timestamp: number;
-  voteIDs: bigint[];
-  salt: Hex;
 };
 
 const encryptedVotes: EncryptedVote[] = [];
@@ -43,6 +42,15 @@ const disputeKit = getContract({
   client: { public: publicClient, wallet: walletClient },
 });
 
+type CommitCastEventArgs = {
+  _coreDisputeID: bigint;
+  _juror: Address;
+  _voteIDs: bigint[];
+  _commit: Hex;
+  _identity: Hex;
+  _encryptedVote: string;
+};
+
 /**
  * Generate a random salt
  */
@@ -97,13 +105,19 @@ async function castCommit({
     });
 
     // Encrypt the message using shutter.ts
-    const { encryptedCommitment, identity } = await encrypt(message);
+    const { encryptedCommitment: encryptedVote, identity } = await encrypt(message);
 
     // Compute hash using all vote IDs
     const commitHash = await disputeKit.read.hashVote([choice, salt, justification]);
 
     // Cast the commit on-chain
-    const txHash = await disputeKit.write.castCommit([coreDisputeID, voteIDs, commitHash, identity as Hex]);
+    const txHash = await disputeKit.write.castCommit([
+      coreDisputeID,
+      voteIDs,
+      commitHash,
+      identity as Hex,
+      encryptedVote,
+    ]);
 
     // Wait for transaction to be mined
     await publicClient.waitForTransactionReceipt({ hash: txHash });
@@ -115,11 +129,10 @@ async function castCommit({
     // Store encrypted vote for later decryption
     encryptedVotes.push({
       coreDisputeID,
-      encryptedCommitment,
+      juror: account.address,
       identity: identity as Hex,
+      encryptedVote,
       timestamp: Math.floor(Date.now() / 1000),
-      voteIDs,
-      salt,
     });
 
     return { commitHash, identity, salt };
@@ -143,16 +156,34 @@ export async function autoVote() {
 
       for (const vote of readyVotes) {
         try {
+          // Retrieve the CommitCast event
+          const filter = await publicClient.createContractEventFilter({
+            abi: DisputeKitShutterPoCAbi,
+            eventName: "CommitCast",
+            args: [vote.coreDisputeID, vote.juror],
+          });
+          let events = await publicClient.getLogs(filter);
+          if (events.length !== 1) {
+            throw new Error("No CommitCast event found");
+          }
+          const { args } = decodeEventLog({
+            abi: DisputeKitShutterPoCAbi,
+            eventName: "CommitCast",
+            topics: events[0].topics,
+            data: events[0].data,
+          });
+          const commitCast = args as unknown as CommitCastEventArgs; // Workaround getLogs type inference issue
+
           // Attempt to decrypt the vote
-          const decryptedMessage = await decrypt(vote.encryptedCommitment, vote.identity);
+          const decryptedMessage = await decrypt(commitCast._encryptedVote, commitCast._identity);
 
           // Decode the decrypted message
           const { choice, salt, justification } = decode(decryptedMessage);
 
           // Cast the vote on-chain
           const txHash = await disputeKit.write.castVote([
             vote.coreDisputeID,
-            vote.voteIDs,
+            commitCast._voteIDs,
             choice,
             salt,
             justification,
@@ -162,14 +193,14 @@ export async function autoVote() {
           await publicClient.waitForTransactionReceipt({ hash: txHash });
 
           // Watch for VoteCast event
-          const events = await disputeKit.getEvents.VoteCast();
+          events = await disputeKit.getEvents.VoteCast();
           console.log("VoteCast event:", (events[0] as any).args);
 
           // Remove the processed vote
           const index = encryptedVotes.indexOf(vote);
           if (index > -1) encryptedVotes.splice(index, 1);
         } catch (error) {
-          console.error(`Error processing vote ${vote.voteIDs.join(",")}:`, error);
+          console.error(`Error processing vote for identity ${vote.identity}:`, error);
         }
       }
 

contracts/src/arbitration/dispute-kits/DisputeKitShutterPoC.sol

@@ -23,7 +23,8 @@ contract DisputeKitShutterPoC {
         address indexed _juror,
         uint256[] _voteIDs,
         bytes32 _commit,
-        bytes32 _identity
+        bytes32 _identity,
+        bytes _encryptedVote
     );
 
     event VoteCast(
@@ -57,7 +58,8 @@ contract DisputeKitShutterPoC {
         uint256 _coreDisputeID,
         uint256[] calldata _voteIDs,
         bytes32 _commit,
-        bytes32 _identity
+        bytes32 _identity,
+        bytes calldata _encryptedVote
     ) external {
         // Store the commitment hash for each voteID
         for (uint256 i = 0; i < _voteIDs.length; i++) {
@@ -66,7 +68,7 @@ contract DisputeKitShutterPoC {
         }
 
         totalCommitted += _voteIDs.length;
-        emit CommitCast(_coreDisputeID, msg.sender, _voteIDs, _commit, _identity);
+        emit CommitCast(_coreDisputeID, msg.sender, _voteIDs, _commit, _identity, _encryptedVote);
     }
 
     function castVote(