Merge pull request #314 from dappnode/v0.2.25

v0.2.25 Release

Author: eduadiez

.gitignore

@@ -11,6 +11,8 @@ test_build/
 .nyc_output
 build_*
 uploader
+# This project uses yarn
+build/src/package-lock.json
 
 # Test artifacts
 test_build/

build/Dockerfile

@@ -1,6 +1,6 @@
-# Layer 1: Build the dependencies
+# Layer 0: Common base so it's cached 
 #####################################
-FROM node:10.15.3-alpine as build-deps
+FROM node:10.15.3-alpine as build-base
 
 RUN apk add --no-cache git python build-base bind-tools docker bash jq
 
@@ -9,7 +9,19 @@ WORKDIR /usr/src/app
 # Install app dependencies to use docker's layer cache
 COPY build/src/package.json ./
 COPY build/src/yarn.lock ./
-RUN yarn install --production
+RUN yarn install --production --link-duplicates
+# --link-duplicates: hardlinks for repeated modules. 193964 => 175592
+
+
+
+# Layer 1: Build the dependencies
+#####################################
+FROM build-base as build-deps
+
+# Apply patch-package
+COPY build/src/patches patches
+RUN yarn add -D patch-package --production --frozen-lockfile --skip-integrity-check
+RUN yarn prepare
 
 # Get this DNP version and git hash. Results in /usr/src/app/.version.json
 COPY .git .git
@@ -20,16 +32,9 @@ RUN ./getVersionData.sh
 
 # Layer 2: Build the source .ts files
 #####################################
-FROM node:10.15.3-alpine as build-src
+FROM build-base as build-src
 
-RUN apk add --no-cache git python build-base bind-tools docker bash jq
-
-WORKDIR /usr/src/app
-
-# Add source
-COPY build/src/package.json ./
-COPY build/src/yarn.lock ./
-RUN yarn add -D typescript
+RUN yarn install --frozen-lockfile
 COPY build/src .
 RUN yarn build
 

build/src/.prettierignore

@@ -0,0 +1,6 @@
+# Ignore image assets
+*.png
+
+# Ignore test assets
+*.tar.xz
+*.sh

build/src/.prettierrc

@@ -0,0 +1,13 @@
+{
+  "printWidth": 80,
+  "tabWidth": 2,
+  "useTabs": false,
+  "semi": true,
+  "singleQuote": false,
+  "quoteProps": "as-needed",
+  "jsxSingleQuote": false,
+  "trailingComma": "none",
+  "bracketSpacing": true,
+  "jsxBracketSameLine": false,
+  "arrowParens": "avoid"
+}

build/src/hostScripts/migrate_volume.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+#
+# Script to migrate a docker volume.
+# It's original purpose is to migrate ETHCHAIN volumes to multi-client model.
+
+# Exit on error
+set -e
+
+FROM_VOLUME_NAME=$1
+TO_VOLUME_NAME=$2
+
+DOCKER_ROOT_DIR=$(docker info -f '{{ .DockerRootDir }}')
+
+if [[ -z "${FROM_VOLUME_NAME}" ]]; then
+  echo "arg 1 FROM_VOLUME_NAME is empty"
+  exit 1
+fi
+
+if [[ -z "${TO_VOLUME_NAME}" ]]; then
+  echo "arg 2 TO_VOLUME_NAME is empty"
+  exit 1
+fi
+
+if [[ -z "${DOCKER_ROOT_DIR}" ]]; then
+  echo "DOCKER_ROOT_DIR is empty"
+  exit 1
+fi
+
+FROM_PATH=${DOCKER_ROOT_DIR}/volumes/${FROM_VOLUME_NAME}
+TO_PATH=${DOCKER_ROOT_DIR}/volumes/${TO_VOLUME_NAME}
+
+if [[ -d "${TO_PATH}" ]]; then
+  echo "Error: ${TO_PATH} already exists."
+  exit 1
+fi
+
+mv "${FROM_PATH}" "${TO_PATH}"

build/src/package.json

@@ -17,18 +17,20 @@
     "test:all": "npm run test && npm run test:int",
     "coverage": "./node_modules/.bin/nyc report --reporter=text-lcov | ./node_modules/.bin/coveralls",
     "lint": "./node_modules/.bin/eslint . --ext .ts --fix",
+    "prettier": "prettier --write 'src/**/*.*' 'test/**/*.*'",
     "pre-commit": "npm run build && npm run test",
-    "clean": "rm -rf DNCORE/ dnp_repo/ .temp-transfer/ cache/ dist/"
+    "clean": "rm -rf DNCORE/ dnp_repo/ .temp-transfer/ cache/ dist/",
+    "prepare": "node_modules/.bin/patch-package"
   },
   "author": "dappLion",
   "license": "ISC",
   "dependencies": {
-    "@parity/api": "^2.1.22",
     "@types/memoizee": "^0.4.3",
     "ajv": "^6.10.2",
     "async": "^2.6.1",
     "autobahn": "^18.3.2",
     "bitcoin-core": "^2.0.0",
+    "cids": "^0.8.0",
     "cors": "^2.8.5",
     "data-uri-to-buffer": "^2.0.0",
     "datauri": "^1.1.0",
@@ -38,17 +40,18 @@
     "dotenv": "^8.2.0",
     "eth-crypto": "^1.4.0",
     "ethers": "^4.0.38",
-    "ethjs-provider-http": "^0.1.6",
-    "ethjs-rpc": "^0.2.0",
     "express": "^4.17.1",
     "express-fileupload": "^1.1.5",
+    "http-proxy": "^1.18.0",
     "ipfs-http-client": "^30.1.1",
     "is-ip": "^3.0.0",
     "js-yaml": "^3.11.0",
     "lodash": "^4.17.15",
     "lowdb": "^1.0.0",
     "memoizee": "^0.4.14",
     "monero-rpc": "^0.5.0",
+    "multicodec": "^1.0.1",
+    "multihashes": "^0.4.18",
     "node-docker-api": "^1.1.22",
     "node-fetch": "^2.6.0",
     "pretty-bytes": "^5.3.0",
@@ -66,10 +69,12 @@
     "@types/dockerode": "^2.5.20",
     "@types/express": "^4.17.0",
     "@types/express-fileupload": "^1.1.0",
+    "@types/http-proxy": "^1.17.4",
     "@types/js-yaml": "^3.12.1",
     "@types/lodash": "^4.14.137",
     "@types/lowdb": "^1.0.9",
     "@types/mocha": "^5.2.7",
+    "@types/multicodec": "^1.0.0",
     "@types/node": "^12.7.1",
     "@types/node-fetch": "^2.5.1",
     "@types/semver": "^6.0.1",
@@ -86,6 +91,7 @@
     "husky": "^2.3.0",
     "mocha": "^6.2.2",
     "nyc": "^11.8.0",
+    "patch-package": "^6.2.1",
     "prettier": "^1.16.4",
     "rewiremock": "^3.13.7",
     "sinon": "^5.0.10",

build/src/patches/ethers+4.0.39.patch

@@ -0,0 +1,15 @@
+diff --git a/node_modules/ethers/utils/web.js b/node_modules/ethers/utils/web.js
+index 05406b4..ad016c2 100644
+--- a/node_modules/ethers/utils/web.js
++++ b/node_modules/ethers/utils/web.js
+@@ -81,7 +81,9 @@ function fetchJson(connection, json, processFunc) {
+             if (request.status != 200) {
+                 cancelTimeout();
+                 // @TODO: not any!
+-                var error = new Error('invalid response - ' + request.status);
++                var error = request.responseText 
++                    ? new Error(request.responseText.split("\n")[0])
++                    : new Error('invalid response - ' + request.status);
+                 error.statusCode = request.status;
+                 if (request.responseText) {
+                     error.responseText = request.responseText;

build/src/src/calls/autoUpdateDataGet.ts

@@ -1,13 +1,13 @@
+import { ReturnData } from "../route-types/autoUpdateDataGet";
 import semver from "semver";
-import params from "../params";
 import { listContainers } from "../modules/docker/listContainers";
 import { getCoreVersionId } from "../utils/coreVersionId";
 import * as autoUpdateHelper from "../utils/autoUpdateHelper";
 import { shortNameCapitalized } from "../utils/format";
 import {
   RpcHandlerReturnWithResult,
-  AutoUpdateDataView,
-  AutoUpdateDataDnpView
+  AutoUpdateDataDnpView,
+  PackageContainer
 } from "../types";
 
 const { MY_PACKAGES, SYSTEM_PACKAGES } = autoUpdateHelper;
@@ -19,7 +19,7 @@ const { MY_PACKAGES, SYSTEM_PACKAGES } = autoUpdateHelper;
  * - pending: Pending auto-update per DNP, can be already executed
  * - dnpsToShow: Parsed data to be shown in the UI
  *
- * @returns {object} result = {
+ * @returns result = {
  *   settings: {
  *     "system-packages": { enabled: true }
  *     "my-packages": { enabled: true }
@@ -49,7 +49,7 @@ const { MY_PACKAGES, SYSTEM_PACKAGES } = autoUpdateHelper;
  * }
  */
 export default async function autoUpdateDataGet(): RpcHandlerReturnWithResult<
-  AutoUpdateDataView
+  ReturnData
 > {
   const settings = autoUpdateHelper.getSettings();
   const registry = autoUpdateHelper.getRegistry();
@@ -77,7 +77,7 @@ export default async function autoUpdateDataGet(): RpcHandlerReturnWithResult<
   ];
 
   if (autoUpdateHelper.isDnpUpdateEnabled()) {
-    const singleDnpsToShow = [];
+    const singleDnpsToShow: PackageContainer[] = [];
     for (const dnp of dnpList) {
       const storedDnp = singleDnpsToShow.find(_dnp => _dnp.name === dnp.name);
       const storedVersion = storedDnp ? storedDnp.version : "";
@@ -87,8 +87,6 @@ export default async function autoUpdateDataGet(): RpcHandlerReturnWithResult<
         dnp.isDnp &&
         // Ignore wierd versions
         semver.valid(dnp.version) &&
-        // MUST come from the APM
-        (!dnp.origin || params.AUTO_UPDATE_INCLUDE_IPFS_VERSIONS) &&
         // Ensure there are no duplicates
         (!storedVersion || semver.gt(storedVersion, dnp.version))
       )

build/src/src/calls/autoUpdateSettingsEdit.ts

@@ -1,3 +1,4 @@
+import { RequestData } from "../route-types/autoUpdateSettingsEdit";
 import {
   MY_PACKAGES, // "my-packages"
   SYSTEM_PACKAGES, // "system-packages"
@@ -9,16 +10,13 @@ import { RpcHandlerReturn } from "../types";
 /**
  * Edits the auto-update settings
  *
- * @param {string} id = "my-packages", "system-packages" or "bitcoin.dnp.dappnode.eth"
- * @param {bool} enabled Auto update is enabled for ID
+ * @param id = "my-packages", "system-packages" or "bitcoin.dnp.dappnode.eth"
+ * @param enabled Auto update is enabled for ID
  */
 export default async function autoUpdateSettingsEdit({
   id,
   enabled
-}: {
-  id: string;
-  enabled: boolean;
-}): RpcHandlerReturn {
+}: RequestData): RpcHandlerReturn {
   if (!id)
     throw Error(`Argument id is required or generalSettings must be true`);
 

build/src/src/calls/diagnose.ts

@@ -1,28 +1,14 @@
+import { ReturnData } from "../route-types/diagnose";
 import shellExec from "../utils/shell";
 import { RpcHandlerReturnWithResult } from "../types";
 
-type ReturnData = {
-  name: string;
-  result?: string;
-  error?: string;
-}[];
-
 /**
  * Returns a list of checks done as a diagnose
- *
- * @returns {object} diagnoses object, by diagnose id
- * diagnoses = {
- *   "dockerVersion": {
- *     name: "docker version",
- *     result: "Docker version 18.06.1-ce, build e68fc7a"
- *     error: "sh: docker: not found"
- *   } // either "result" or "error" prop will exist
- * }
  */
 export default async function diagnose(): RpcHandlerReturnWithResult<
   ReturnData
 > {
-  // Get docker version
+  // Get docker version: "Docker version 18.06.1-ce, build e68fc7a"
   const dockerVersion = {
     name: "docker version",
     ...(await shellExecFormated(`docker -v`))