diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml new file mode 100644 index 00000000..cff1b3d4 --- /dev/null +++ b/.github/workflows/pull_request.yaml @@ -0,0 +1,25 @@ +# Copyright the Hyperledger Fabric contributors. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +name: Pull request + +on: + pull_request: + branches: + - main + workflow_dispatch: + +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + +jobs: + test: + uses: ./.github/workflows/test.yaml + + pull-request: + needs: test + name: Pull request success + runs-on: ubuntu-latest + steps: + - run: true diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml new file mode 100644 index 00000000..fc8d55c9 --- /dev/null +++ b/.github/workflows/push.yaml @@ -0,0 +1,14 @@ +# Copyright the Hyperledger Fabric contributors. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +name: Push + +on: + push: + branches: + - main + workflow_dispatch: + +jobs: + test: + uses: ./.github/workflows/test.yaml diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml new file mode 100644 index 00000000..3d9ff9dc --- /dev/null +++ b/.github/workflows/release.yaml @@ -0,0 +1,90 @@ +# Copyright the Hyperledger Fabric contributors. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +name: Release + +on: + create: + tags: + - "v2.*" + workflow_dispatch: + +env: + CHAINCODE_CONTAINER_NODE_VER: 18 + DOCKER_REGISTRY: ${{ github.repository_owner == 'hyperledger' && 'docker.io' || 'ghcr.io' }} + +jobs: + test: + uses: ./.github/workflows/test.yaml + + publishnpm: + runs-on: ubuntu-20.04 + needs: test + steps: + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + - uses: actions/download-artifact@v3 + with: + name: node-tgzs + path: build/ + - run: | + set -xev + ls -lart build/ + cd build + find . -type f -name 'fabric-*.tgz' -exec npm publish {} \; + env: + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + + publishdocker: + runs-on: ubuntu-20.04 + needs: test + permissions: + contents: read + packages: write + + steps: + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + with: + buildkitd-flags: --debug + config-inline: | + [worker.oci] + max-parallelism = 1 + + - name: Checkout + uses: actions/checkout@v3 + + - name: Login to the ${{ env.DOCKER_REGISTRY }} Container Registry + uses: docker/login-action@v2 + with: + registry: ${{ env.DOCKER_REGISTRY }} + username: ${{ env.DOCKER_REGISTRY == 'docker.io' && secrets.DOCKERHUB_USERNAME || github.actor }} + password: ${{ env.DOCKER_REGISTRY == 'docker.io' && secrets.DOCKERHUB_TOKEN || secrets.GITHUB_TOKEN }} + + - name: Docker meta + id: meta + uses: docker/metadata-action@v4 + with: + images: ${{ env.DOCKER_REGISTRY }}/${{ github.repository_owner }}/fabric-nodeenv + tags: | + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + type=semver,pattern={{major}}.{{minor}}.{{patch}} + + - name: Build and push ${{ matrix.COMPONENT }} Image + id: push + uses: docker/build-push-action@v3 + with: + platforms: linux/amd64,linux/arm64 + file: docker/fabric-nodeenv/Dockerfile + context: docker/fabric-nodeenv + tags: ${{ steps.meta.outputs.tags }} + push: ${{ github.event_name != 'pull_request' }} + labels: ${{ steps.meta.outputs.labels }} + build-args: | + NODE_VER=${{ env.CHAINCODE_CONTAINER_NODE_VER }} diff --git a/.github/workflows/schedule.yaml b/.github/workflows/schedule.yaml new file mode 100644 index 00000000..7eaed227 --- /dev/null +++ b/.github/workflows/schedule.yaml @@ -0,0 +1,15 @@ +# Copyright the Hyperledger Fabric contributors. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +name: Scheduled build + +on: + schedule: + - cron: "5 2 * * *" + workflow_dispatch: + +jobs: + test: + uses: ./.github/workflows/test.yaml + with: + checkout-ref: ${{ matrix.checkout-ref }} diff --git a/.github/workflows/build.yaml b/.github/workflows/test.yaml similarity index 67% rename from .github/workflows/build.yaml rename to .github/workflows/test.yaml index 986774f5..57166873 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/test.yaml @@ -1,25 +1,15 @@ # Copyright the Hyperledger Fabric contributors. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -name: fabric-chaincode-node-build +name: Test on: - push: - branches: - - main - - release-2.5 - pull_request: - branches: - - main - - release-2.5 - create: - tags: - - "v2.*" - workflow_dispatch: - -env: - CHAINCODE_CONTAINER_NODE_VER: 16 - DOCKER_REGISTRY: ${{ github.repository_owner == 'hyperledger' && 'docker.io' || 'ghcr.io' }} + workflow_call: + inputs: + checkout-ref: + default: '' + required: false + type: string jobs: setup: @@ -30,9 +20,11 @@ jobs: BUILD_DATE: ${{ steps.builddata.outputs.BUILD_DATE }} steps: - uses: actions/checkout@v3 + with: + ref: ${{ inputs.checkout-ref }} - uses: actions/setup-node@v3 with: - node-version: '16.x' + node-version: '18.x' - name: BuildData id: builddata run: | @@ -58,10 +50,12 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - node-version: [16.x] + node-version: [18.x] steps: - uses: actions/checkout@v3 + with: + ref: ${{ inputs.checkout-ref }} - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v3 with: @@ -101,12 +95,14 @@ jobs: fvtest: runs-on: ubuntu-20.04 - needs: [build] + needs: build strategy: matrix: - node-version: [16.x] + node-version: [18.x] steps: - uses: actions/checkout@v3 + with: + ref: ${{ inputs.checkout-ref }} - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v3 with: @@ -162,9 +158,11 @@ jobs: needs: build strategy: matrix: - node-version: [16.x] + node-version: [18.x] steps: - uses: actions/checkout@v3 + with: + ref: ${{ inputs.checkout-ref }} - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v3 with: @@ -181,78 +179,3 @@ jobs: mkdir -p audit && cd audit && npm init -y npm install --registry http://localhost:4873 fabric-shim fabric-shim-api fabric-contract-api --save npm audit --audit-level=moderate - - publishnpm: - runs-on: ubuntu-20.04 - needs: [build,fvtest,src_audit] - if: startsWith(github.ref, 'refs/tags/') - steps: - - uses: actions/setup-node@v3 - with: - node-version: '16.x' - registry-url: 'https://registry.npmjs.org' - - uses: actions/download-artifact@v3 - with: - name: node-tgzs - path: build/ - - run: | - set -xev - ls -lart build/ - cd build - find . -type f -name 'fabric-*.tgz' -exec npm publish {} \; - env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - - - publishdocker: - runs-on: ubuntu-20.04 - needs: [setup,build,fvtest,src_audit] - if: startsWith(github.ref, 'refs/tags/') - permissions: - contents: read - packages: write - - steps: - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - with: - buildkitd-flags: --debug - config-inline: | - [worker.oci] - max-parallelism = 1 - - - name: Checkout - uses: actions/checkout@v3 - - - name: Login to the ${{ env.DOCKER_REGISTRY }} Container Registry - uses: docker/login-action@v2 - with: - registry: ${{ env.DOCKER_REGISTRY }} - username: ${{ env.DOCKER_REGISTRY == 'docker.io' && secrets.DOCKERHUB_USERNAME || github.actor }} - password: ${{ env.DOCKER_REGISTRY == 'docker.io' && secrets.DOCKERHUB_TOKEN || secrets.GITHUB_TOKEN }} - - - name: Docker meta - id: meta - uses: docker/metadata-action@v4 - with: - images: ${{ env.DOCKER_REGISTRY }}/${{ github.repository_owner }}/fabric-nodeenv - tags: | - type=semver,pattern={{version}} - type=semver,pattern={{major}}.{{minor}} - type=semver,pattern={{major}}.{{minor}}.{{patch}} - - - name: Build and push ${{ matrix.COMPONENT }} Image - id: push - uses: docker/build-push-action@v3 - with: - platforms: linux/amd64,linux/arm64 - file: docker/fabric-nodeenv/Dockerfile - context: docker/fabric-nodeenv - tags: ${{ steps.meta.outputs.tags }} - push: ${{ github.event_name != 'pull_request' }} - labels: ${{ steps.meta.outputs.labels }} - build-args: | - NODE_VER=${{ env.CHAINCODE_CONTAINER_NODE_VER }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e7e834e..a1b30547 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.5.3 +Tue Mar 7 09:36:52 GMT 2023 + + ## v2.5.2 Wed Jan 25 14:21:32 GMT 2023 diff --git a/MAINTAINERS.md b/MAINTAINERS.md index 07fc765e..daf5d37b 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -3,19 +3,20 @@ Maintainers **Active maintainers** -| Name | GitHub | Chat | email -|------|--------|------|------- -| Matthew B White | [mbwhite][mbwhite] | mbwhite | -| James Taylor | [jt-nti][jt-nti] | jtonline | +| Name | GitHub | Chat | email +|-----------------|------------------------------------|-----------------|------- +| Matthew B White | [mbwhite][mbwhite] | mbwhite | +| Mark Lewis | [bestbeforetoday][bestbeforetoday] | bestbeforetoday | **Emeritus maintainers** -| Name | GitHub | Chat | email -|------|--------|------|------- -| Andrew Hurt | [awjh-ibm][awjh-ibm] | awjh-ibm | -| Bret Harrison | [harrisob][harrisob] | bretharrison | -| Chaoyi Zhao | [zhaochy1990][zhaochy1990] | zhaochy | -| David Kelsey | [davidkel][davidkel] | davidkel | +| Name | GitHub | Chat | email +|---------------|----------------------------|--------------|------- +| James Taylor | [jt-nti][jt-nti] | jtonline | +| Andrew Hurt | [awjh-ibm][awjh-ibm] | awjh-ibm | +| Bret Harrison | [harrisob][harrisob] | bretharrison | +| Chaoyi Zhao | [zhaochy1990][zhaochy1990] | zhaochy | +| David Kelsey | [davidkel][davidkel] | davidkel | Also: Please see the [Release Manager section](https://github.com/hyperledger/fabric/blob/main/MAINTAINERS.md) diff --git a/apis/fabric-contract-api/package.json b/apis/fabric-contract-api/package.json index 3959525c..4526ed4b 100644 --- a/apis/fabric-contract-api/package.json +++ b/apis/fabric-contract-api/package.json @@ -1,7 +1,7 @@ { "name": "fabric-contract-api", - "version": "2.5.2", - "tag": "latest", + "version": "2.5.3", + "tag": "unstable", "description": "A node.js implementation of Hyperledger Fabric chaincode shim, to allow endorsing peers and user-provided chaincodes to communicate with each other", "main": "index.js", "repository": { @@ -22,8 +22,7 @@ "Fabric Shim" ], "engines": { - "node": "^16.4.0", - "npm": "^8.0.0" + "node": "^18.0.0" }, "license": "Apache-2.0", "types": "./types/index.d.ts", @@ -46,7 +45,7 @@ "lines": 100 }, "dependencies": { - "fabric-shim-api": "2.5.2", + "fabric-shim-api": "2.5.3", "class-transformer": "^0.4.0", "fast-safe-stringify": "^2.1.1", "get-params": "^0.1.2", diff --git a/apis/fabric-shim-api/package.json b/apis/fabric-shim-api/package.json index e4f16fb9..05480d8e 100644 --- a/apis/fabric-shim-api/package.json +++ b/apis/fabric-shim-api/package.json @@ -1,7 +1,7 @@ { "name": "fabric-shim-api", - "version": "2.5.2", - "tag": "latest", + "version": "2.5.3", + "tag": "unstable", "description": "A node.js API of Hyperledger Fabric chaincode shim, to allow endorsing peers and user-provided chaincodes to communicate with each other", "main": "index.js", "repository": { @@ -17,8 +17,7 @@ "Fabric Shim" ], "engines": { - "node": "^16.4.0", - "npm": "^8.0.0", + "node": "^18.0.0", "eslint": "^6.6.0" }, "types": "./types/index.d.ts", diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index b21da26f..69401051 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -824,7 +824,7 @@ packages: dev: false /ajv/5.5.2: - resolution: {integrity: sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=} + resolution: {integrity: sha512-Ajr4IcMXq/2QmMkEmSvxqfLN5zGmJ92gHXAeOXq1OekoH2rfDNsgdDoL2f7QaRCy7G/E6TpxBVdRuNraMztGHw==} dependencies: co: 4.6.0 fast-deep-equal: 1.1.0 @@ -7246,7 +7246,7 @@ packages: dev: false file:projects/fabric-contract-api.tgz: - resolution: {integrity: sha512-WeRli7QZ/qurpPhdLWQZKxqbjCuenMqk/erhPXqQj+8ntVeuujmjpHcd7ni/x36f2QkRcFymgoWg40AMBAkZaQ==, tarball: file:projects/fabric-contract-api.tgz} + resolution: {integrity: sha512-6N4vt16pE+MKIc1rOHP8iZVDvHjCikxz3NBuHaW1W4Vwk/sIYyNYKILOGD1icoZGXpefyXFKNs5mliHZViT1tg==, tarball: file:projects/fabric-contract-api.tgz} name: '@rush-temp/fabric-contract-api' version: 0.0.0 dependencies: @@ -7275,7 +7275,7 @@ packages: dev: false file:projects/fabric-e2e-tests.tgz: - resolution: {integrity: sha512-bp7LbwT1KA55tQSq+OrLnGIgb+IzJJBZKamXFuvH4hDxYU4TJS5F4IYmaUEhn+cezZYvaEY/JtAMjzh6eEQaVA==, tarball: file:projects/fabric-e2e-tests.tgz} + resolution: {integrity: sha512-IOxsP+PTyxPqpIL6wW4XuZDS3LbdtKM76tXcGCeDf4Nx5iEFgOSVdV6J3wDh48XiGKP7e76SSyBkM7dxpCM2qQ==, tarball: file:projects/fabric-e2e-tests.tgz} name: '@rush-temp/fabric-e2e-tests' version: 0.0.0 dependencies: @@ -7290,7 +7290,7 @@ packages: dev: false file:projects/fabric-ledger.tgz_@types+node@16.11.33: - resolution: {integrity: sha512-BnwvvJqQ1EqwZEDvdqVtRYATLS5V0pO+ghFjPodUswCSH9ZvSaxSMLi7y2bfCcXi3S3PsxGjGRklAhiEA+8PYg==, tarball: file:projects/fabric-ledger.tgz} + resolution: {integrity: sha512-twySBZN6+d/lq8ouHMxGcn9ZJhpfnrg+N3ldoUbQucjLWhcu1Fv1VkeInaoWpYGGJEK6wFWyDxsHMbYRxdLauw==, tarball: file:projects/fabric-ledger.tgz} id: file:projects/fabric-ledger.tgz name: '@rush-temp/fabric-ledger' version: 0.0.0 @@ -7322,7 +7322,7 @@ packages: dev: false file:projects/fabric-nodeenv.tgz: - resolution: {integrity: sha512-2xlHPeg7Ai19lR/DZmXF6VgDCOXXAahx6vl6qGf5D5qCEeskNz2sC1xbDplhQ6kTndeUG+WAmAuVcHL2vwo7kA==, tarball: file:projects/fabric-nodeenv.tgz} + resolution: {integrity: sha512-Ty0VE2Gb2D7VIN2Yxny/b2elNPp5LWHj5oLKEk6Wt06W5+ZSRVXi1LWHkar7hZZR8OGDWV6MVdXpGdclEcGLGA==, tarball: file:projects/fabric-nodeenv.tgz} name: '@rush-temp/fabric-nodeenv' version: 0.0.0 dependencies: @@ -7338,7 +7338,7 @@ packages: dev: false file:projects/fabric-shim-docs.tgz: - resolution: {integrity: sha512-jOYtRlpdPlAvXoTZMDrte9nruyqobBOsDK6ALZqMkAHWpnwK/kChQ0oT+jtUjiVwLfW3Mx3NDf3b9Nqd+7tOwA==, tarball: file:projects/fabric-shim-docs.tgz} + resolution: {integrity: sha512-xOaIpQ7VL2pdgEtx1gU9KH8QKWPO4j+1r2ZW7c5V/w+VVnJSeomaEytfWGdF0ElgX/JDKqJAkrj5wjPQ2bEhYw==, tarball: file:projects/fabric-shim-docs.tgz} name: '@rush-temp/fabric-shim-docs' version: 0.0.0 dependencies: @@ -7348,7 +7348,7 @@ packages: dev: false file:projects/fabric-shim.tgz: - resolution: {integrity: sha512-iAReiPzm4SAg32FRjn2c+0B+dgV6xvOa717uq2CyE9cOVGzBepnA5m3p6AoD/ITZxuOBWm79E5iLxCjgnekscw==, tarball: file:projects/fabric-shim.tgz} + resolution: {integrity: sha512-9Y3cWiySCfIFqPuBmfIBWbFRl/akZs9g9QbbhXvddkNgHSZOQFXwmTXdKy8iAWo5thkHzIYxS6RHpuOSq0Ipbw==, tarball: file:projects/fabric-shim.tgz} name: '@rush-temp/fabric-shim' version: 0.0.0 dependencies: @@ -7364,6 +7364,7 @@ packages: chai-things: 0.2.0 cpx: 1.5.0 eslint: 6.8.0 + fast-safe-stringify: 2.1.1 fs-extra: 10.1.0 mocha: 9.1.3 mockery: 2.1.0 @@ -7381,7 +7382,7 @@ packages: dev: false file:projects/fvtests.tgz: - resolution: {integrity: sha512-zQbaPJ0nbq66+36UAkCGkclKySVzOpxEugaXgJo4MaypYhXBFacoQfxlIN8NqqRDP7n1FSienIehRAdbC9VC0Q==, tarball: file:projects/fvtests.tgz} + resolution: {integrity: sha512-uXHV42jlghLJPtZj3USi+7k1+JjFSwukS2e5Z+Z1pDplgAr8U/6aqgMmvNKcgGOJHRq1sEYBPTJ5LafCyO5J/g==, tarball: file:projects/fvtests.tgz} name: '@rush-temp/fvtests' version: 0.0.0 dependencies: diff --git a/docker/fabric-nodeenv/Dockerfile b/docker/fabric-nodeenv/Dockerfile index e9d98cba..c8c7e52a 100644 --- a/docker/fabric-nodeenv/Dockerfile +++ b/docker/fabric-nodeenv/Dockerfile @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: Apache-2.0 # -ARG NODE_VER=16 +ARG NODE_VER=18 FROM node:${NODE_VER}-alpine RUN apk add --no-cache \ make \ diff --git a/docker/fabric-nodeenv/package.json b/docker/fabric-nodeenv/package.json index a9f99ca7..03453172 100644 --- a/docker/fabric-nodeenv/package.json +++ b/docker/fabric-nodeenv/package.json @@ -1,6 +1,6 @@ { "name": "fabric-nodeenv", - "version": "2.5.2", + "version": "2.5.3", "description": "", "main": "docker.js", "scripts": { @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "git-rev-sync": "3.0.1", - "toolchain": "2.5.2" + "toolchain": "2.5.3" } } diff --git a/docs/package.json b/docs/package.json index 38484008..63055b5e 100644 --- a/docs/package.json +++ b/docs/package.json @@ -1,6 +1,6 @@ { "name": "fabric-shim-docs", - "version": "2.5.2", + "version": "2.5.3", "description": "", "private": true, "scripts": { @@ -8,7 +8,7 @@ "docs": "rimraf ./gen && jsdoc -c ./_jsdoc.json" }, "dependencies": { - "fabric-ledger": "2.5.2" + "fabric-ledger": "2.5.3" }, "devDependencies": { "ink-docstrap": "^1.3.2", diff --git a/libraries/fabric-ledger/package.json b/libraries/fabric-ledger/package.json index 76e14f09..4f22914e 100644 --- a/libraries/fabric-ledger/package.json +++ b/libraries/fabric-ledger/package.json @@ -1,7 +1,7 @@ { "name": "fabric-ledger", - "version": "2.5.2", - "tag": "latest", + "version": "2.5.3", + "tag": "unstable", "description": "A node.js implementation of Hyperledger Fabric ledger api, to allow access to ledger data from smart contracts", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -23,8 +23,7 @@ "Fabric Ledger" ], "engines": { - "node": "^16.4.0", - "npm": "^8.0.0" + "node": "^18.0.0" }, "license": "Apache-2.0", "nyc": { @@ -49,7 +48,7 @@ "lines": 100 }, "dependencies": { - "fabric-contract-api": "2.5.2", + "fabric-contract-api": "2.5.3", "winston": "^3.7.2" }, "devDependencies": { diff --git a/libraries/fabric-shim/package.json b/libraries/fabric-shim/package.json index ec7366af..668866eb 100644 --- a/libraries/fabric-shim/package.json +++ b/libraries/fabric-shim/package.json @@ -1,7 +1,7 @@ { "name": "fabric-shim", - "version": "2.5.2", - "tag": "latest", + "version": "2.5.3", + "tag": "unstable", "description": "A node.js implementation of Hyperledger Fabric chaincode shim, to allow endorsing peers and user-provided chaincodes to communicate with each other", "main": "index.js", "bin": { @@ -29,8 +29,7 @@ "Fabric Shim" ], "engines": { - "node": "^16.4.0", - "npm": "^8.0.0" + "node": "^18.0.0" }, "types": "./types/index.d.ts", "license": "Apache-2.0", @@ -60,8 +59,9 @@ "@hyperledger/fabric-protos": "0.1.0-dev.2300102001.1", "@types/node": "^16.11.1", "ajv": "^6.12.2", - "fabric-contract-api": "2.5.2", - "fabric-shim-api": "2.5.2", + "fabric-contract-api": "2.5.3", + "fabric-shim-api": "2.5.3", + "fast-safe-stringify": "^2.1.1", "fs-extra": "^10.0.1", "reflect-metadata": "^0.1.13", "winston": "^3.7.2", diff --git a/rush.json b/rush.json index c6790b8e..f7589b82 100644 --- a/rush.json +++ b/rush.json @@ -62,7 +62,7 @@ * Specify a SemVer range to ensure developers use a Node.js version that is appropriate * for your repo. */ - "nodeSupportedVersionRange": ">=16.4.0 <17.0.0", + "nodeSupportedVersionRange": ">=16.4.0 <19.0.0", /** * Odd-numbered major versions of Node.js are experimental. Even-numbered releases * spend six months in a stabilization period before the first Long Term Support (LTS) version. diff --git a/test/chaincodes/annotations/package.json b/test/chaincodes/annotations/package.json index f7c04ed4..5c3894bf 100644 --- a/test/chaincodes/annotations/package.json +++ b/test/chaincodes/annotations/package.json @@ -2,8 +2,7 @@ "name": "ts_chaincode", "description": "Chaincode testing typescript functionality and annotations", "engines": { - "node": "^12.16.1", - "npm": "^6.4.1" + "node": "^18.0.0" }, "scripts": { "build": "tsc", @@ -14,13 +13,13 @@ "typings": "dist/index.d.ts", "engine-strict": true, "engineStrict": true, - "version": "2.5.2", + "version": "2.5.3", "author": "", "license": "APACHE-2.0", "dependencies": { "@types/node": "^16.11.4", - "fabric-contract-api": "2.5.2", - "fabric-shim": "2.5.2", + "fabric-contract-api": "2.5.3", + "fabric-shim": "2.5.3", "ts-node": "^3.3.0", "tslint": "^5.6.0", "typescript": "^4.0.2" diff --git a/test/chaincodes/annotations/src/test_contract/expected-metadata.json b/test/chaincodes/annotations/src/test_contract/expected-metadata.json index 4b2bb9b1..5c839b90 100644 --- a/test/chaincodes/annotations/src/test_contract/expected-metadata.json +++ b/test/chaincodes/annotations/src/test_contract/expected-metadata.json @@ -107,7 +107,7 @@ } }, "info": { - "version": "2.5.2", + "version": "2.5.3", "title": "ts_chaincode" }, "components": { diff --git a/test/chaincodes/clientidentity/package.json b/test/chaincodes/clientidentity/package.json index 769949ad..2d70a5b8 100644 --- a/test/chaincodes/clientidentity/package.json +++ b/test/chaincodes/clientidentity/package.json @@ -2,8 +2,7 @@ "name": "chaincode", "description": "Chaincode testing ClientIdentity functionality", "engines": { - "node": "^12.16.1", - "npm": "^6.4.1" + "node": "^18.0.0" }, "scripts": { "start": "fabric-chaincode-node start" @@ -11,11 +10,11 @@ "main": "index.js", "engine-strict": true, "engineStrict": true, - "version": "2.5.2", + "version": "2.5.3", "author": "", "license": "Apache-2.0", "dependencies": { - "fabric-shim": "2.5.2", - "fabric-contract-api": "2.5.2" + "fabric-shim": "2.5.3", + "fabric-contract-api": "2.5.3" } } diff --git a/test/chaincodes/crosschaincode/package.json b/test/chaincodes/crosschaincode/package.json index a7b61c14..6d6075cf 100644 --- a/test/chaincodes/crosschaincode/package.json +++ b/test/chaincodes/crosschaincode/package.json @@ -2,8 +2,7 @@ "name": "chaincode", "description": "Chaincode testing cross chaincode functionality", "engines": { - "node": "^12.16.1", - "npm": "^6.4.1" + "node": "^18.0.0" }, "scripts": { "start": "set -x && CORE_CHAINCODE_LOGGING_LEVEL=debug fabric-chaincode-node start" @@ -11,11 +10,11 @@ "main": "index.js", "engine-strict": true, "engineStrict": true, - "version": "2.5.2", + "version": "2.5.3", "author": "", "license": "Apache-2.0", "dependencies": { - "fabric-shim": "2.5.2", - "fabric-contract-api": "2.5.2" + "fabric-shim": "2.5.3", + "fabric-contract-api": "2.5.3" } } diff --git a/test/chaincodes/crosschaincode2/package.json b/test/chaincodes/crosschaincode2/package.json index 50feb33a..bdb48d8c 100644 --- a/test/chaincodes/crosschaincode2/package.json +++ b/test/chaincodes/crosschaincode2/package.json @@ -2,8 +2,7 @@ "name": "chaincode", "description": "Chaincode testing cross chaincode functionality", "engines": { - "node": "^12.16.1", - "npm": "^6.4.1" + "node": "^18.0.0" }, "scripts": { "start": "fabric-chaincode-node start" @@ -11,11 +10,11 @@ "main": "index.js", "engine-strict": true, "engineStrict": true, - "version": "2.5.2", + "version": "2.5.3", "author": "", "license": "Apache-2.0", "dependencies": { - "fabric-shim": "2.5.2", - "fabric-contract-api": "2.5.2" + "fabric-shim": "2.5.3", + "fabric-contract-api": "2.5.3" } } diff --git a/test/chaincodes/crud/package.json b/test/chaincodes/crud/package.json index 003a6816..0943cf45 100644 --- a/test/chaincodes/crud/package.json +++ b/test/chaincodes/crud/package.json @@ -2,8 +2,7 @@ "name": "chaincode", "description": "Chaincode testing crud functionality", "engines": { - "node": "^12.16.1", - "npm": "^6.4.1" + "node": "^18.0.0" }, "scripts": { "start": "set -x && CORE_CHAINCODE_LOGGING_LEVEL=debug fabric-chaincode-node start" @@ -11,11 +10,11 @@ "main": "index.js", "engine-strict": true, "engineStrict": true, - "version": "2.5.2", + "version": "2.5.3", "author": "", "license": "Apache-2.0", "dependencies": { - "fabric-shim": "2.5.2", - "fabric-contract-api": "2.5.2" + "fabric-shim": "2.5.3", + "fabric-contract-api": "2.5.3" } } diff --git a/test/chaincodes/events/package.json b/test/chaincodes/events/package.json index 1ef5dcb5..b96b5509 100644 --- a/test/chaincodes/events/package.json +++ b/test/chaincodes/events/package.json @@ -2,8 +2,7 @@ "name": "chaincode", "description": "Chaincode testing events functionality", "engines": { - "node": "^12.16.1", - "npm": "^6.4.1" + "node": "^18.0.0" }, "scripts": { "start": "set -x && CORE_CHAINCODE_LOGGING_LEVEL=debug fabric-chaincode-node start" @@ -11,11 +10,11 @@ "main": "index.js", "engine-strict": true, "engineStrict": true, - "version": "2.5.2", + "version": "2.5.3", "author": "", "license": "Apache-2.0", "dependencies": { - "fabric-shim": "2.5.2", - "fabric-contract-api": "2.5.2" + "fabric-shim": "2.5.3", + "fabric-contract-api": "2.5.3" } } diff --git a/test/chaincodes/ledger/package.json b/test/chaincodes/ledger/package.json index d97091d8..24a6463a 100644 --- a/test/chaincodes/ledger/package.json +++ b/test/chaincodes/ledger/package.json @@ -2,8 +2,7 @@ "name": "chaincode", "description": "Chaincode testing ledger functionality", "engines": { - "node": "^12.16.1", - "npm": "^6.4.1" + "node": "^18.0.0" }, "scripts": { "start": "fabric-chaincode-node start" @@ -11,12 +10,12 @@ "main": "index.js", "engine-strict": true, "engineStrict": true, - "version": "2.5.2", + "version": "2.5.3", "author": "", "license": "Apache-2.0", "dependencies": { - "fabric-shim": "2.5.2", - "fabric-contract-api": "2.5.2", - "fabric-ledger": "2.5.2" + "fabric-shim": "2.5.3", + "fabric-contract-api": "2.5.3", + "fabric-ledger": "2.5.3" } } diff --git a/test/chaincodes/privateData/package.json b/test/chaincodes/privateData/package.json index cc74fce1..b7ba51c6 100644 --- a/test/chaincodes/privateData/package.json +++ b/test/chaincodes/privateData/package.json @@ -2,7 +2,7 @@ "name": "chaincode", "description": "Chaincode testing private data functionality", "engines": { - "node": "^12.16.1", + "node": "^18.0.0", "npm": ">=5.3.0" }, "scripts": { @@ -11,11 +11,11 @@ "main": "index.js", "engine-strict": true, "engineStrict": true, - "version": "2.5.2", + "version": "2.5.3", "author": "", "license": "Apache-2.0", "dependencies": { - "fabric-shim": "2.5.2", - "fabric-contract-api": "2.5.2" + "fabric-shim": "2.5.3", + "fabric-contract-api": "2.5.3" } } diff --git a/test/chaincodes/query/package.json b/test/chaincodes/query/package.json index 541be7a5..04db2fd9 100644 --- a/test/chaincodes/query/package.json +++ b/test/chaincodes/query/package.json @@ -2,8 +2,7 @@ "name": "chaincode", "description": "Chaincode testing query functionality", "engines": { - "node": "^12.16.1", - "npm": "^6.4.1" + "node": "^18.0.0" }, "scripts": { "start": "fabric-chaincode-node start" @@ -11,11 +10,11 @@ "main": "index.js", "engine-strict": true, "engineStrict": true, - "version": "2.5.2", + "version": "2.5.3", "author": "", "license": "Apache-2.0", "dependencies": { - "fabric-shim": "2.5.2", - "fabric-contract-api": "2.5.2" + "fabric-shim": "2.5.3", + "fabric-contract-api": "2.5.3" } } diff --git a/test/chaincodes/scenario/package.json b/test/chaincodes/scenario/package.json index a8173a09..4219dc2d 100644 --- a/test/chaincodes/scenario/package.json +++ b/test/chaincodes/scenario/package.json @@ -2,8 +2,7 @@ "name": "chaincode", "description": "My first exciting chaincode implemented in node.js", "engines": { - "node": "^12.16.1", - "npm": "^6.4.1" + "node": "^18.0.0" }, "scripts": { "start": "fabric-chaincode-node start" @@ -11,11 +10,11 @@ "main": "index.js", "engine-strict": true, "engineStrict": true, - "version": "2.5.2", + "version": "2.5.3", "author": "", "license": "Apache-2.0", "dependencies": { - "fabric-shim": "2.5.2", - "fabric-contract-api": "2.5.2" + "fabric-shim": "2.5.3", + "fabric-contract-api": "2.5.3" } } diff --git a/test/e2e/package.json b/test/e2e/package.json index b2011d96..64ce761b 100644 --- a/test/e2e/package.json +++ b/test/e2e/package.json @@ -1,6 +1,6 @@ { "name": "fabric-e2e-tests", - "version": "2.5.2", + "version": "2.5.3", "description": "", "main": "docker.js", "scripts": { @@ -13,7 +13,7 @@ "devDependencies": { "git-rev-sync": "3.0.1", "gulp": "^4.0.2", - "toolchain": "2.5.2", + "toolchain": "2.5.3", "delay": "5.0.0", "fs-extra": "^10.0.1", "ip": "^1.1.5", diff --git a/test/e2e/scenario.js b/test/e2e/scenario.js index 98688162..cde10a67 100644 --- a/test/e2e/scenario.js +++ b/test/e2e/scenario.js @@ -57,7 +57,7 @@ const queryFunctions = async () => { const metadata = JSON.parse(stdout); - const expectedMetadata = '{"$schema":"https://hyperledger.github.io/fabric-chaincode-node/main/api/contract-schema.json","contracts":{"UpdateValues":{"name":"UpdateValues","contractInstance":{"name":"UpdateValues","logBuffer":{"output":[]},"default":true},"transactions":[{"name":"setup","tags":["SUBMIT","submitTx"]},{"name":"setNewAssetValue","tags":["SUBMIT","submitTx"],"parameters":[{"name":"arg0","description":"Argument 0","schema":{"type":"string"}}]},{"name":"doubleAssetValue","tags":["SUBMIT","submitTx"]}],"info":{"title":"","version":""}},"RemoveValues":{"name":"RemoveValues","contractInstance":{"name":"RemoveValues"},"transactions":[{"name":"quarterAssetValue","tags":["SUBMIT","submitTx"]},{"name":"getAssetValue","tags":["SUBMIT","submitTx"]}],"info":{"title":"","version":""}},"org.hyperledger.fabric":{"name":"org.hyperledger.fabric","contractInstance":{"name":"org.hyperledger.fabric"},"transactions":[{"name":"GetMetadata"}],"info":{"title":"","version":""}}},"info":{"version":"2.5.2","title":"chaincode"},"components":{"schemas":{}}}'; + const expectedMetadata = '{"$schema":"https://hyperledger.github.io/fabric-chaincode-node/main/api/contract-schema.json","contracts":{"UpdateValues":{"name":"UpdateValues","contractInstance":{"name":"UpdateValues","logBuffer":{"output":[]},"default":true},"transactions":[{"name":"setup","tags":["SUBMIT","submitTx"]},{"name":"setNewAssetValue","tags":["SUBMIT","submitTx"],"parameters":[{"name":"arg0","description":"Argument 0","schema":{"type":"string"}}]},{"name":"doubleAssetValue","tags":["SUBMIT","submitTx"]}],"info":{"title":"","version":""}},"RemoveValues":{"name":"RemoveValues","contractInstance":{"name":"RemoveValues"},"transactions":[{"name":"quarterAssetValue","tags":["SUBMIT","submitTx"]},{"name":"getAssetValue","tags":["SUBMIT","submitTx"]}],"info":{"title":"","version":""}},"org.hyperledger.fabric":{"name":"org.hyperledger.fabric","contractInstance":{"name":"org.hyperledger.fabric"},"transactions":[{"name":"GetMetadata"}],"info":{"title":"","version":""}}},"info":{"version":"2.5.3","title":"chaincode"},"components":{"schemas":{}}}'; const schema = fs.readFileSync(path.join(__dirname, '../../apis/fabric-contract-api/schema/contract-schema.json')); diff --git a/test/fv/package.json b/test/fv/package.json index 6a753a9d..cc3155fc 100644 --- a/test/fv/package.json +++ b/test/fv/package.json @@ -1,13 +1,12 @@ { "name": "fvtests", - "version": "2.5.2", + "version": "2.5.3", "description": "fv tests", "testFabricVersion": "main", "testFabricThirdParty": "0.4.15", "docsLatestVersion": "release-1.4", "engines": { - "node": "^12.16.1", - "npm": "^6.4.1" + "node": "^18.0.0" }, "engineStrict": true, "license": "Apache-2.0", @@ -26,9 +25,9 @@ "del": "^3.0.0", "delay": "5.0.0", "eslint": "^6.6.0", - "fabric-contract-api": "2.5.2", - "fabric-shim": "2.5.2", - "fabric-shim-api": "2.5.2", + "fabric-contract-api": "2.5.3", + "fabric-shim": "2.5.3", + "fabric-shim-api": "2.5.3", "fs-extra": "^10.0.1", "git-rev-sync": "3.0.1", "gulp": "^4.0.2", diff --git a/tools/toolchain/package.json b/tools/toolchain/package.json index 544aca23..2b55329a 100644 --- a/tools/toolchain/package.json +++ b/tools/toolchain/package.json @@ -1,6 +1,6 @@ { "name": "toolchain", - "version": "2.5.2", + "version": "2.5.3", "description": "", "main": "index.js", "scripts": {