Upgrade pyodide to 0.17.0

.code-workspace

@@ -8,6 +8,10 @@
             "name": "Bulletin Board Gem",
             "path": "bulletin_board/ruby-client"
         },
+        {
+            "name": "Bulletin Board JS Client",
+            "path": "bulletin_board/js-client"
+        },
         {
             "name": "Documentation",
             "path": "docs"
@@ -20,13 +24,30 @@
             "name": "Dummy JS Adapter",
             "path": "voting_schemes/dummy/js-adapter"
         },
+        {
+            "name": "ElectionGuard Wrapper",
+            "path": "voting_schemes/electionguard/python-wrapper"
+        },
         {
             "name": "ElectionGuard JS Adapter",
             "path": "voting_schemes/electionguard/js-adapter"
         },
         {
-            "name": "ElectionGuard Wrapper",
-            "path": "voting_schemes/electionguard/python-wrapper"
+            "name": "ElectionGuard Ruby Adapter",
+            "path": "voting_schemes/electionguard/ruby-adapter"
+        },
+        {
+            "name": "ElectionGuard Python2JS",
+            "path": "voting_schemes/electionguard/python-to-js"
+        },
+        {
+            "name": "ElectionGuard Pyodide Base Packages",
+            "path": "voting_schemes/electionguard/pyodide-base-packages"
+        },
+        {
+            "name": "ElectionGuard Pyodide Verifier",
+            "path": "voting_schemes/electionguard/verifier"
         }
-    ]
+    ],
+    "settings": {}
 }

Dockerfile.release

@@ -12,7 +12,7 @@ ADD voting_schemes/electionguard/python-wrapper /code/voting_schemes/electiongua
 RUN cd /code && make build_electionguard_python_wrapper
 
 # This stage builds the pyodide packages for the previous python packages
-FROM codegram/electionguard-pyodide-base-packages:0.0.1 as python-to-js-builder
+FROM codegram/electionguard-pyodide-base-packages:0.0.3 as python-to-js-builder
 LABEL author="[email protected]"
 
 ENV PYODIDE_PACKAGES "electionguard,bulletin_board-electionguard"
@@ -86,4 +86,4 @@ RUN npm install --global yarn
 RUN bundle exec rake assets:precompile
 
 # Migrate and seed database
-CMD ["bundle", "exec", "rake", "db:migrate"]
+CMD ["bundle", "exec", "rake", "db:migrate"]

Dockerfile.web

@@ -12,7 +12,7 @@ ADD voting_schemes/electionguard/python-wrapper /code/voting_schemes/electiongua
 RUN cd /code && make build_electionguard_python_wrapper
 
 # This stage builds the pyodide packages for the previous python packages
-FROM codegram/electionguard-pyodide-base-packages:0.0.1 as python-to-js-builder
+FROM codegram/electionguard-pyodide-base-packages:0.0.3 as python-to-js-builder
 LABEL author="[email protected]"
 
 ENV PYODIDE_PACKAGES "electionguard,bulletin_board-electionguard"
@@ -87,4 +87,4 @@ RUN bundle exec rake assets:precompile
 
 # Run the entrypoint script
 COPY ./docker-entrypoint.sh /
-ENTRYPOINT ["/docker-entrypoint.sh"]
+ENTRYPOINT ["/docker-entrypoint.sh"]

bulletin_board/js-client/src/key-ceremony/key-ceremony.component.js

@@ -66,7 +66,7 @@ export class KeyCeremonyComponent extends TrusteeComponent {
     onBindBackupButton,
     onBackupStarted,
   }) {
-    const onSetupDone = this.trustee.setup();
+    const onSetupDone = await this.trustee.setup();
 
     this.trustee.events.subscribe(onEvent);
 

bulletin_board/server/app/assets/javascripts/sandbox/key_ceremony.js

@@ -52,12 +52,12 @@ $(() => {
 
     if (votingSchemeName === "dummy") {
       trusteeWrapperAdapter = new DummyTrusteeWrapperAdapter({
-        trusteeId: trusteeContext.uniqueId,
+        trusteeId: trusteeContext.uniqueId
       });
     } else if (votingSchemeName === "electionguard") {
       trusteeWrapperAdapter = new ElectionGuardTrusteeWrapperAdapter({
         trusteeId: trusteeContext.uniqueId,
-        workerUrl: "/assets/electionguard/webworker.js",
+        workerUrl: "/assets/electionguard/webworker.js"
       });
     } else {
       throw new Error(`Voting scheme ${votingSchemeName} not supported.`);

bulletin_board/server/app/assets/javascripts/sandbox/tally.js

@@ -52,7 +52,7 @@ $(() => {
     } else if (votingSchemeName === "electionguard") {
       trusteeWrapperAdapter = new ElectionGuardTrusteeWrapperAdapter({
         trusteeId: trusteeContext.uniqueId,
-        workerUrl: "/assets/electionguard/webworker.js",
+        workerUrl: "/assets/electionguard/webworker.js"
       });
     } else {
       throw new Error(`Voting scheme ${votingSchemeName} not supported.`);

bulletin_board/server/app/assets/javascripts/sandbox/vote.js

@@ -79,7 +79,7 @@ $(() => {
   } else if (votingSchemeName === "electionguard") {
     voterWrapperAdapter = new ElectionGuardVoterWrapperAdapter({
       voterId: voterUniqueId,
-      workerUrl: "/assets/electionguard/webworker.js",
+      workerUrl: "/assets/electionguard/webworker.js"
     });
   } else {
     throw new Error(`Voting scheme ${votingSchemeName} not supported.`);

bulletin_board/server/app/views/sandbox/elections/key_ceremony.html.erb

@@ -52,4 +52,4 @@
   </div>
 </section>
 
-<%= javascript_include_tag "sandbox/key_ceremony" %>
+<%= javascript_include_tag "sandbox/key_ceremony" %>

bulletin_board/server/app/views/sandbox/elections/tally.html.erb

@@ -46,4 +46,4 @@
   </div>
 </section>
 
-<%= javascript_include_tag "sandbox/tally" %>
+<%= javascript_include_tag "sandbox/tally" %>

bulletin_board/server/app/views/sandbox/elections/vote.html.erb

@@ -62,4 +62,4 @@
   </form>
 </section>
 
-<%= javascript_include_tag "sandbox/vote" %>
+<%= javascript_include_tag "sandbox/vote" %>

bulletin_board/server/db/seeds.rb

@@ -111,32 +111,32 @@ def create_publish_results_log_entry(election)
   )
 end
 
-TEST_ELECTION_ID_OFFSET = 10_000
-[:created, :key_ceremony, :key_ceremony_ended, :vote, :vote_ended, :tally, :tally_ended, :results_published].each_with_index do |status, i|
-  election = FactoryBot.create(:election, status, election_id: TEST_ELECTION_ID_OFFSET + i)
+# TEST_ELECTION_ID_OFFSET = 10_000
+# [:created, :key_ceremony, :key_ceremony_ended, :vote, :vote_ended, :tally, :tally_ended, :results_published].each_with_index do |status, i|
+#   election = FactoryBot.create(:election, status, election_id: TEST_ELECTION_ID_OFFSET + i)
 
-  next if status == :created
+#   next if status == :created
 
-  create_start_key_ceremony_log_entry(election)
-  next if status == :key_ceremony
+#   create_start_key_ceremony_log_entry(election)
+#   next if status == :key_ceremony
 
-  create_key_ceremony_log_entries(election)
-  create_end_key_ceremony_log_entry(election)
-  next if status == :key_ceremony_ended
+#   create_key_ceremony_log_entries(election)
+#   create_end_key_ceremony_log_entry(election)
+#   next if status == :key_ceremony_ended
 
-  create_start_vote_log_entry(election)
-  next if status == :vote
+#   create_start_vote_log_entry(election)
+#   next if status == :vote
 
-  create_vote_log_entries(election)
-  create_end_vote_log_entry(election)
-  next if status == :vote_ended
+#   create_vote_log_entries(election)
+#   create_end_vote_log_entry(election)
+#   next if status == :vote_ended
 
-  create_start_tally_log_entries(election)
-  next if status == :tally
+#   create_start_tally_log_entries(election)
+#   next if status == :tally
 
-  create_tally_log_entries(election)
-  create_end_tally_log_entry(election)
-  next if status == :tally_ended
+#   create_tally_log_entries(election)
+#   create_end_tally_log_entry(election)
+#   next if status == :tally_ended
 
-  create_publish_results_log_entry(election)
-end
+#   create_publish_results_log_entry(election)
+# end

voting_schemes/electionguard/js-adapter/src/trustee_wrapper_adapter.js

@@ -25,8 +25,8 @@ export class TrusteeWrapperAdapter extends WrapperAdapter {
    *
    * @returns {Promise<undefined>}
    */
-  setup() {
-    return this.processPythonCodeOnWorker(
+  async setup() {
+    return await this.processPythonCode(
       `
         from js import trustee_id
         from bulletin_board.electionguard.trustee import Trustee
@@ -47,11 +47,14 @@ export class TrusteeWrapperAdapter extends WrapperAdapter {
    * @returns {Promise<Object|undefined>}
    */
   async processMessage(messageType, decodedData) {
-    const result = await this.processPythonCodeOnWorker(
+    const result = await this.processPythonCode(
       `
-      import json
       from js import message_type, decoded_data
-      trustee.process_message(message_type, json.loads(decoded_data))
+      import json
+      trustee.process_message(
+        message_type,
+        json.loads(decoded_data)
+      )
     `,
       {
         message_type: messageType,
@@ -75,7 +78,7 @@ export class TrusteeWrapperAdapter extends WrapperAdapter {
    * @returns {Promise<Boolean>}
    */
   isFresh() {
-    return this.processPythonCodeOnWorker(
+    return this.processPythonCode(
       `
       trustee.is_fresh()
     `
@@ -88,7 +91,7 @@ export class TrusteeWrapperAdapter extends WrapperAdapter {
    * @returns {Promise<String>}
    */
   backup() {
-    return this.processPythonCodeOnWorker(
+    return this.processPythonCode(
       `
       trustee.backup().hex()
     `
@@ -102,10 +105,9 @@ export class TrusteeWrapperAdapter extends WrapperAdapter {
    * @returns {Promise<Boolean>}
    */
   restore(state) {
-    return this.processPythonCodeOnWorker(
+    return this.processPythonCode(
       `
       from js import state
-
       trustee = Trustee.restore(bytes.fromhex(state))
       True
     `,
@@ -121,7 +123,7 @@ export class TrusteeWrapperAdapter extends WrapperAdapter {
    * @returns {Promise<Boolean>}
    */
   isKeyCeremonyDone() {
-    return this.processPythonCodeOnWorker(
+    return this.processPythonCode(
       `
       trustee.is_key_ceremony_done()
     `
@@ -134,7 +136,7 @@ export class TrusteeWrapperAdapter extends WrapperAdapter {
    * @returns {Promise<Boolean>}
    */
   isTallyDone() {
-    return this.processPythonCodeOnWorker(
+    return this.processPythonCode(
       `
       trustee.is_tally_done()
     `

voting_schemes/electionguard/js-adapter/src/voter_wrapper_adapter.js

@@ -25,8 +25,8 @@ export class VoterWrapperAdapter extends WrapperAdapter {
    *
    * @returns {Promise<undefined>}
    */
-  setup() {
-    return this.processPythonCodeOnWorker(
+  async setup() {
+    return await this.processPythonCode(
       `
         from js import voter_id
         from bulletin_board.electionguard.voter import Voter
@@ -47,10 +47,10 @@ export class VoterWrapperAdapter extends WrapperAdapter {
    * @returns {Promise<Object|undefined>}
    */
   async processMessage(messageType, decodedData) {
-    const result = await this.processPythonCodeOnWorker(
+    const result = await this.processPythonCode(
       `
-      import json
       from js import message_type, decoded_data
+      import json
       voter.process_message(message_type, json.loads(decoded_data))
     `,
       {
@@ -64,7 +64,7 @@ export class VoterWrapperAdapter extends WrapperAdapter {
       const { message_type, content } = result[0];
       return {
         messageType: message_type,
-        content,
+        content: content.toJs(),
       };
     }
   }
@@ -80,10 +80,10 @@ export class VoterWrapperAdapter extends WrapperAdapter {
    * @returns {Promise<Object|undefined>}
    */
   async encrypt(plainVote, ballotStyle) {
-    const [auditableData, encryptedData] = await this.processPythonCodeOnWorker(
+    const [auditableData, encryptedData] = await this.processPythonCode(
       `
       from js import plain_vote, ballot_style
-      voter.encrypt(plain_vote, ballot_style)
+      voter.encrypt(plain_vote.to_py(), ballot_style)
     `,
       {
         plain_vote: plainVote,

voting_schemes/electionguard/js-adapter/src/wrapper_adapter.js

@@ -3,15 +3,15 @@
  */
 export class WrapperAdapter {
   /**
-   * Runs an arbitrary python code in the web worker.
+   * Runs arbitrary python code
    *
    * @param {String} pythonCode - A string representing valid python code.
    * @param {Object} pythonData - An Object which values can be referenced from
    *                              the python code using the js module.
    * @private
    * @returns {Promise<Object>}
    */
-  processPythonCodeOnWorker(pythonCode, pythonData) {
+  async processPythonCode(pythonCode, pythonData) {
     return new Promise((resolve, reject) => {
       this.worker.onmessage = (event) => {
         resolve(event.data.results);

voting_schemes/electionguard/pyodide-base-packages/Dockerfile

@@ -1,8 +1,10 @@
-FROM iodide/pyodide:0.16.1
+FROM codegram/pyodide:latest
 LABEL author="[email protected]"
 
 ENV PYODIDE_PACKAGES "pyasn1,libgmp,gmpy2,micropip,attrs,sortedcontainers,hypothesis,jsons,typish,rsa"
 
+RUN apt-get update && apt-get install -y m4
+
 # Add base packages meta files
 ADD packages /packages
 
@@ -12,4 +14,4 @@ RUN cp -rf /packages/* /src/pyodide/packages
 WORKDIR /src/pyodide
 
 # Compile base packages
-RUN make
+RUN make

voting_schemes/electionguard/pyodide-base-packages/packages/gmpy2/meta.yaml

@@ -7,11 +7,9 @@ source:
   patches:
     - patches/disable_mpc_mpfr.patch
 build:
-  skip_host: False
-  ldflags: |
-    -L../../../libgmp/gmp-6.2.1/.libs
-  cflags: |
-    -I../../../libgmp/gmp-6.2.1
+  skip_host: True
+  ldflags: -L/src/pyodide/packages/libgmp/build/gmp-6.2.1/.libs
+  cflags: -I/src/pyodide/packages/libgmp/build/gmp-6.2.1
 test:
   imports:
     - gmpy2