fix(plugin-ledger-connector-fabric-socketio): upgrade Fabric due to j…

…srsasign

Revert fabric sdk package change from PR hyperledger-cacti#1754

Closes: hyperledger-cacti#1799
Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com>

examples/cartrade/Dockerfile

@@ -6,7 +6,7 @@ WORKDIR ${CARTRADE_HOME}
 
 COPY ./dist/yarn.lock ./package.json ./run_docker.sh ./
 RUN yarn link "@hyperledger/cactus-cmd-socket-server" && \
-    yarn install --production --non-interactive --cache-folder ./.yarnCache && \
+    yarn install --production --ignore-engines --non-interactive --cache-folder ./.yarnCache && \
     rm -rf ./.yarnCache
 
 COPY ./run_docker.sh ./

examples/cartrade/script-start-ledgers.sh

@@ -65,7 +65,7 @@ function start_ledgers() {
     rm -fr "${CONFIG_VOLUME_PATH}/*"
 
     # Copy cmd-socketio-config
-    cp -f ../../etc/cactus/*.yaml "${CONFIG_VOLUME_PATH}/"
+    cp -f ./config/*.yaml "${CONFIG_VOLUME_PATH}/"
 
     # Start Fabric
     start_fabric_testnet

packages/cactus-cmd-socketio-server/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:12
+FROM node:14
 
 ENV CACTUS_CMD_SOCKETIO_PATH=/opt/cactus-cmd-socketio-server
 # Root dir must be src until cmd-socketio defines valid exports:
@@ -11,8 +11,9 @@ RUN apt-get update && apt-get install -y cmake && rm -rf /var/lib/apt/lists/*
 
 COPY ./dist/ ./package.json ./
 
-# --frozen-lockfile
-RUN yarn install --production --non-interactive --cache-folder ./.yarnCache && \
+# TODO --frozen-lockfile ??
+# Ignore engines because fabric-ca-client 1.4 expects node 10/12 (but works with 14 as well)
+RUN yarn install --production --ignore-engines --non-interactive --cache-folder ./.yarnCache && \
     rm -rf ./.yarnCache && \
     yarn link
 

packages/cactus-plugin-ledger-connector-fabric-socketio/Dockerfile

@@ -1,13 +1,15 @@
 # TODO
 # Install connector as yarn package like in @hyperledger/cactus-plugin-ledger-connector-besu
 
-FROM node:12
+FROM node:14
 
 WORKDIR /root/cactus/
 
 COPY ./dist ./dist/
 COPY ./dist/yarn.lock ./package.json ./
-RUN yarn install --production --frozen-lockfile --non-interactive --cache-folder ./.yarnCache; rm -rf ./.yarnCache
+
+# Ignore engines because fabric-ca-client 1.4 expects node 10/12 (but works with 14 as well)
+RUN yarn install --production --ignore-engines --frozen-lockfile --non-interactive --cache-folder ./.yarnCache; rm -rf ./.yarnCache
 
 EXPOSE 5040
 VOLUME ["/etc/cactus/"]

packages/cactus-plugin-ledger-connector-fabric-socketio/package.json

@@ -22,12 +22,15 @@
     "express": "~4.15.2",
     "fabric-ca-client": "^1.4.0",
     "fabric-client": "^1.4.0",
+    "fabric-network": "^1.4.0",
     "jsonwebtoken": "^8.5.1",
     "log4js": "^3.0.6",
     "morgan": "~1.8.1",
     "serve-favicon": "~2.4.2",
     "shelljs": "^0.8.4",
-    "socket.io": "4.1.3",
+    "socket.io": "4.1.3"
+  },
+  "devDependencies": {
     "ts-node": "^9.0.0"
   }
 }

yarn.lock

@@ -4406,12 +4406,17 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-16.4.13.tgz#7dfd9c14661edc65cccd43a29eb454174642370d"
   integrity sha512-bLL69sKtd25w7p1nvg9pigE4gtKVpGTPojBFLMkGHXuUgap2sLqQt2qUnqmVCDfzGUL0DRNZP+1prIZJbMeAXg==
 
+"@types/node@^12.0.00":
+  version "12.20.42"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.42.tgz#2f021733232c2130c26f9eabbdd3bfd881774733"
+  integrity sha512-aI3/oo5DzyiI5R/xAhxxRzfZlWlsbbqdgxfTPkqu/Zt+23GXiJvMCyPJT4+xKSXOnLqoL8jJYMLTwvK2M3a5hw==
+
 "@types/node@^12.12.6":
   version "12.20.36"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.36.tgz#5bd54d2383e714fc4d2c258107ee70c5bad86d0c"
   integrity sha512-+5haRZ9uzI7rYqzDznXgkuacqb6LJhAti8mzZKWxIXn/WEtvB+GHVJ7AuMwcN1HMvXOSJcrvA6PPoYHYOYYebA==
 
-"@types/node@^14.0.24", "@types/node@^14.14.5", "@types/node@^14.6.2":
+"@types/node@^14.14.5", "@types/node@^14.6.2":
   version "14.17.32"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.32.tgz#2ca61c9ef8c77f6fa1733be9e623ceb0d372ad96"
   integrity sha512-JcII3D5/OapPGx+eJ+Ik1SQGyt6WvuqdRfh9jUwL6/iHGjmyOriBDciBUu7lEIBTL2ijxwrR70WUnw5AEDmFvQ==
@@ -14512,11 +14517,6 @@ jsrsasign@^10.5.0:
   resolved "https://registry.yarnpkg.com/jsrsasign/-/jsrsasign-10.5.1.tgz#85dc7c6c3f6a5fded26030971c08ce5058f525f6"
   integrity sha512-yW0fq87KNZFw4Pn5ySllXs3ztZAROQZczEheKZTqmiNpCe/Xj9r5NhuAQ7MXTOyEZGJ/+MPHGTsfbgPFaLpwHQ==
 
-jsrsasign@^8.0.20:
-  version "8.0.24"
-  resolved "https://registry.yarnpkg.com/jsrsasign/-/jsrsasign-8.0.24.tgz#fc26bac45494caac3dd8f69c1f95847c4bda6c83"
-  integrity sha512-u45jAyusqUpyGbFc2IbHoeE4rSkoBWQgLe/w99temHenX+GyCz4nflU5sjK7ajU1ffZTezl6le7u43Yjr/lkQg==
-
 jszip@^3.1.3:
   version "3.7.1"
   resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.7.1.tgz#bd63401221c15625a1228c556ca8a68da6fda3d9"
@@ -14767,20 +14767,18 @@ kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
-klaw@2.1.1, klaw@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/klaw/-/klaw-2.1.1.tgz#42b76894701169cc910fd0d19ce677b5fb378af1"
-  integrity sha1-QrdolHARacyRD9DRnOZ3tfs3ivE=
-  dependencies:
-    graceful-fs "^4.1.9"
-
 klaw@^1.0.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
   integrity sha1-QIhDO0azsbolnXh4XY6W9zugJDk=
   optionalDependencies:
     graceful-fs "^4.1.9"
 
+klaw@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/klaw/-/klaw-4.0.1.tgz#8dc6f5723f05894e8e931b516a8ff15c2976d368"
+  integrity sha512-pgsE40/SvC7st04AHiISNewaIMUbY5V/K8b21ekiPiFoYs/EYSdsGa+FJArB1d441uq4Q8zZyIxvAzkGNlBdRw==
+
 kleur@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"