Merge pull request #34 from cryptimeleon/develop

Version bump and fix binder

Author: Jan Bobolz

.github/workflows/github-pages.yml

@@ -38,9 +38,9 @@ jobs:
 
       - name: Convert Jupyter notebooks
         run: |
-          jupyter nbtojekyll getting-started/pairing-tutorial.ipynb --output getting-started/pairing-tutorial.md --binder-link https://mybinder.org/v2/gh/cryptimeleon/cryptimeleon.github.io/master\?filepath\=getting-started%2Fpairing-tutorial.ipynb --image-dir assets/images/pairing-tutorial --md-title "Pairing Tutorial" --binder-link-cell 1 --enable-toc --enable-mathjax --execute
-          jupyter nbtojekyll getting-started/protocols-tutorial.ipynb --output getting-started/protocols-tutorial.md --binder-link https://mybinder.org/v2/gh/cryptimeleon/cryptimeleon.github.io/master\?filepath\=getting-started%2Fprotocols-tutorial.ipynb --md-title "Protocols Tutorial" --binder-link-cell 0 --enable-toc --enable-mathjax --execute
-          jupyter nbtojekyll getting-started/5-minute-tutorial.ipynb --output getting-started/5-minute-tutorial.md --binder-link https://mybinder.org/v2/gh/cryptimeleon/cryptimeleon.github.io/master\?filepath\=getting-started%2F5-minute-tutorial.ipynb --md-title "5 Minute Tutorial" --binder-link-cell 0 --enable-toc --enable-mathjax --execute
+          jupyter nbtojekyll getting-started/pairing-tutorial.ipynb --output getting-started/pairing-tutorial.md --binder-link https://mybinder.org/v2/gh/cryptimeleon/cryptimeleon.github.io/main\?filepath\=getting-started%2Fpairing-tutorial.ipynb --image-dir assets/images/pairing-tutorial --md-title "Pairing Tutorial" --binder-link-cell 1 --enable-toc --enable-mathjax --execute
+          jupyter nbtojekyll getting-started/protocols-tutorial.ipynb --output getting-started/protocols-tutorial.md --binder-link https://mybinder.org/v2/gh/cryptimeleon/cryptimeleon.github.io/main\?filepath\=getting-started%2Fprotocols-tutorial.ipynb --md-title "Protocols Tutorial" --binder-link-cell 0 --enable-toc --enable-mathjax --execute
+          jupyter nbtojekyll getting-started/5-minute-tutorial.ipynb --output getting-started/5-minute-tutorial.md --binder-link https://mybinder.org/v2/gh/cryptimeleon/cryptimeleon.github.io/main\?filepath\=getting-started%2F5-minute-tutorial.ipynb --md-title "5 Minute Tutorial" --binder-link-cell 0 --enable-toc --enable-mathjax --execute
 
       # Use GitHub Actions' cache to shorten build times and decrease load on servers
       - uses: actions/cache@v2

Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:11.0.3-jdk
+FROM openjdk:11.0.12-jdk-buster
 
 RUN apt-get update
 RUN apt-get install -y python3-pip
@@ -32,5 +32,6 @@ RUN chown -R $NB_UID $HOME
 USER $NB_USER
 
 # Launch the notebook server
+EXPOSE 8888
 WORKDIR $HOME
-CMD ["jupyter", "notebook", "--ip", "0.0.0.0"]
+CMD ["jupyter", "notebook", "--ip", "0.0.0.0"]

_config.yml

@@ -28,8 +28,8 @@ kramdown:
     auto_ids: true
     hard_wrap: false
 
-cracoversion: 2.0.0
-mathversion: 2.0.0
+cracoversion: 2.1.0
+mathversion: 2.1.0
 
 # exclude from jekyll site
 exclude:

getting-started/5-minute-tutorial.ipynb

@@ -26,7 +26,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%maven org.cryptimeleon:math:1.0.0"
+    "%maven org.cryptimeleon:math:2.1.0"
    ]
   },
   {

getting-started/pairing-tutorial.ipynb

@@ -51,7 +51,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%maven org.cryptimeleon:math:1.0.0"
+    "%maven org.cryptimeleon:math:2.1.0"
    ]
   },
   {

getting-started/protocols-tutorial.ipynb

@@ -41,8 +41,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%maven org.cryptimeleon:math:1.0.0\n",
-    "%maven org.cryptimeleon:craco:1.0.0\n",
+    "%maven org.cryptimeleon:math:2.1.0\n",
+    "%maven org.cryptimeleon:craco:2.1.0\n",
     "\n",
     "import org.cryptimeleon.math.structures.groups.elliptic.nopairing.Secp256k1;\n",
     "import org.cryptimeleon.math.structures.groups.lazy.*;\n",
@@ -52,6 +52,7 @@
     "import org.cryptimeleon.math.structures.groups.*;\n",
     "import org.cryptimeleon.math.serialization.converter.JSONPrettyConverter;\n",
     "import org.cryptimeleon.craco.protocols.arguments.sigma.schnorr.*;\n",
+    "import org.cryptimeleon.craco.protocols.arguments.sigma.*;\n",
     "import org.cryptimeleon.craco.protocols.*;\n",
     "import org.cryptimeleon.craco.protocols.arguments.fiatshamir.FiatShamirProofSystem;\n",
     "\n",
@@ -176,8 +177,8 @@
     "    }\n",
     "\n",
     "    @Override\n",
-    "    public BigInteger getChallengeSpaceSize() {\n",
-    "        return group.size();\n",
+    "    public ZnChallengeSpace getChallengeSpace(CommonInput commonInput) {\n",
+    "        return new ZnChallengeSpace(group.getZn());\n",
     "    }\n",
     "}\n",
     "\n",
@@ -303,7 +304,7 @@
    "mimetype": "text/x-java-source",
    "name": "Java",
    "pygments_lexer": "java",
-   "version": "14.0.1+7"
+   "version": "15.0.2+7"
   }
  },
  "nbformat": 4,