Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set version 2.0.0 #490

Merged
merged 6 commits into from
Sep 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 54 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,66 @@
## 1.2.0-unstable
## 2.0.0

### Breaking changes
* Drop support for capabilities v1, and Fabric versions below 2.0.0
[#461](https://github.com/hyperledger-labs/fablo/pull/461)
[#462](https://github.com/hyperledger-labs/fablo/pull/462)
[#464](https://github.com/hyperledger-labs/fablo/pull/464)
[#473](https://github.com/hyperledger-labs/fablo/pull/473)
[#486](https://github.com/hyperledger-labs/fablo/pull/486)
[#488](https://github.com/hyperledger-labs/fablo/pull/488)
* Drop yarn and nvm installation support
[#455](https://github.com/hyperledger-labs/fablo/pull/455)

### Features
* Add application capability V_2_5 [#463]
[#463](https://github.com/hyperledger-labs/fablo/pull/463)
* Support for `chaincode invoke` command (tls and non-tls)
[#403](https://github.com/hyperledger-labs/fablo/pull/403)
* [#413](https://github.com/hyperledger-labs/fablo/pull/413)
* Support for `chaincodes list` command (tls and non-tls)
[#409](https://github.com/hyperledger-labs/fablo/pull/409)
[#411](https://github.com/hyperledger-labs/fablo/pull/411)
* Christmas easter egg
[#427](https://github.com/hyperledger-labs/fablo/pull/427)
* Remove dev dependencies on chaincode installation for Node.js
[#450](https://github.com/hyperledger-labs/fablo/pull/450)
* Update Fabric version in the initial configuration
[#470]( https://github.com/hyperledger-labs/fablo/pull/470)
* Publish Fablo Docker image for ARM architecture
[#478](https://github.com/hyperledger-labs/fablo/pull/478)
[#487](https://github.com/hyperledger-labs/fablo/pull/487)

### Fixes
* Remove unsupported test library and dependencies
* Fixed https request when tls is enabled
[#438](https://github.com/hyperledger-labs/fablo/pull/438)
* Fixed issue with `fablo up` command when using CouchDB
[#443](https://github.com/hyperledger-labs/fablo/pull/443)
* Update Docker Compose command
[#465](https://github.com/hyperledger-labs/fablo/pull/465)
* Fixed issue with private data collection
[#460]( https://github.com/hyperledger-labs/fablo/pull/467)
* Updated Node.js version from 12 to 16 in chaincode
* Remove unsupported test library and dependencies

### Chore & Maintenance
* Add contributing guidelines
[#439](https://github.com/hyperledger-labs/fablo/pull/439)
* Documented the Fablo architecture in `ARCHITECTURE.md` file
[#456](https://github.com/hyperledger-labs/fablo/pull/456)
* Changed recommended Node.js version check
[#442](https://github.com/hyperledger-labs/fablo/pull/442)
* Library updates (mostly by Dependabot)
* Various CI improvements and fixes
[#467](https://github.com/hyperledger-labs/fablo/pull/467)
[#458](https://github.com/hyperledger-labs/fablo/pull/458)
[#489](https://github.com/hyperledger-labs/fablo/pull/489)
* Improve .gitignore file
[#476]( https://github.com/hyperledger-labs/fablo/pull/476)
* Update Fablo docker image registry to GHCR
[#491](https://github.com/hyperledger-labs/fablo/pull/491)

## 1.2.0

### Features
* Initial Kubernetes support [#351](https://github.com/hyperledger-labs/fablo/issues/351)
(not yet so elastic like Fablo in terms of network topology, but ready for first views and comments)
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ You may keep the script in the root directory of your project or install it glob
To install it globally:

```bash
sudo curl -Lf https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/fablo.sh -o /usr/local/bin/fablo && sudo chmod +x /usr/local/bin/fablo
sudo curl -Lf https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/fablo.sh -o /usr/local/bin/fablo && sudo chmod +x /usr/local/bin/fablo
```

To get a copy of Fablo for a single project, execute in the project root:

```bash
curl -Lf https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/fablo.sh -o ./fablo && chmod +x ./fablo
curl -Lf https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/fablo.sh -o ./fablo && chmod +x ./fablo
```

## Getting started
Expand Down Expand Up @@ -344,7 +344,7 @@ The basic structure of Fablo config file is as follows:

```json
{
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json",
"global": { ... },
"orgs": [ ... ],
"channels": [ ... ],
Expand Down Expand Up @@ -507,7 +507,7 @@ Genrated Hooks are saved in `fablo-target/hooks`.

```yaml
---
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/schema.json
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json
global:
fabricVersion: 2.4.2
tls: false
Expand Down
2 changes: 1 addition & 1 deletion docs/sample.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json",
"global": {
"fabricVersion": "2.3.2",
"tls": false,
Expand Down
2 changes: 1 addition & 1 deletion docs/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
],
"properties": {
"$schema": {
"const": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json"
"const": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json"
},
"global": {
"$id": "#/properties/global",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ exports[`samples/fablo-config-hlf2-1org-1chaincode-k8s.json should create proper
REPOSITORY="https://kfsoftware.github.io/hlf-helm-charts"
STORAGE_CLASS=$(kubectl describe sc | grep Name | tr -s ' ' | cut -d ':' -f 2 | cut -d ' ' -f 2)

FABLO_VERSION=1.2.1-unstable.0
FABLO_VERSION=2.0.0
FABLO_BUILD=<date with git hash>
FABLO_CONFIG=<absolute path>
ORDERER_IMAGE=hyperledger/fabric-orderer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1524,7 +1524,7 @@ fi
`;

exports[`samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json should create proper e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json 1`] = `
"FABLO_VERSION=1.2.1-unstable.0
"FABLO_VERSION=2.0.0
FABLO_BUILD=<date with git hash>
FABLO_REST_VERSION=0.1.2
HYPERLEDGER_EXPLORER_VERSION=1.1.8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1434,7 +1434,7 @@ fi
`;

exports[`samples/fablo-config-hlf2-1org-1chaincode.json should create proper e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf2-1org-1chaincode.json 1`] = `
"FABLO_VERSION=1.2.1-unstable.0
"FABLO_VERSION=2.0.0
FABLO_BUILD=<date with git hash>
FABLO_REST_VERSION=0.1.2
HYPERLEDGER_EXPLORER_VERSION=1.1.8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2095,7 +2095,7 @@ fi
`;

exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml should create proper e2e/__tmp__/samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml 1`] = `
"FABLO_VERSION=1.2.1-unstable.0
"FABLO_VERSION=2.0.0
FABLO_BUILD=<date with git hash>
FABLO_REST_VERSION=0.1.2
HYPERLEDGER_EXPLORER_VERSION=1.1.8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3018,7 +3018,7 @@ fi
`;

exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml should create proper e2e/__tmp__/samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] = `
"FABLO_VERSION=1.2.1-unstable.0
"FABLO_VERSION=2.0.0
FABLO_BUILD=<date with git hash>
FABLO_REST_VERSION=0.1.2
HYPERLEDGER_EXPLORER_VERSION=1.1.8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3314,7 +3314,7 @@ fi
`;

exports[`samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json should create proper e2e/__tmp__/samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json 1`] = `
"FABLO_VERSION=1.2.1-unstable.0
"FABLO_VERSION=2.0.0
FABLO_BUILD=<date with git hash>
FABLO_REST_VERSION=0.1.2
HYPERLEDGER_EXPLORER_VERSION=1.1.8
Expand Down
6 changes: 3 additions & 3 deletions e2e/__snapshots__/fabloCommands.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -2909,7 +2909,7 @@ Validation warnings count: 0

exports[`init should init simple fablo config 1`] = `
"{
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json",
"global": {
"fabricVersion": "2.5.9",
"tls": false,
Expand Down Expand Up @@ -2963,7 +2963,7 @@ exports[`init should init simple fablo config 1`] = `

exports[`init should init simple fablo config with node chaincode 1`] = `
"{
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json",
"global": {
"fabricVersion": "2.5.9",
"tls": false,
Expand Down Expand Up @@ -3025,7 +3025,7 @@ exports[`init should init simple fablo config with node chaincode 1`] = `

exports[`init should init simple fablo config with node chaincode and rest api 1`] = `
"{
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json",
"global": {
"fabricVersion": "2.5.9",
"tls": false,
Expand Down
2 changes: 1 addition & 1 deletion e2e/__snapshots__/schema.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ exports[`schema should match snapshot 1`] = `
"default": {},
"properties": {
"$schema": {
"const": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json",
"const": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json",
},
"chaincodes": {
"$id": "#/properties/chaincodes",
Expand Down
2 changes: 1 addition & 1 deletion fablo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -e

FABLO_VERSION=1.2.1-unstable.0
FABLO_VERSION=2.0.0
FABLO_IMAGE_NAME="ghcr.io/fablo-io/fablo"
FABLO_IMAGE="$FABLO_IMAGE_NAME:$FABLO_VERSION"

Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "generator-fablo",
"version": "1.2.1-unstable.0",
"version": "2.0.0",
"description": "Fablo is a simple tool to generate the Hyperledger Fabric blockchain network and run it on Docker. It supports RAFT and solo consensus protocols, multiple organizations and channels, chaincode installation and upgrade.",
"author": "Piotr Hejwowski <[email protected]>, Jakub Dzikowski <[email protected]>",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion samples/fablo-config-hlf2-1org-1chaincode-k8s.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json",
"global": {
"fabricVersion": "2.4.7",
"tls": false,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json",
"global": {
"fabricVersion": "2.3.3",
"tls": true,
Expand Down
2 changes: 1 addition & 1 deletion samples/fablo-config-hlf2-1org-1chaincode.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json",
"global": {
"fabricVersion": "2.5.9",
"tls": false
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json
global:
fabricVersion: 2.4.7
tls: false
Expand Down
2 changes: 1 addition & 1 deletion samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json
global:
fabricVersion: 2.4.3
tls: true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json",
"global": {
"fabricVersion": "2.3.2",
"tls": true,
Expand Down
Loading