Merge branch 'master' into update-dev-docs-link

packages/dashboard/package.json

@@ -11,9 +11,9 @@
     "@fontsource/metropolis": "4.5.0",
     "@ory/kratos-client": "0.5.4-alpha.1",
     "@stripe/react-stripe-js": "1.4.1",
-    "@stripe/stripe-js": "1.17.0",
+    "@stripe/stripe-js": "1.17.1",
     "@tailwindcss/forms": "0.3.3",
-    "autoprefixer": "10.3.1",
+    "autoprefixer": "10.3.2",
     "classnames": "2.3.1",
     "clipboardy": "2.3.0",
     "dayjs": "1.10.6",
@@ -29,7 +29,7 @@
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "skynet-js": "3.0.2",
-    "stripe": "8.169.0",
+    "stripe": "8.170.0",
     "superagent": "6.1.0",
     "swr": "0.5.6",
     "tailwindcss": "2.2.7",

packages/dashboard/yarn.lock

@@ -173,10 +173,10 @@
   dependencies:
     prop-types "^15.7.2"
 
-"@stripe/stripe-js@1.17.0":
+"@stripe/stripe-js@1.17.1":
-  version "1.17.0"
+  version "1.17.1"
-  resolved "https://registry.yarnpkg.com/@stripe/stripe-js/-/stripe-js-1.17.0.tgz#1961aad0aa4d2f1609753c2807ed39baea025691"
+  resolved "https://registry.yarnpkg.com/@stripe/stripe-js/-/stripe-js-1.17.1.tgz#afcb7e86d0b05d1a7af53af89111abd2e8d437ae"
-  integrity sha512-LztkapiDV+2bEjsmAL2QnmTQBJwx37VnvuBkgXxPe9cJr2jbK0UGzumxSZUiRXeUlgh5j3CXh5jsGFTdc3iv+Q==
+  integrity sha512-c9MyDvdi5Xou0j0JPNy86NebtTDfh9o62Ifuzx6GSm2YO0oedBpy51WSyOue2L8Fb+mqESS5gd6mGVEIPUnXsA==
 
 "@tailwindcss/forms@0.3.3":
   version "0.3.3"
@@ -304,14 +304,14 @@ asynckit@^0.4.0:
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
-autoprefixer@10.3.1:
+autoprefixer@10.3.2:
-  version "10.3.1"
+  version "10.3.2"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.3.1.tgz#954214821d3aa06692406c6a0a9e9d401eafbed2"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.3.2.tgz#836e4b4f59eb6876c41012c1c937be74035f3ec8"
-  integrity sha512-L8AmtKzdiRyYg7BUXJTzigmhbQRCXFKz6SA1Lqo0+AR2FBbQ4aTAPFSDlOutnFkjhiz8my4agGXog1xlMjPJ6A==
+  integrity sha512-RHKq0YCvhxAn9987n0Gl6lkzLd39UKwCkUPMFE0cHhxU0SvcTjBxWG/CtkZ4/HvbqK9U5V8j03nAcGBlX3er/Q==
   dependencies:
-    browserslist "^4.16.6"
+    browserslist "^4.16.8"
-    caniuse-lite "^1.0.30001243"
+    caniuse-lite "^1.0.30001251"
-    colorette "^1.2.2"
+    colorette "^1.3.0"
     fraction.js "^4.1.1"
     normalize-range "^0.1.2"
     postcss-value-parser "^4.1.0"
@@ -458,7 +458,7 @@ browserify-zlib@0.2.0, browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@4.16.6, browserslist@^4.16.6:
+browserslist@4.16.6:
   version "4.16.6"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2"
   integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==
@@ -469,6 +469,17 @@ browserslist@4.16.6, browserslist@^4.16.6:
     escalade "^3.1.1"
     node-releases "^1.1.71"
 
+browserslist@^4.16.8:
+  version "4.16.8"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.8.tgz#cb868b0b554f137ba6e33de0ecff2eda403c4fb0"
+  integrity sha512-sc2m9ohR/49sWEbPj14ZSSZqp+kbi16aLao42Hmn3Z8FpjuMaq2xCA2l4zl9ITfyzvnvyE0hcg62YkIGKxgaNQ==
+  dependencies:
+    caniuse-lite "^1.0.30001251"
+    colorette "^1.3.0"
+    electron-to-chromium "^1.3.811"
+    escalade "^3.1.1"
+    node-releases "^1.1.75"
+
 buffer-equal-constant-time@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
@@ -532,10 +543,10 @@ camelcase-css@^2.0.1:
   resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5"
   integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==
 
-caniuse-lite@^1.0.30001202, caniuse-lite@^1.0.30001219, caniuse-lite@^1.0.30001228, caniuse-lite@^1.0.30001243:
+caniuse-lite@^1.0.30001202, caniuse-lite@^1.0.30001219, caniuse-lite@^1.0.30001228, caniuse-lite@^1.0.30001251:
-  version "1.0.30001247"
+  version "1.0.30001251"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001247.tgz#105be7a8fb30cdd303275e769a9dfb87d4b3577a"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001251.tgz#6853a606ec50893115db660f82c094d18f096d85"
-  integrity sha512-4rS7co+7+AoOSPRPOPUt5/GdaqZc0EsUpWk66ofE3HJTAajUK2Ss2VwoNzVN69ghg8lYYlh0an0Iy4LIHHo9UQ==
+  integrity sha512-HOe1r+9VkU4TFmnU70z+r7OLmtR+/chB1rdcJUeQlAinjEeb0cKL20tlAtOagNZhbrtLnCvV19B4FmF1rgzl6A==
 
 chalk@2.4.2, chalk@^2.0.0:
   version "2.4.2"
@@ -659,10 +670,10 @@ color@^3.2.0:
     color-convert "^1.9.3"
     color-string "^1.6.0"
 
-colorette@^1.2.2:
+colorette@^1.2.2, colorette@^1.3.0:
-  version "1.2.2"
+  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.3.0.tgz#ff45d2f0edb244069d3b772adeb04fed38d0a0af"
-  integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
+  integrity sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w==
 
 combined-stream@^1.0.8:
   version "1.0.8"
@@ -938,6 +949,11 @@ electron-to-chromium@^1.3.723:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.786.tgz#1fc572abc77e2f474725f8a61acf7e25ced9fbe2"
   integrity sha512-AmvbLBj3hepRk8v/DHrFF8gINxOFfDbrn6Ts3PcK46/FBdQb5OMmpamSpZQXSkfi77FfBzYtQtAk+00LCLYMVw==
 
+electron-to-chromium@^1.3.811:
+  version "1.3.814"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.814.tgz#418fad80c3276a46103ca72a21a8290620d83c4a"
+  integrity sha512-0mH03cyjh6OzMlmjauGg0TLd87ErIJqWiYxMcOLKf5w6p0YEOl7DJAj7BDlXEFmCguY5CQaKVOiMjAMODO2XDw==
+
 elliptic@^6.5.3:
   version "6.5.4"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
@@ -1993,6 +2009,11 @@ node-releases@^1.1.71:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.73.tgz#dd4e81ddd5277ff846b80b52bb40c49edf7a7b20"
   integrity sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==
 
+node-releases@^1.1.75:
+  version "1.1.75"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.75.tgz#6dd8c876b9897a1b8e5a02de26afa79bb54ebbfe"
+  integrity sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw==
+
 normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
@@ -2788,10 +2809,10 @@ strip-eof@^1.0.0:
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
   integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
 
-stripe@8.169.0:
+stripe@8.170.0:
-  version "8.169.0"
+  version "8.170.0"
-  resolved "https://registry.yarnpkg.com/stripe/-/stripe-8.169.0.tgz#5970cc055872fccbc49713f6428a682ece7f3e76"
+  resolved "https://registry.yarnpkg.com/stripe/-/stripe-8.170.0.tgz#5b2a84673663bf5029bd8a7c62eda945700d3ecb"
-  integrity sha512-h4JVMGnhYwkEu8dFHX0MewtTFEWcjJQ2zTiFcvhW5toa/2JcEeObfwH27Z29A6t/6s2vnXrXxEnuyL7gBBAXqA==
+  integrity sha512-1fM9K+WHCHIGAurcf5UYqqUP7LRR+FBcjx4JA+MoH4YqH6/Bi2Xm50O0lMbf3C/iuUg+tuGlFzeqVBsnqIZuEA==
   dependencies:
     "@types/node" ">=8.1.0"
     qs "^6.6.0"

packages/health-check/src/checks/extended.js

@@ -1036,6 +1036,90 @@ function hnsEndpointDirectoryRedirect(done) {
   skylinkVerification(done, expected, { followRedirect: false });
 }
 
+function skappSkySend(done) {
+  skylinkVerification(done, {
+    name: "skysend.hns",
+    source: "https://github.com/redsolver/skysend/",
+    skylink: "GADlWH3ALR2g1cDUBI6Ti8B22iD7R5dfn_8jLfq-atm5iw",
+    bodyHash: "35bc25301501a3b28913ca7a7a06120681365a9c",
+    headers: {
+      "skynet-skylink": "GADlWH3ALR2g1cDUBI6Ti8B22iD7R5dfn_8jLfq-atm5iw",
+      "content-disposition": 'inline; filename="index.html"',
+      "content-type": "text/html",
+    },
+  });
+}
+
+function skappNoteToSelf(done) {
+  skylinkVerification(done, {
+    name: "note-to-self.hns",
+    source: "https://github.com/kwypchlo/note-to-self/",
+    skylink: "EAD_w2YcqtpqVgtRwKXPno9VmKfTcVG3E_OIL-Np_Hz_1g",
+    bodyHash: "e00c1b7348dd419e96bf3c188185a5fb8d04af53",
+    headers: {
+      "skynet-skylink": "EAD_w2YcqtpqVgtRwKXPno9VmKfTcVG3E_OIL-Np_Hz_1g",
+      "content-disposition": 'inline; filename="index.html"',
+      "content-type": "text/html",
+    },
+  });
+}
+
+function skappUniswap(done) {
+  skylinkVerification(done, {
+    name: "uniswap skynet labs fork",
+    source: "https://github.com/SkynetLabs/uniswap-interface/",
+    skylink: "OAAy4_g9EYfuOiUZlz_irkoPgsc_seAjgGozerrT1QvE5A",
+    bodyHash: "db2882b7902f24d62e49905b77d536aaf7b7da75",
+    headers: {
+      "skynet-skylink": "OAAy4_g9EYfuOiUZlz_irkoPgsc_seAjgGozerrT1QvE5A",
+      "content-disposition": 'inline; filename="index.html"',
+      "content-type": "text/html",
+    },
+  });
+}
+
+function skappHackerPaste(done) {
+  skylinkVerification(done, {
+    name: "hackerpaste.hns",
+    source: "https://github.com/harej/hackerpaste/",
+    skylink: "_AGZuZCyRn5kZMFHBssWYc20poXyez1XMO6hmPqAVcM1qg",
+    bodyHash: "12817ac933b7f64fc63ae24a652132ed11e5b622",
+    headers: {
+      "skynet-skylink": "_AGZuZCyRn5kZMFHBssWYc20poXyez1XMO6hmPqAVcM1qg",
+      "content-disposition": 'inline; filename="index.html"',
+      "content-type": "text/html",
+    },
+  });
+}
+
+function skappHowAboutSkapp(done) {
+  skylinkVerification(done, {
+    name: "tirthahalli.hns",
+    source: "-",
+    skylink: "AAAsdvGalu2Fj9P5zLvZhfwoI0CpXeO_kPMSG_YU1PSIWg",
+    bodyHash: "734c49ddde2a49ac6ddbf1c6d90a014ff82e2f87",
+    headers: {
+      "skynet-skylink": "AAAsdvGalu2Fj9P5zLvZhfwoI0CpXeO_kPMSG_YU1PSIWg",
+      "content-disposition": 'inline; filename="index.html"',
+      "content-type": "text/html",
+    },
+  });
+}
+
+function skappSkyDeploy(done) {
+  skylinkVerification(done, {
+    name: "sky-deploy.hns",
+    source: "-",
+    skylink: "CABR1ic_lIPaN9JYLG6AiudkW5GShRd-Cr6Wkjur7z29Rw",
+    bodyHash: "b2b0498a8a7f6fcfe76c29ae1a1176b4e64cb5ab",
+    headers: {
+      "skynet-skylink": "CABR1ic_lIPaN9JYLG6AiudkW5GShRd-Cr6Wkjur7z29Rw",
+      "content-disposition": 'inline; filename="index.html"',
+      "content-type": "text/html",
+    },
+  });
+}
+
 function parseHeaderString(header) {
   try {
     return JSON.parse(header);
@@ -1061,7 +1145,7 @@ async function skylinkVerification(done, expected, { followRedirect = true, meth
     }
 
     // Check if the response body is valid by checking against the known hash
-    if (expected.bodyHash) {
+    if ("bodyHash" in expected) {
       const currentBodyHash = hasha(response.rawBody, { algorithm: "sha1" });
       if (currentBodyHash !== expected.bodyHash) {
         entry.up = false;
@@ -1153,4 +1237,10 @@ module.exports = [
   uniswapHNSResolverCheck,
   uniswapHNSResolverRedirectCheck,
   hnsEndpointDirectoryRedirect,
+  skappSkySend,
+  skappNoteToSelf,
+  skappUniswap,
+  skappHackerPaste,
+  skappHowAboutSkapp,
+  skappSkyDeploy,
 ];

packages/health-check/src/run.js

@@ -1,3 +1,4 @@
+const util = require("util");
 const { getYesterdayISOString } = require("./utils");
 const createMiddleware = require("./checks/middleware");
 
@@ -43,7 +44,12 @@ require("yargs/yargs")(process.argv.slice(2)).command(
 
     // exit with code 1 if any of the checks report failure
     if (entry.checks.some(({ up }) => !up)) {
-      console.log(entry.checks.filter(({ up }) => !up));
+      console.log(
+        util.inspect(
+          entry.checks.filter(({ up }) => !up),
+          { colors: true, depth: 7 } // increase depth to ensure errors are printed
+        )
+      );
       process.exit(1);
     }
   }

packages/website/package.json

@@ -9,36 +9,36 @@
     "@fontsource/source-sans-pro": "^4.5.0",
     "@svgr/webpack": "^5.5.0",
     "@tailwindcss/typography": "^0.4.1",
-    "autoprefixer": "^10.3.1",
+    "autoprefixer": "^10.3.2",
     "bytes": "^3.1.0",
     "classnames": "^2.3.1",
     "copy-text-to-clipboard": "^3.0.1",
     "crypto-browserify": "^3.12.0",
     "framer-motion": "^4.1.17",
-    "gatsby": "^3.11.1",
+    "gatsby": "^3.12.0",
     "gatsby-background-image": "^1.5.3",
     "gatsby-image": "^3.11.0",
-    "gatsby-plugin-image": "^1.11.0",
+    "gatsby-plugin-image": "^1.12.0",
-    "gatsby-plugin-manifest": "^3.11.0",
+    "gatsby-plugin-manifest": "^3.12.0",
     "gatsby-plugin-matomo": "^0.10.0",
-    "gatsby-plugin-offline": "^4.11.0",
+    "gatsby-plugin-offline": "^4.12.0",
-    "gatsby-plugin-postcss": "^4.11.0",
+    "gatsby-plugin-postcss": "^4.12.0",
     "gatsby-plugin-purgecss": "^6.0.2",
-    "gatsby-plugin-react-helmet": "^4.11.0",
+    "gatsby-plugin-react-helmet": "^4.12.0",
     "gatsby-plugin-robots-txt": "^1.6.9",
-    "gatsby-plugin-sharp": "^3.11.0",
+    "gatsby-plugin-sharp": "^3.12.0",
     "gatsby-plugin-svgr": "^3.0.0-beta.0",
     "gatsby-remark-classes": "^1.0.0",
-    "gatsby-remark-copy-linked-files": "^4.8.0",
+    "gatsby-remark-copy-linked-files": "^4.9.0",
-    "gatsby-remark-images": "^5.8.0",
+    "gatsby-remark-images": "^5.9.0",
-    "gatsby-remark-prismjs": "^5.8.0",
+    "gatsby-remark-prismjs": "^5.9.0",
-    "gatsby-remark-responsive-iframe": "^4.8.0",
+    "gatsby-remark-responsive-iframe": "^4.9.0",
-    "gatsby-remark-smartypants": "^4.8.0",
+    "gatsby-remark-smartypants": "^4.9.0",
-    "gatsby-source-filesystem": "^3.11.0",
+    "gatsby-source-filesystem": "^3.12.0",
-    "gatsby-transformer-json": "^3.11.0",
+    "gatsby-transformer-json": "^3.12.0",
-    "gatsby-transformer-remark": "^4.8.0",
+    "gatsby-transformer-remark": "^4.9.0",
-    "gatsby-transformer-sharp": "^3.11.0",
+    "gatsby-transformer-sharp": "^3.12.0",
-    "gatsby-transformer-yaml": "^3.11.0",
+    "gatsby-transformer-yaml": "^3.12.0",
     "gbimage-bridge": "^0.1.4",
     "http-status-codes": "^2.1.4",
     "jsonp": "^0.2.1",
@@ -66,7 +66,7 @@
   },
   "devDependencies": {
     "cross-env": "^7.0.3",
-    "cypress": "^8.2.0",
+    "cypress": "^8.3.0",
     "cypress-file-upload": "^5.0.8",
     "prettier": "^2.3.2"
   },

setup-scripts/health-checker.py

@@ -173,6 +173,9 @@ async def check_health():
                 critical_checks_failed += 1
                 bad = True
         if bad:
+            critical["checks"] = [
+                check for check in critical["checks"] if check["up"] == False
+            ]
             failed_records.append(critical)
 
     for extended in json_extended:
@@ -186,6 +189,9 @@ async def check_health():
                 extended_checks_failed += 1
                 bad = True
         if bad:
+            extended["checks"] = [
+                check for check in extended["checks"] if check["up"] == False
+            ]
             failed_records.append(extended)
 
     ################################################################################