Merge pull request #3 from yeniyan-group/get-election-result-as-read

fix: accredite voted voter resets voter to accredited again

Author: Ayeni-yeniyan

README.md

@@ -91,14 +91,14 @@ forge build
 The VotsEngine contract is currently deployed and live on multiple testnets:
 
 ### Sepolia Testnet
-**VotsEngine Contract**: `0x91f995B3160af869F8bDB9d031648363CACdC60F`
+**VotsEngine Contract**: `0xBdAc4C73AdFF22977cA7C8E71D0cb49566147C41`
 
-**NFT Contract**: `0xD34359FCFB6596CBf2ce4b146AF98402CEe4f8B5`
+**NFT Contract**: `0x2482E5690D3AF17986a8D17fD847ff444Baa6Ce9`
 
 **Network**: Sepolia Testnet
 - **Chain ID**: 11155111
-- **VotsEngine Block Explorer**: https://sepolia.etherscan.io/address/0x91f995B3160af869F8bDB9d031648363CACdC60F
-- **NFT Contract Block Explorer**: https://sepolia.etherscan.io/address/0xD34359FCFB6596CBf2ce4b146AF98402CEe4f8B5
+- **VotsEngine Block Explorer**: https://sepolia.etherscan.io/address/0xBdAc4C73AdFF22977cA7C8E71D0cb49566147C41
+- **NFT Contract Block Explorer**: https://sepolia.etherscan.io/address/0x2482E5690D3AF17986a8D17fD847ff444Baa6Ce9
 
 ### Fuji Testnet (Avalanche)
 **VotsEngine Contract**: `0xed7eA5221041A1982d9d257c9617B1448032838d`
@@ -120,7 +120,7 @@ You can interact with the deployed contract using:
 
 ```javascript
 // Example using ethers.js with Sepolia
-const sepoliaContractAddress = "0x91f995B3160af869F8bDB9d031648363CACdC60F....";
+const sepoliaContractAddress = "0xBdAc4C73AdFF22977cA7C8E71D0cb49566147C41....";
 const VotsEngineSepoliaClient = new ethers.Contract(sepoliaContractAddress, abi, sepoliaProvider);
 
 // Example using ethers.js with Fuji
@@ -146,7 +146,7 @@ The VotsEngine system requires a **hybrid physical-digital infrastructure**:
 ### Deploying the System
 
 The VotsEngine is already deployed on multiple testnets:
-- **Sepolia**: `0x91f995B3160af869F8bDB9d031648363CACdC60F....`
+- **Sepolia**: `0xBdAc4C73AdFF22977cA7C8E71D0cb49566147C41....`
 - **Fuji (Avalanche)**: `0xed7eA5221041A1982d9d257c9617B1448032838d`
 
 For local development or custom deployments:
@@ -161,7 +161,7 @@ Or connect to the existing deployments:
 ```javascript
 // Connect to Sepolia deployment
 const VotsEngineSepoliaClient = new ethers.Contract(
-    "0x91f995B3160af869F8bDB9d031648363CACdC60F....", 
+    "0xBdAc4C73AdFF22977cA7C8E71D0cb49566147C41....", 
     VotsEngineABI, 
     sepoliaProvider
 );

broadcast/DeployVotsEngine.s.sol/11155111/run-1753543173.json

@@ -731,9 +731,15 @@ contract Election is IElection, Ownable {
         onElectionStarted
         noUnknown(voterMatricNo)
     {
-        if (_votersMap[voterMatricNo].voterState == VoterState.ACCREDITED) {
+        // Add explicit logging for debugging
+        VoterState currentState = _votersMap[voterMatricNo].voterState;
+        // if voter is voted or accredited revert
+        if (currentState == VoterState.ACCREDITED) {
             revert Election__VoterAlreadyAccredited();
         }
+        if (currentState == VoterState.VOTED) {
+            revert Election__VoterAlreadyVoted();
+        }
         _votersMap[voterMatricNo].voterState = VoterState.ACCREDITED;
         s_accreditedVotersCount++;
         emit AccreditedVoter(voterMatricNo);

broadcast/DeployVotsEngine.s.sol/11155111/run-latest.json

@@ -1,176 +1,96 @@
 
-== Return ==
-0: contract VotsEngine 0x91f995B3160af869F8bDB9d031648363CACdC60F
+0: contract VotsEngine 0xBdAc4C73AdFF22977cA7C8E71D0cb49566147C41
 
 ## Setting up 1 EVM.
 ==========================
 Simulated On-chain Traces:
 
-  [3582502] → new CreateElection@0xC3235ce9C7CF374C435c2066c12d7341d9818428
+  [3586102] → new CreateElection@0x31bc6680d0918C361F6c2efd5a105D858f414799
     ├─ emit OwnershipTransferred(previousOwner: 0x0000000000000000000000000000000000000000, newOwner: 0x688ce0CCf27a0D0B2b578199ACf3125a1F31f1c0)
-    └─ ← [Return] 17774 bytes of code
+    └─ ← [Return] 17792 bytes of code
 
-  [2303694] → new VotsElectionNft@0xD34359FCFB6596CBf2ce4b146AF98402CEe4f8B5
+  [2303694] → new VotsElectionNft@0x2482E5690D3AF17986a8D17fD847ff444Baa6Ce9
     ├─ emit OwnershipTransferred(previousOwner: 0x0000000000000000000000000000000000000000, newOwner: 0x688ce0CCf27a0D0B2b578199ACf3125a1F31f1c0)
     └─ ← [Return] 11163 bytes of code
 
-  [2591461] → new VotsEngine@0x91f995B3160af869F8bDB9d031648363CACdC60F
+  [2591461] → new VotsEngine@0xBdAc4C73AdFF22977cA7C8E71D0cb49566147C41
     ├─ emit OwnershipTransferred(previousOwner: 0x0000000000000000000000000000000000000000, newOwner: 0x688ce0CCf27a0D0B2b578199ACf3125a1F31f1c0)
     └─ ← [Return] 12823 bytes of code
 
-  [1542915] → new VotsEngineFunctionClient@0xAccf5D57346D6D6C7F0372A9e83b2a2B132B195A
+  [1542915] → new VotsEngineFunctionClient@0x7fAF6E1382A5DF126548738cC4BAD1aC77C33362
     └─ ← [Return] 7704 bytes of code
 
-  [26279] VotsEngine::setFunctionClient(VotsEngineFunctionClient: [0xAccf5D57346D6D6C7F0372A9e83b2a2B132B195A])
-    ├─ emit FunctionClientUpdated(oldClient: 0x0000000000000000000000000000000000000000, newClient: VotsEngineFunctionClient: [0xAccf5D57346D6D6C7F0372A9e83b2a2B132B195A])
+  [26279] VotsEngine::setFunctionClient(VotsEngineFunctionClient: [0x7fAF6E1382A5DF126548738cC4BAD1aC77C33362])
+    ├─ emit FunctionClientUpdated(oldClient: 0x0000000000000000000000000000000000000000, newClient: VotsEngineFunctionClient: [0x7fAF6E1382A5DF126548738cC4BAD1aC77C33362])
     └─ ← [Return]
 
-  [7036] CreateElection::transferOwnership(VotsEngine: [0x91f995B3160af869F8bDB9d031648363CACdC60F])
-    ├─ emit OwnershipTransferred(previousOwner: 0x688ce0CCf27a0D0B2b578199ACf3125a1F31f1c0, newOwner: VotsEngine: [0x91f995B3160af869F8bDB9d031648363CACdC60F])
+  [7036] CreateElection::transferOwnership(VotsEngine: [0xBdAc4C73AdFF22977cA7C8E71D0cb49566147C41])
+    ├─ emit OwnershipTransferred(previousOwner: 0x688ce0CCf27a0D0B2b578199ACf3125a1F31f1c0, newOwner: VotsEngine: [0xBdAc4C73AdFF22977cA7C8E71D0cb49566147C41])
     └─ ← [Return]
 
-  [7474] VotsElectionNft::transferOwnership(VotsEngine: [0x91f995B3160af869F8bDB9d031648363CACdC60F])
-    ├─ emit OwnershipTransferred(previousOwner: 0x688ce0CCf27a0D0B2b578199ACf3125a1F31f1c0, newOwner: VotsEngine: [0x91f995B3160af869F8bDB9d031648363CACdC60F])
+  [7474] VotsElectionNft::transferOwnership(VotsEngine: [0xBdAc4C73AdFF22977cA7C8E71D0cb49566147C41])
+    ├─ emit OwnershipTransferred(previousOwner: 0x688ce0CCf27a0D0B2b578199ACf3125a1F31f1c0, newOwner: VotsEngine: [0xBdAc4C73AdFF22977cA7C8E71D0cb49566147C41])
     └─ ← [Stop]
 
 
 ==========================
 
 Chain 11155111
 
-Estimated gas price: 0.001444578 gwei
+Estimated gas price: 0.00391987 gwei
 
-Estimated total gas used for script: 14500429
+Estimated total gas used for script: 14505467
 
-Estimated amount required: 0.000020947000723962 ETH
+Estimated amount required: 0.00005685954492929 ETH
 
 ==========================
 
 ##### sepolia
-✅  [Success] Hash: 0x0f08eeebbc4ef47a40d3b829d2748c7684473c427bea6c93f4e6b32ab61ba8fe
-Contract Address: 0xD34359FCFB6596CBf2ce4b146AF98402CEe4f8B5
-Block: 8839064
-Paid: 0.000003095385333792 ETH (2549724 gas * 0.001214008 gwei)
+✅  [Success] Hash: 0x45678cdbfe6d080a46d4150230a07c625018edd7ce0aa1d1d1e7524ddf9793bc
+Contract Address: 0xBdAc4C73AdFF22977cA7C8E71D0cb49566147C41
+Block: 8847346
+Paid: 0.000006807683943934 ETH (2853889 gas * 0.002385406 gwei)
 
 
 ##### sepolia
-✅  [Success] Hash: 0x15f65fa3cb8f9704b04f8c3e5c334f7fc2cbc0280fe9c4d80ffeb6e95ae91957
-Contract Address: 0x91f995B3160af869F8bDB9d031648363CACdC60F
-Block: 8839064
-Paid: 0.000003464658645208 ETH (2853901 gas * 0.001214008 gwei)
+✅  [Success] Hash: 0xc5b63ef6f37b9c0df7d9f01c27a686e266fc511bd585fc4674b2c615174c7d14
+Contract Address: 0x7fAF6E1382A5DF126548738cC4BAD1aC77C33362
+Block: 8847346
+Paid: 0.00000410601127483 ETH (1721305 gas * 0.002385406 gwei)
 
 
 ##### sepolia
-✅  [Success] Hash: 0xa36bac05579ccda5c04c813686cd23a22fa84b88e60ef0a5b27e908957ee3321
-Block: 8839064
-Paid: 0.000000034560379744 ETH (28468 gas * 0.001214008 gwei)
+✅  [Success] Hash: 0xdcae3ab0f82ce93edf6bc5b2599f2182383ec040adaf6547ab5468ce5163f7a4
+Contract Address: 0x2482E5690D3AF17986a8D17fD847ff444Baa6Ce9
+Block: 8847346
+Paid: 0.000006082126927944 ETH (2549724 gas * 0.002385406 gwei)
 
 
 ##### sepolia
-✅  [Success] Hash: 0xea62dd80283382ec7222ba70b756c1c2b6e9f651e81ea3d11970d20c7eac2013
-Contract Address: 0xAccf5D57346D6D6C7F0372A9e83b2a2B132B195A
-Block: 8839064
-Paid: 0.00000208967804044 ETH (1721305 gas * 0.001214008 gwei)
+✅  [Success] Hash: 0x47b5883cb00b3e7a07da07c81024d2560a5184071414d3d42c9903ec0b25b1f9
+Block: 8847346
+Paid: 0.000000113810105666 ETH (47711 gas * 0.002385406 gwei)
 
 
 ##### sepolia
-✅  [Success] Hash: 0x4f53d8d42718d507037b65019a3fa00057a9543b1791a2d0b3dd0400ed180e7a
-Contract Address: 0xC3235ce9C7CF374C435c2066c12d7341d9818428
-Block: 8839064
-Paid: 0.00000475380038632 ETH (3915790 gas * 0.001214008 gwei)
+✅  [Success] Hash: 0xcba78b501e13bae4252ef702e10e995fb15566a3a927de6e5dc0136c0fd5dd17
+Block: 8847346
+Paid: 0.000000068952545836 ETH (28906 gas * 0.002385406 gwei)
 
 
 ##### sepolia
-✅  [Success] Hash: 0x6d2be35a4efa6186381693b325daa17af5ab40583419fb2041ae1bf92811450c
-Block: 8839064
-Paid: 0.000000035092115248 ETH (28906 gas * 0.001214008 gwei)
+✅  [Success] Hash: 0x520ad73d5987a4f8ff3ab6d62fe6e8e7cfe7c9a5fce39d5d6f82e38db3211d78
+Block: 8847346
+Paid: 0.000000067907738008 ETH (28468 gas * 0.002385406 gwei)
 
 
 ##### sepolia
-✅  [Success] Hash: 0x3a34fc677e0cddb5f824dd44bb46042d5d9c73c5a7e057a7a3e152e744983114
-Block: 8839064
-Paid: 0.000000057921535688 ETH (47711 gas * 0.001214008 gwei)
+✅  [Success] Hash: 0x709d230c5d76365feb83a4d898ec9c30b1e7cef2a057bf997372b1a3a7671f2b
+Contract Address: 0x31bc6680d0918C361F6c2efd5a105D858f414799
+Block: 8847346
+Paid: 0.000009350023419268 ETH (3919678 gas * 0.002385406 gwei)
 
-✅ Sequence #1 on sepolia | Total Paid: 0.00001353109643644 ETH (11145805 gas * avg 0.001214008 gwei)
-                                                                                                                                                                         
+✅ Sequence #1 on sepolia | Total Paid: 0.000026596515955486 ETH (11149681 gas * avg 0.002385406 gwei)
+                                                                                                                                                                                                                            
 
-==========================
-
-ONCHAIN EXECUTION COMPLETE & SUCCESSFUL.
-Warning: We haven't found any matching bytecode for the following contracts: [0xd34359fcfb6596cbf2ce4b146af98402cee4f8b5].
-
-This may occur when resuming a verification, but the underlying source code or compiler version has changed.
-##
-Start verification for (3) contracts
-Start verifying contract `0xC3235ce9C7CF374C435c2066c12d7341d9818428` deployed on sepolia
-EVM version: cancun
-Compiler version: 0.8.28
-Optimizations:    200
-
-Submitting verification for [src/CreateElection.sol:CreateElection] 0xC3235ce9C7CF374C435c2066c12d7341d9818428.
-Warning: Could not detect the deployment.; waiting 5 seconds before trying again (4 tries remaining)
-
-Submitting verification for [src/CreateElection.sol:CreateElection] 0xC3235ce9C7CF374C435c2066c12d7341d9818428.
-Warning: Could not detect the deployment.; waiting 5 seconds before trying again (3 tries remaining)
-
-Submitting verification for [src/CreateElection.sol:CreateElection] 0xC3235ce9C7CF374C435c2066c12d7341d9818428.
-Warning: Could not detect the deployment.; waiting 5 seconds before trying again (2 tries remaining)
-
-Submitting verification for [src/CreateElection.sol:CreateElection] 0xC3235ce9C7CF374C435c2066c12d7341d9818428.
-Warning: Could not detect the deployment.; waiting 5 seconds before trying again (1 tries remaining)
-
-Submitting verification for [src/CreateElection.sol:CreateElection] 0xC3235ce9C7CF374C435c2066c12d7341d9818428.
-Warning: Could not detect the deployment.; waiting 5 seconds before trying again (0 tries remaining)
-
-Submitting verification for [src/CreateElection.sol:CreateElection] 0xC3235ce9C7CF374C435c2066c12d7341d9818428.
-Submitted contract for verification:
-        Response: `OK`
-        GUID: `5gattwctg6jrsfsdctwtwaa18wtw6sxabq8q3kccm6wgrzquyj`
-        URL: https://sepolia.etherscan.io/address/0xc3235ce9c7cf374c435c2066c12d7341d9818428
-Contract verification status:
-Response: `NOTOK`
-Details: `Pending in queue`
-Warning: Verification is still pending...; waiting 15 seconds before trying again (7 tries remaining)
-Contract verification status:
-Response: `OK`
-Details: `Pass - Verified`
-Contract successfully verified
-Start verifying contract `0x91f995B3160af869F8bDB9d031648363CACdC60F` deployed on sepolia
-EVM version: cancun
-Compiler version: 0.8.28
-Optimizations:    200
-Constructor args: 000000000000000000000000c3235ce9c7cf374c435c2066c12d7341d9818428000000000000000000000000d34359fcfb6596cbf2ce4b146af98402cee4f8b5
-
-Submitting verification for [src/VotsEngine.sol:VotsEngine] 0x91f995B3160af869F8bDB9d031648363CACdC60F.
-Submitted contract for verification:
-        Response: `OK`
-        GUID: `jxwx8kbnhhepzbj3ga1vgrcisis5ky7schf83seusvhyzltntx`
-        URL: https://sepolia.etherscan.io/address/0x91f995b3160af869f8bdb9d031648363cacdc60f
-Contract verification status:
-Response: `NOTOK`
-Details: `Pending in queue`
-Warning: Verification is still pending...; waiting 15 seconds before trying again (7 tries remaining)
-Contract verification status:
-Response: `OK`
-Details: `Pass - Verified`
-Contract successfully verified
-Start verifying contract `0xAccf5D57346D6D6C7F0372A9e83b2a2B132B195A` deployed on sepolia
-EVM version: cancun
-Compiler version: 0.8.28
-Optimizations:    200
-Constructor args: 000000000000000000000000b83e47c2bc239b3bf370bc41e1459a34b41238d066756e2d657468657265756d2d7365706f6c69612d310000000000000000000000000000000000000000000091f995b3160af869f8bdb9d031648363cacdc60f
-
-Submitting verification for [src/VotsEngineFunctionClient.sol:VotsEngineFunctionClient] 0xAccf5D57346D6D6C7F0372A9e83b2a2B132B195A.
-Submitted contract for verification:
-        Response: `OK`
-        GUID: `zkrgxtf7zhiykzbnvpadbnsaqcbhfsqbq77wdwhgi6rzwp4f35`
-        URL: https://sepolia.etherscan.io/address/0xaccf5d57346d6d6c7f0372a9e83b2a2b132b195a
-Contract verification status:
-Response: `NOTOK`
-Details: `Pending in queue`
-Warning: Verification is still pending...; waiting 15 seconds before trying again (7 tries remaining)
-Contract verification status:
-Response: `OK`
-Details: `Pass - Verified`
-Contract successfully verified
-All (3) contracts were verified!
+==========================