Merge branch 'master' into renovate/chainpad-crypto-0.x

Jenkinsfile

@@ -7,9 +7,9 @@ pipeline {
 
   agent any
 
-  triggers {
+  //triggers {
-    cron('@midnight')
+  //  cron('@midnight')
-  }
+  //}
 
   stages {
     stage('Clone repository') {

package-lock.json

@@ -176,16 +176,18 @@
       "optional": true
     },
     "chainpad-crypto": {
-      "version": "0.2.4",
+      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/chainpad-crypto/-/chainpad-crypto-0.2.4.tgz",
+      "resolved": "https://registry.npmjs.org/chainpad-crypto/-/chainpad-crypto-0.3.0.tgz",
-      "integrity": "sha512-fWbVyeAv35vf/dkkQaefASlJcEfpEvfRI23Mtn+/TBBry7+LYNuJMXJiovVY35pfyw2+trKh1Py5Asg9vrmaVg==",
+      "integrity": "sha512-L6gUiE8m/ZrUE3eVMju6qzG92Mis3M4T1xCuxVF3eqwa9+46fl9OFwt/TiSmi+oVHSIBmgDTcnOEF/JSxnxYxw==",
       "requires": {
-        "tweetnacl": "git://github.com/dchest/tweetnacl-js.git#v0.12.2"
+        "tweetnacl": "^1.0.3",
+        "tweetnacl-util": "^0.15.1"
       },
       "dependencies": {
         "tweetnacl": {
-          "version": "git://github.com/dchest/tweetnacl-js.git#8a21381d696acdc4e99c9f706f1ad23285795f79",
+          "version": "1.0.3",
-          "from": "git://github.com/dchest/tweetnacl-js.git#v0.12.2"
+          "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz",
+          "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw=="
         }
       }
     },
@@ -1607,6 +1609,11 @@
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.12.2.tgz",
       "integrity": "sha1-vVn4kFB4VvsKETasw6i0RUfinds="
     },
+    "tweetnacl-util": {
+      "version": "0.15.1",
+      "resolved": "https://registry.npmjs.org/tweetnacl-util/-/tweetnacl-util-0.15.1.tgz",
+      "integrity": "sha512-RKJBIj8lySrShN4w6i/BonWp2Z/uxwC3h4y7xsRrpP59ZboCd0GpEVsOnMDYLMmKBpYhb5TgHzZXy7wTfYFBRw=="
+    },
     "type-is": {
       "version": "1.6.18",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",

package.json

@@ -12,7 +12,7 @@
     "url": "https://opencollective.com/cryptpad"
   },
   "dependencies": {
-    "chainpad-crypto": "^0.2.2",
+    "chainpad-crypto": "^0.3.0",
     "chainpad-server": "^4.0.9",
     "express": "~4.16.0",
     "fs-extra": "^7.0.0",