Merge branch 'hyperledger:main' into master

.cspell.json

@@ -4,85 +4,129 @@
     "minWordLength": 4,
     "allowCompoundWords": true,
     "words": [
+        "adminpw",
+        "Albertirsa",
+        "ALLFORTX",
+        "ANYFORTX",
+        "APIV",
+        "approveformyorg",
+        "Authz",
+        "authzn",
         "Besu",
+        "Bools",
+        "cafile",
+        "caio",
+        "cccs",
+        "ccid",
+        "cids",
         "Corda",
-        "HyperLedger",
-        "DockerOde",
-        "Keychain",
-        "Keycloak",
         "Cordapp",
-        "Healthcheck",
-        "uuidv",
-        "Xdai",
-        "OpenAPI",
+        "dclm",
+        "DHTAPI",
+        "DockerOde",
+        "ealen",
+        "ecparams",
         "Errorf",
-        "Oidc",
-        "Authz",
-        "Bools",
-        "Secp",
-        "openethereum",
-        "NODETXPOOLACK",
-        "LEDGERBLOCKACK",
+        "escc",
+        "execa",
+        "faio",
+        "fidm",
+        "fsouza",
         "GETHKEYCHAINPASSWORD",
-        "NETWORKSCOPEALLFORTX",
-        "tlsca",
+        "ghcr",
+        "gopath",
         "grpc",
         "grpcs",
-        "MSPCONFIGPATH",
-        "LOCALMSPID",
-        "organisation",
-        "notok",
-        "txqueue",
-        "tlscacerts",
-        "dclm",
-        "SPDX",
-        "mychannel",
-        "gopath",
-        "myvolume",
-        "authzn",
-        "supervisord",
+        "grpcwebtext",
+        "guks",
+        "hashicorp",
+        "Healthcheck",
+        "htlc",
+        "Htlc",
+        "HTLC",
+        "HyperLedger",
         "ipaddress",
+        "ipfs",
+        "Iroha",
+        "Irohad",
+        "isready",
+        "jboss",
+        "JORDI",
+        "jsrsa",
+        "jsrsasign",
+        "Keychain",
+        "Keycloak",
+        "KEYUTIL",
+        "KJUR",
+        "Knetic",
+        "LEDGERBLOCKACK",
+        "lmify",
+        "LOCALMSPID",
+        "miekg",
+        "mitchellh",
+        "MSPCONFIGPATH",
+        "MSPID",
         "MSPIDSCOPEALLFORTX",
-        "ANYFORTX",
-        "MSPIDSCOPEALLFORTX",
-        "NETWORKSCOPEANYFORTX",
         "MSPIDSCOPEANYFORTX",
-        "MSPID",
-        "ALLFORTX",
-        "cccs",
-        "svcs",
-        "vscc",
-        "escc",
-        "faio",
-        "hashicorp",
-        "cafile",
-        "supervisorctl",
-        "onsi",
         "Mtls",
-        "APIV",
+        "myapp",
+        "mychannel",
+        "myroot",
+        "mysecretpassword",
+        "myvolume",
         "Nerc",
-        "ccid",
-        "adminpw",
-        "caio",
+        "NETWORKSCOPEALLFORTX",
+        "NETWORKSCOPEANYFORTX",
+        "NODETXPOOLACK",
+        "notok",
+        "Oidc",
+        "oneofs",
+        "onsi",
+        "OpenAPI",
+        "openethereum",
+        "organisation",
+        "parameterizable",
+        "Postgres",
+        "proto",
+        "protobuf",
+        "protoc",
         "protos",
-        "Unmarshal",
-        "myroot",
-        "ealen",
-        "approveformyorg",
-        "jboss",
+        "RUSTC",
+        "sbjpubkey",
+        "Secp",
+        "shrn",
+        "Smonitor",
+        "socketio",
+        "SPDX",
+        "Splug",
         "Sprintf",
+        "stretchr",
+        "supervisorctl",
+        "supervisord",
+        "svcs",
+        "sykesm",
         "thream",
-        "socketio",
-        "Albertirsa",
-        "HTLC",
-        "Htlc",
-        "htlc"
+        "tlsca",
+        "tlscacerts",
+        "txqueue",
+        "Uisrs",
+        "Unmarshal",
+        "uuidv",
+        "vscc",
+        "wasm",
+        "Xdai"
     ],
     "dictionaries": [
-        "typescript,node,npm,go"
+        "typescript,node,npm,go,rust"
     ],
     "ignorePaths": [
-        "node_modules/**",
-        "**/build/**"
+        "**/node_modules/**",
+        "**/build/**",
+        "**/src/main/typescript/generated/**",
+        "packages/cactus-plugin-verifier-cc/**",
+        "packages/cactus-cmd-socketio-server/**",
+        "packages/cactus-plugin-ledger-connector-sawtooth-socketio/**",
+        "packages/cactus-plugin-ledger-connector-go-ethereum-socketio/**",
+        "packages/cactus-plugin-ledger-connector-*-socketio/**"
     ]
 }

.dcilintignore

@@ -1,4 +1,2 @@
-# TSLint configuration parameter
-packages/cactus-cockpit/tslint.json
 # Besu CLI argument
 tools/docker/besu-all-in-one/supervisord.conf

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-# Note: You can use any Debian/Ubuntu based image you want. 
+# Note: You can use any Debian/Ubuntu based image you want.
 FROM mcr.microsoft.com/vscode/devcontainers/base:ubuntu-20.04
 
 # [Option] Install zsh
@@ -22,7 +22,7 @@ RUN apt-get update \
     && /bin/bash /tmp/library-scripts/docker-in-docker-debian.sh "${ENABLE_NONROOT_DOCKER}" "${USERNAME}" "${USE_MOBY}" \
     # Clean up
     && apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts/
-    
+
 # Install software properties
 RUN apt-get update \
     && apt-get install software-properties-common -y
@@ -38,8 +38,8 @@ RUN apt-get update \
 
 VOLUME [ "/var/lib/docker" ]
 
-# Setting the ENTRYPOINT to docker-init.sh will start up the Docker Engine 
-# inside the container "overrideCommand": false is set in devcontainer.json. 
+# Setting the ENTRYPOINT to docker-init.sh will start up the Docker Engine
+# inside the container "overrideCommand": false is set in devcontainer.json.
 # The script will also execute CMD if you need to alter startup behaviors.
 ENTRYPOINT [ "/usr/local/share/docker-init.sh" ]
 CMD [ "sleep", "infinity" ]

.devcontainer/devcontainer.json

@@ -5,16 +5,17 @@
 	"dockerFile": "Dockerfile",
 	"runArgs": ["--init", "--privileged"],
 	"overrideCommand": false,
-	
+
 	// Use this environment variable if you need to bind mount your local source code into a new container.
 	// Set *default* container specific settings.json values on container create.
-	"settings": { 
+	"settings": {
 		// "terminal.integrated.shell.linux": "/bin/bash",
 		"terminal.integrated.rendererType": "auto"
 	},
 
 	// Add the IDs of extensions you want installed when the container is created.
 	"extensions": [
+		"bierner.markdown-mermaid",
 		"ms-azuretools.vscode-docker",
 		"mhutchie.git-graph",
 		"alefragnani.bookmarks",
@@ -26,7 +27,7 @@
 		"dbaeumer.vscode-eslint",
 		"42crunch.vscode-openapi"
 	],
-	
+
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	// "forwardPorts": [],
 

.devcontainer/post-create-commands.sh

@@ -2,11 +2,12 @@
 
 set -e
 
-whoami 
+whoami
 
 NEW_PATH_ELEMENT="~/bin/"
 echo "export PATH=\"$NEW_PATH_ELEMENT\":\${PATH}" >> ~/.bashrc
 
 docker info
 
+npm run install-yarn
 npm run configure

.dockerignore

@@ -57,3 +57,5 @@ cactus-openapi-spec.json
 cactus-openapi-spec-*.json
 .npmrc
 *.log
+
+examples/*/Dockerfile

.eslintignore

@@ -14,3 +14,11 @@
 # **/coverage/**
 
 # typings/**
+
+**/src/main/typescript/generated/proto/**
+packages/cactus-verifier/src/main/typescript/
+
+packages/cactus-cmd-socketio-server/**
+packages/cactus-plugin-ledger-connector-sawtooth-socketio/**
+packages/cactus-plugin-ledger-connector-go-ethereum-socketio/**
+packages/cactus-plugin-ledger-connector-*-socketio/**

.eslintrc.js

@@ -6,7 +6,7 @@ module.exports = {
   },
   extends: [
     "plugin:@typescript-eslint/recommended", // Uses the recommended rules from the @typescript-eslint/eslint-plugin
-    "prettier/@typescript-eslint", // Uses eslint-config-prettier to disable ESLint rules from @typescript-eslint/eslint-plugin that would conflict with prettier
+    "prettier", // Uses eslint-config-prettier to disable ESLint rules from @typescript-eslint/eslint-plugin that would conflict with prettier
     "plugin:prettier/recommended", // Enables eslint-plugin-prettier and eslint-config-prettier. This will display prettier errors as ESLint errors. Make sure this is always the last configuration in the extends array.
   ],
   rules: {

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: Cactus CI Github Workflow
+name: Cactus_CI
 
 # Triggers the workflow on push or pull request events
 on:
@@ -10,43 +10,22 @@ on:
 
 jobs:
   build:
-
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.experimental }}
 
     strategy:
-      fail-fast: true
+      fail-fast: false
       max-parallel: 1024
       matrix:
         os: [ubuntu-20.04]
-        node-version: [v12.13.0, v14.15.1, v16.2.0]
+        node-version: [v12.22.3, v14.15.1, v16.2.0]
         experimental: [false]
-        # include:
-        #
-        # # FIXME macOS does not work due to lack of docker support in GHA.
-        # https://gh.neting.ccmunity/t/why-is-docker-not-installed-on-macos/17017
-        #   - os: macos-11.0 # macOS Big Sur 11.0
-        #     node-version: v12.13.0
-        #     experimental: true
-        #   - os: macos-10.15 # macOS Catalina 10.15
-        #     node-version: v12.13.0
-        #     experimental: true
-        #
-        # # FIXME
-        # https://github.com/hyperledger/cactus/issues/171
-        #   - os: windows-2019 # Windows Server 2019
-        #     node-version: v12.13.0
-        #     experimental: true
 
     steps:
-    # FIXME: These do not work on mac OS as of 2020-12-09
-    # https://gh.neting.ccmunity/t/why-is-docker-not-installed-on-macos/17017
-    # - name: Set up QEMU (ARM64 docker images once we are ready)
-    #   uses: docker/setup-qemu-action@v1.0.1
-
-    # - name: Set up Docker Buildx (ARM64 docker images once we are ready)
-    #   uses: docker/setup-buildx-action@v1.0.3
-
+    - name: Set Swap Space to 10GB
+      uses: pierotofy/set-swap-space@v1.0
+      with:
+        swap-size-gb: 10
     - name: Use Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v2.1.2
       with:

.github/workflows/commitlint-pull-request.yml

@@ -0,0 +1,11 @@
+name: "Commit Lint"
+on: [pull_request]
+
+jobs:
+  commitlint:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2.3.4
+        with:
+          fetch-depth: 0
+      - uses: wagoid/commitlint-github-action@v3.1.4

.gitignore

@@ -44,4 +44,20 @@ cactus-openapi-spec-*.json
 *.log
 build/
 .gradle/
-site/
+site/
+
+.build-cache/*.tsbuildinfo
+
+.yarn/*
+!.yarn/patches
+!.yarn/releases
+!.yarn/plugins
+!.yarn/sdks
+!.yarn/versions
+.pnp.*
+
+!packages/cactus-plugin-verifier-cc/src/main/typescript/ledger-plugin/*/validator/src/build
+!packages/cactus-plugin-verifier-cc/src/main/typescript/ledger-plugin/*/validator/src/core/bin
+
+tools/docker/geth-testnet/data-geth1/
+examples/cactus-example-verifier-cc-cartrade/src/main/typescript/impl/script-test-getFunctions/fabric/wallet/

.husky/commit-msg

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+./node_modules/.bin/commitlint --edit $1

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+./node_modules/.bin/lint-staged