Merge pull request #149 from Concordium/release/election-contract/1.0.0

Release/election contract/1.0.0
Concordium · Apr 26, 2024 · ee642fe · ee642fe
2 parents 29ed2ca + 8639261
commit ee642fe
Show file tree

Hide file tree

Showing 34 changed files with 800 additions and 457 deletions.
diff --git a/apps/electionguard-bindings/Cargo.lock b/apps/electionguard-bindings/Cargo.lock
diff --git a/apps/guardian/CHANGELOG.md b/apps/guardian/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Unreleased
+## 1.0.0
 
 - Improve dialogue on guardian action modal
 - Improve error message when requests to get remote resources fail.

diff --git a/apps/guardian/package.json b/apps/guardian/package.json
@@ -1,7 +1,7 @@
 {
     "name": "guardian",
     "private": true,
-    "version": "0.1.2",
+    "version": "1.0.0",
     "type": "module",
     "scripts": {
         "dev": "vite",

diff --git a/apps/guardian/src-tauri/Cargo.lock b/apps/guardian/src-tauri/Cargo.lock
diff --git a/apps/guardian/src-tauri/src/main.rs b/apps/guardian/src-tauri/src/main.rs
@@ -1233,13 +1233,14 @@ async fn generate_decryption_proofs(
         .as_ref()
         .context("Could not find encrypted tally in app state")?;
 
-    // Find all decryption shares for all guardians. If the shares registered by a
-    // specific guardian cannot be decoded, return
+    // Find all decryption shares for all included guardians. If the shares
+    // registered by a specific guardian cannot be decoded, return
     // `Error::InvalidDecryptionShare`. If the shares are missing, exclude them from
     // the shares used.
     let decryption_shares: Vec<_> = contract_data
         .guardians
         .iter()
+        .filter(|(_, guardian_state)| !guardian_state.excluded)
         .filter_map(|(_, guardian_state)| guardian_state.decryption_share.as_ref())
         .map(|bytes| {
             decode::<GuardianDecryption>(bytes).map_err(|_| {

diff --git a/apps/guardian/src-tauri/tauri.conf.json b/apps/guardian/src-tauri/tauri.conf.json
@@ -7,7 +7,7 @@
     },
     "package": {
         "productName": "Concordium Election Guardian",
-        "version": "0.1.2"
+        "version": "1.0.0"
     },
     "tauri": {
         "allowlist": {

diff --git a/apps/guardian/src/pages/Actions/DecryptionActions.tsx b/apps/guardian/src/pages/Actions/DecryptionActions.tsx
@@ -156,7 +156,7 @@ const GenerateDecryptionProof = makeActionableStep(
 
 export function DecryptionActions() {
     const electionStep = useAtomValue(electionStepAtom);
-    const { guardians } = useAtomValue(guardiansStateAtom);
+    const guardians = useAtomValue(guardiansStateAtom).guardians?.filter(([, g]) => !g.excluded);
     const electionConfig = useAtomValue(electionConfigAtom);
 
     if (electionStep?.phase !== ElectionPhase.Tally || guardians === undefined || electionConfig === undefined) {
@@ -173,7 +173,7 @@ export function DecryptionActions() {
             {step === TallyStep.GenerateDecryptionShare && <GenerateDecryptionShare />}
             {step === TallyStep.AwaitPeerShares && (
                 <AwaitPeers
-                    guardians={guardians.filter(([, gs]) => !gs.excluded)}
+                    guardians={guardians}
                     predicate={(g) => g.hasDecryptionShare}
                     note={
                         <>
@@ -191,7 +191,7 @@ export function DecryptionActions() {
                 <h3>The decryption was not completed by a sufficient amount of guardians</h3>
             )}
             {step === TallyStep.GenerateDecryptionProof && <GenerateDecryptionProof />}
-            {step === TallyStep.AwaitPeerShares && (
+            {step === TallyStep.AwaitPeerProofs && (
                 <AwaitPeers
                     predicate={(g) => g.hasDecryptionProof}
                     guardians={guardians.filter(([, gs]) => gs.hasDecryptionShare)}

diff --git a/apps/guardian/src/shared/store.ts b/apps/guardian/src/shared/store.ts
@@ -161,7 +161,7 @@ export const electionStepAtom = atom<ElectionStep | undefined, [], void>(
             const includedGuardians = guardians.filter((g) => !g.excluded);
             const step = (() => {
                 if (includedGuardians.every((g) => g.hasDecryptionShare && g.hasDecryptionProof)) return TallyStep.Done;
-                if (guardian.hasDecryptionShare && guardian.hasDecryptionProof) return TallyStep.AwaitPeerShares;
+                if (guardian.hasDecryptionShare && guardian.hasDecryptionProof) return TallyStep.AwaitPeerProofs;
                 if (
                     electionConfig.decryptionDeadline < now &&
                     includedGuardians.filter((g) => g.hasDecryptionShare).length < electionConfig.guardianThreshold

diff --git a/apps/shared/__generated__/election-contract/election_schema.json b/apps/shared/__generated__/election-contract/election_schema.json
diff --git a/apps/shared/__generated__/election-contract/module.ts b/apps/shared/__generated__/election-contract/module.ts