Update to 0.7.0

.build/benchmark-integration-test-direct.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Exit on first error, print all commands.
+set -e
+set -o pipefail
+
+# Bootstrap the project again
+npm ci
+
+# Get the root directory of the caliper source
+ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
+echo $ROOT_DIR
+
+# Call the CLI directly in the source tree
+export CALL_METHOD="node $ROOT_DIR/packages/caliper-cli/caliper.js"
+# Use explicit binding for
+export BIND_IN_PACKAGE_DIR=true
+
+# Create a directory outside of the source code tree to install SUT binding node modules
+# We have to do this otherwise npm will attempt to hoist the npm modules to a directory
+# which subsequently doesn't get searched
+# This approach means we can drop having to declare dependencies on SUT bound modules in the
+# connector and makes it more like the way a user would use caliper.
+export SUT_DIR=$HOME/sut
+echo $SUT_DIR
+mkdir -p $SUT_DIR
+
+# Ensure node searches this directory by setting NODE_PATH
+export NODE_PATH=$SUT_DIR/node_modules
+
+echo "---- Running Integration test for adaptor ${BENCHMARK}"
+cd ./packages/caliper-tests-integration/
+./run-tests.sh
+
+rm -fr $SUT_DIR

.build/check-prerequisites.sh

@@ -0,0 +1,58 @@
+#!/bin/bash
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Exit on first error, print all commands.
+set -e
+set -o pipefail
+
+CLEAR="$(tput sgr0)"
+RED="$(tput setaf 1)"
+GREEN="$(tput setaf 2)"
+
+check_npm_version() {
+    required_version="11.5.1"
+    installed_version=$(npm --version)
+    versions="$required_version\n$installed_version"
+    if echo -e $versions | sort -rV | head -n 1 | grep -q "$installed_version"; then
+        echo "$GREEN npm version $installed_version is >= $required_version $CLEAR"
+        return 0
+    else
+        echo "$RED npm version $installed_version < $required_version $CLEAR"
+        echo "$RED Please update npm to the latest version: https://docs.npmjs.com/try-the-latest-stable-version-of-npm $CLEAR"
+        return 1
+    fi
+}
+
+check_node_version() {
+    required_version="22.20.0"
+    installed_version=$(node --version | cut -c2-)
+    versions="$required_version\n$installed_version"
+    if echo -e $versions | sort -rV | head -n 1 | grep -q "$installed_version"; then
+        echo "$GREEN node version $installed_version is >= $required_version $CLEAR"
+        return 0
+    else
+        echo "$RED node version $installed_version < $required_version $CLEAR"
+        echo "$RED Please update node to the latest version: https://nodejs.org/en/download/ $CLEAR"
+        return 1
+    fi
+}
+
+check_node_version
+rc=$?
+check_npm_version
+rc=$?||$rc
+if [ $rc -ne 0 ]; then
+    exit $rc
+fi

.build/checks-and-unit-tests.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Exit on first error, print all commands.
+set -e
+set -o pipefail
+
+# check reference Caliper package names
+./scripts/check-package-names.sh
+
+# Bootstrap the project again
+npm ci
+
+pushd ./packages/caliper-publish/
+./publish.js version check
+popd
+
+# Run linting, license check and unit tests
+npm run test --workspaces

.build/publish-caliper.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Exit on first error
+set -e
+
+# distribute root README file before publishing
+cp ./README.md ./packages/caliper-cli/README.md
+cp ./README.md ./packages/caliper-core/README.md
+cp ./README.md ./packages/caliper-fabric/README.md
+
+# distribute root package-lock file as npm-shrinkwrap file to packages before publishing
+cp ./package-lock.json ./packages/caliper-cli/npm-shrinkwrap.json
+cp ./package-lock.json ./packages/caliper-core/npm-shrinkwrap.json
+cp ./package-lock.json ./packages/caliper-fabric/npm-shrinkwrap.json
+
+cd ./packages/caliper-publish/
+npm ci
+
+./publish.js npm
+./publish.js docker --publish

.devcontainer/devcontainer.json

@@ -0,0 +1,26 @@
+{
+    "name": "Caliper Development",
+    "image": "mcr.microsoft.com/vscode/devcontainers/python:3.11",
+    "features": {
+        "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {
+            "moby": false
+        },
+        "ghcr.io/devcontainers/features/node:1": {
+            "version": "v22.20.0"
+        }
+    },
+    "customizations": {
+        "vscode": {
+            "settings": {
+                "terminal.integrated.shell.linux": "/bin/bash",
+                "python.defaultInterpreterPath": "/usr/local/bin/python"
+            },
+            "extensions": [
+                "esbenp.prettier-vscode",
+            ]
+        }
+    },
+    "postCreateCommand": "cd docs && pip install -r pip-requirements.txt && mkdocs build",
+    "remoteUser": "vscode",
+    "forwardPorts": [8000] 
+}

.editorconfig

@@ -0,0 +1,26 @@
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false

.eslintignore

@@ -22,3 +22,4 @@ node_modules
 
 # Plugins
 /src/gui
+/src/adapters/fabric/ChannelSignedTransaction.js

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -0,0 +1,88 @@
+name: Bug Report
+description: File a bug report
+body:
+  - type: markdown
+    attributes:
+        value: Thank you for helping us make Caliper better by submitting a bug report!
+  - type: markdown
+    attributes:
+        value: "## Environment information"
+  - type: input
+    id: caliper_version
+    attributes:
+      label: Which Caliper version are you using?
+      placeholder: "For example: v0.4.2, or latest"
+    validations:
+      required: true
+  - type: input
+    id: nodejs_version
+    attributes:
+      label: Which Node.JS version are you using?
+      placeholder: "For example: v10"
+    validations:
+      required: true
+  - type: input
+    id: os
+    attributes:
+      label: Which operating system are you using?
+      placeholder: "For example: Ubuntu 20.04 LTS"
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+        value: "## Behavior information"
+  - type: textarea
+    id: context
+    attributes:
+      label: Please provide some context for your error. For example, when did the error occur? What were you trying to achieve, and how?
+      placeholder: "For example: I tried to monitor remote Docker containers..."
+    validations:
+      required: true
+  - type: textarea
+    id: actual_behavior
+    attributes:
+      label: What was the observed incorrect behavior?
+      placeholder: "For example: Caliper hangs and waits for submitted transactions indefinitely."
+    validations:
+      required: true
+  - type: textarea
+    id: error_log
+    attributes:
+      label: Please provide the error logs and their surroundings.
+      placeholder: "Error logs"
+      render: text
+    validations:
+      required: true
+  - type: textarea
+    id: bench_config
+    attributes:
+      label: Please provide your benchmark configuration file content, if possible.
+      placeholder: "test: ..."
+      render: yaml
+    validations:
+      required: false
+  - type: textarea
+    id: network_config
+    attributes:
+      label: Please provide your network configuration file content, if possible.
+      placeholder: "name: Fabric ..."
+      render: yaml
+    validations:
+      required: false
+  - type: textarea
+    id: workload
+    attributes:
+      label: Please provide your workload module content, if possible.
+      placeholder: "JS file content"
+      render: nodejs
+    validations:
+      required: false
+  - type: markdown
+    attributes:
+        value: "## Additional information"
+  - type: textarea
+    id: additional
+    attributes:
+      label: Please provide any additional information you deem relevant to the error.
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Hyperledger Discord
+    url: https://discord.com/channels/905194001349627914/941417677778473031
+    about: Please ask general questions about the project in the Caliper channel (Discord id required).
+  - name: Hyperledger Caliper mailing list
+    url: https://lists.hyperledger.org/g/caliper
+    about: Please ask general questions about the project here (LFID recommended).