Skip to content
This repository was archived by the owner on Apr 22, 2025. It is now read-only.

Commit 1f8d86c

Browse files
Apply main branch changes following branch rename
Signed-off-by: Mark S. Lewis <[email protected]>
1 parent dd6fff2 commit 1f8d86c

File tree

84 files changed

+19306
-18811
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+19306
-18811
lines changed

.github/settings.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ repository:
66
name: fabric-sdk-node
77
description: Hyperledger Fabric SDK for Node https://wiki.hyperledger.org/display/fabric
88
homepage: https://hyperledger.github.io/fabric-sdk-node/
9-
default_branch: master
9+
default_branch: main
1010
has_downloads: true
1111
has_issues: false
1212
has_projects: false

.github/workflows/pull_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Pull request
33
on:
44
pull_request:
55
branches:
6-
- release-2.2
6+
- main
77

88
concurrency:
99
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}

.github/workflows/push.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Push
33
on:
44
push:
55
branches:
6-
- release-2.2
6+
- main
77

88
jobs:
99
build:

.github/workflows/scheduled.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
name: Scheduled
2+
3+
on:
4+
schedule:
5+
- cron: '30 23 * * *'
6+
7+
jobs:
8+
main:
9+
uses: ./.github/workflows/test.yml

.github/workflows/test.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ jobs:
2929
- uses: actions/checkout@v3
3030
with:
3131
ref: ${{ inputs.checkout-ref }}
32-
3332
- name: Use Node.js ${{ matrix.node-version }}
3433
uses: actions/setup-node@v3
3534
with:
@@ -54,7 +53,6 @@ jobs:
5453
with:
5554
name: ${{ matrix.node-version }}-unit-test-debug.log
5655
path: test/temp/debug.log
57-
5856
- name: "Archive scenario test debug log"
5957
if: ${{ failure() }}
6058
uses: actions/upload-artifact@v3
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: "Security vulnerability scan"
2+
3+
on:
4+
schedule:
5+
- cron: "20 0 * * *"
6+
7+
jobs:
8+
npm-audit:
9+
runs-on: ubuntu-22.04
10+
strategy:
11+
fail-fast: false
12+
matrix:
13+
package:
14+
- fabric-ca-client
15+
- fabric-common
16+
- fabric-network
17+
- fabric-protos
18+
steps:
19+
- uses: actions/checkout@v3
20+
- uses: actions/setup-node@v3
21+
with:
22+
node-version: 18.x
23+
- name: Update npm
24+
run: |
25+
npm update --global npm
26+
npm --version
27+
- name: Scan
28+
run: |
29+
npm install --package-lock-only
30+
npm audit --omit=dev
31+
working-directory: ${{ matrix.package }}

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Changelog
2+
3+
Notable changes in each release are documented on the project's [GitHub releases](https://github.com/hyperledger/fabric-sdk-node/releases) page.

MAINTAINERS.md

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
[//]: # (SPDX-License-Identifier: Apache-2.0)
2+
3+
Maintainers
4+
===========
5+
6+
See [the documentation on Maintainers](https://hyperledger-fabric.readthedocs.io/en/latest/CONTRIBUTING.html#maintainers) to learn about the role of the maintainers and the process to become one.
7+
8+
**Active Maintainers**
9+
10+
| Name | GitHub |
11+
|------|--------|
12+
| Andrew Coleman | [andrew-coleman][andrew-coleman] |
13+
| Mark Lewis | [bestbeforetoday][bestbeforetoday] |
14+
15+
16+
**Emeritus Maintainers**
17+
18+
| Name | GitHub |
19+
|------|--------|
20+
| Bret Harrison | [harrisob][harrisob] |
21+
| Chaoyi Zhao | [zhaochy1990][zhaochy1990] |
22+
| Chris Ferris | [christo4ferris][christo4ferris] |
23+
| Gari Singh | [mastersingh24][mastersingh24] |
24+
| Heather Pollard | [heatherlp][heatherlp] |
25+
| Jonathan Levi | [hacera][hacera] |
26+
| Keith Smith | [smithbk][smithbk] |
27+
28+
[andrew-coleman]: https://github.com/andrew-coleman
29+
[bestbeforetoday]: https://github.com/bestbeforetoday
30+
[christo4ferris]: https://github.com/christo4ferris
31+
[hacera]: https://github.com/hacera
32+
[harrisob]: https://github.com/harrisob
33+
[heatherlp]: https://github.com/heatherlp
34+
[mastersingh24]: https://github.com/mastersingh24
35+
[smithbk]: https://github.com/smithbk
36+
[zhaochy1990]: https://github.com/zhaochy1990

MAINTAINERS.rst

Lines changed: 0 additions & 27 deletions
This file was deleted.

README.md

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
## Hyperledger Fabric Client SDK for Node.js
1+
## Hyperledger Fabric Client SDK for Node.js <a href="https://github.com/hyperledger/fabric-sdk-node/actions/workflows/scheduled.yml"><img src="https://github.com/hyperledger/fabric-sdk-node/actions/workflows/scheduled.yml/badge.svg" alt="Build status" style="float: right"></a>
22

3-
[![Build Status](https://dev.azure.com/Hyperledger/Fabric-SDK-Node/_apis/build/status/hyperledger.fabric-sdk-node?branchName=master)](https://dev.azure.com/Hyperledger/Fabric-SDK-Node/_build/latest?definitionId=47&branchName=master)
3+
> **Note:** When developing applications for Hyperledger Fabric v2.4 and later, you should use the [Fabric Gateway client API](https://hyperledger.github.io/fabric-gateway/).
44
55
The Hyperledger Fabric Client SDK makes it possible to use APIs to interact with a Hyperledger Fabric blockchain. This readme is directed towards a current or future contributor to this project, and gives an overview of setting up the project locally and running tests. For more information on the SDK, including features and an API reference, please visit the [SDK documentation](https://hyperledger.github.io/fabric-sdk-node/).
66

@@ -12,24 +12,20 @@ This project publishes the following npm packages:
1212

1313
## Build and Test
1414
To build and test, the following pre-requisites must be installed first:
15-
* Node.js, version 10 is supported from 10.15.3 and higher
16-
* Node.js, version 12 is supported from 12.13.1 and higher
17-
* npm tool version 6 or higher
18-
* docker (only required for running integration tests, see below)
15+
* Node.js
16+
* Docker (only required for running integration tests, see below)
1917

2018
### Run unit tests
2119
Clone the project and launch the following commands to install the dependencies and perform various tasks.
2220

2321
In the project root folder:
2422
* Install all dependencies via `npm install`
2523
* Optionally, to generate API docs via `npm run docs`
26-
* To generate the required crypto material used by the tests, use one of the following patform specific commands:
27-
* For Linux `npm run installAndGenerateCerts`
28-
* For mac `npm run installAndGenerateCertsMac`
24+
* To generate the required crypto material used by the tests, use the npm task `npm run installAndGenerateCerts`
2925
* To run the unit tests that do not require any additional set up, use `npm run testHeadless`
3026

3127
### Run Integration Tests
32-
Integration tests run on the master branch require the most recent stable Fabric images, which are hosted on Artifactory. A utility script is provided to retrieve non-published docker images, which may be run using the command `npm run pullFabricImages`
28+
Integration tests run on the main branch require the most recent stable Fabric images, which are hosted on Artifactory. A utility script is provided to retrieve non-published docker images, which may be run using the command `npm run pullFabricImages`
3329

3430
Now you are ready to run the integration tests. It is advisable to clear out any previous key value stores that may have cached user enrollment certificates using the command (`rm -rf /tmp/hfc-*`, `rm -rf ~/.hfc-key-store`) prior to testing in isolation.
3531

@@ -65,4 +61,3 @@ Check the `./release_notes` directory for the release notes of the specified rel
6561
Check [the documentation](./CONTRIBUTING.md) on how to contribute to this project for the full details.
6662

6763
<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
68-
s

0 commit comments

Comments
 (0)