Skip to content
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
83 changes: 76 additions & 7 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,86 @@
## 2.3.0
## 2.3.0

### Features
* Support for running Java chaincode in development mode
[#553](https://github.com/hyperledger-labs/fablo/pull/553)
[#553](https://github.com/hyperledger-labs/fablo/pull/553)
* Support installing Chaincode from Docker image using CCaaS
[#550](https://github.com/hyperledger-labs/fablo/pull/550)
[#582](https://github.com/hyperledger-labs/fablo/pull/582)
[#594](https://github.com/hyperledger-labs/fablo/pull/594)
* Export network topology with Mermaid
[#565](https://github.com/hyperledger-labs/fablo/pull/565)
[#579](https://github.com/hyperledger-labs/fablo/pull/579)
* Generate diagrams by default for each 'generate' command
[#584](https://github.com/hyperledger-labs/fablo/pull/584)
* Added Fablo Sample Gateway Connection for Node.js
[#541](https://github.com/hyperledger-labs/fablo/pull/541)
* Adds gateway option to init
[#544](https://github.com/hyperledger-labs/fablo/pull/544)
* Support query command for docker setup
[#597](https://github.com/hyperledger-labs/fablo/pull/597)
* Add orderers and channels in connection profile
[#595](https://github.com/hyperledger-labs/fablo/pull/595)
* Add check for unique chaincode names
[#596](https://github.com/hyperledger-labs/fablo/pull/596)
* Hardcode fablo config inside init generator
[#554](https://github.com/hyperledger-labs/fablo/pull/554)
* Publish sample chaincode Docker image
[#555](https://github.com/hyperledger-labs/fablo/pull/555)
* Include and test Sample Go chaincode in samples/chaincodes/chaincode-kv-go
[#569](https://github.com/hyperledger-labs/fablo/pull/569)
* Export network topology with Mermaid
[#565](https://github.com/hyperledger-labs/fablo/pull/565)
* Support installing Chaincode from Docker image using CCaaS
[#550](https://github.com/hyperledger-labs/fablo/pull/550)
[#582](https://github.com/hyperledger-labs/fablo/pull/582)

### Bug Fixes
* Verify if post-generate.sh exists before executing
[#521](https://github.com/hyperledger-labs/fablo/pull/521)
[#526](https://github.com/hyperledger-labs/fablo/pull/526)
* Fix chaincode invoke CLI for endorsement policy involving multiple peers
[#549](https://github.com/hyperledger-labs/fablo/pull/549)
* Fix tag format for release CI
[#504](https://github.com/hyperledger-labs/fablo/pull/504)
* Fix missing FABLO_VERSION in publish docker workflow
[#556](https://github.com/hyperledger-labs/fablo/pull/556)
* CI: Update release workflow to match proper version tagging
[#516](https://github.com/hyperledger-labs/fablo/pull/516)
* Fix Gradle build for Java chaincode
[#583](https://github.com/hyperledger-labs/fablo/pull/583)

### Documentation
* Docs: Clarify usage of global vs local fablo installation in README
[#520](https://github.com/hyperledger-labs/fablo/pull/520)
* Fix: correct typo in CONTRIBUTING.md
[#538](https://github.com/hyperledger-labs/fablo/pull/538)
* Docs: Coverage tracker / supported features
[#557](https://github.com/hyperledger-labs/fablo/pull/557)
[#564](https://github.com/hyperledger-labs/fablo/pull/564)
[#562](https://github.com/hyperledger-labs/fablo/pull/562)
[#566](https://github.com/hyperledger-labs/fablo/pull/566)
[#563](https://github.com/hyperledger-labs/fablo/pull/563)
[#570](https://github.com/hyperledger-labs/fablo/pull/570)
[#586](https://github.com/hyperledger-labs/fablo/pull/586)

### Testing & CI
* Test cases for `repositoryUtils.ts`
[#548](https://github.com/hyperledger-labs/fablo/pull/548)
* Unit tests for `parseFabloConfig`
[#552](https://github.com/hyperledger-labs/fablo/pull/552)
* Test golang chaincode in Github Actions
[#569](https://github.com/hyperledger-labs/fablo/pull/569)
* Test post-generate hook creation and execution in CI
[#580](https://github.com/hyperledger-labs/fablo/pull/580)
* Test peer dev mode
[#592](https://github.com/hyperledger-labs/fablo/pull/592)
* Test Gateway client
[#587](https://github.com/hyperledger-labs/fablo/pull/587)
* Test: Test CCaaS for Fabric v3
[#603](https://github.com/hyperledger-labs/fablo/pull/603)

### Chore & Maintenance
* Bump all dependencies from Dependabot PRs
[#600](https://github.com/hyperledger-labs/fablo/pull/600)
* Unify Fabric version in tests and samples
[#581](https://github.com/hyperledger-labs/fablo/pull/581)
* Upgrade Blockchain Explorer
[#590](https://github.com/hyperledger-labs/fablo/pull/590)

## 2.2.0

Expand Down
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@
Fablo supports:

* Environment: Docker
* RAFT and solo consensus protocols
* RAFT, solo and BFT consensus protocols
* Multiple organizations and channels
* Chaincode installation and upgrade
* REST API client for CA and chaincodes ([Fablo REST](https://github.com/fablo-io/fablo-rest))
* [Blockchain Explorer](https://github.com/hyperledger/blockchain-explorer) which can be enabled for each organization

Visit [SUPPORTED_FEATURES.mb](SUPPORTED_FEATURES.md) to see a list of features supported by Fablo.

## See it in action

[![How to use](https://img.youtube.com/vi/JqPNozCtHkQ/0.jpg)](https://www.youtube.com/watch?v=JqPNozCtHkQ)
Expand All @@ -23,13 +25,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/2.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.3.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/2.2.0/fablo.sh -o ./fablo && chmod +x ./fablo
curl -Lf https://github.com/hyperledger-labs/fablo/releases/download/2.3.0/fablo.sh -o ./fablo && chmod +x ./fablo
```

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

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

```yaml
---
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/2.2.0/schema.json
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/2.3.0/schema.json
global:
fabricVersion: 2.4.2
tls: false
Expand Down
File renamed without changes.
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/2.2.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.3.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/2.2.0/schema.json"
"const": "https://github.com/hyperledger-labs/fablo/releases/download/2.3.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=2.2.0
FABLO_VERSION=2.3.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 @@ -1444,7 +1444,7 @@ fi
`;

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

exports[`samples/fablo-config-hlf3-1org-1chaincode-raft-ccaas.json should create proper e2e/__tmp__/samples/fablo-config-hlf3-1org-1chaincode-raft-ccaas.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf3-1org-1chaincode-raft-ccaas.json 1`] = `
"FABLO_VERSION=2.2.0
"FABLO_VERSION=2.3.0
FABLO_BUILD=<date with git hash>
FABLO_REST_VERSION=0.1.2
HYPERLEDGER_EXPLORER_VERSION=2.0.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1461,7 +1461,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=2.2.0
"FABLO_VERSION=2.3.0
FABLO_BUILD=<date with git hash>
FABLO_REST_VERSION=0.1.2
HYPERLEDGER_EXPLORER_VERSION=2.0.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2138,7 +2138,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=2.2.0
"FABLO_VERSION=2.3.0
FABLO_BUILD=<date with git hash>
FABLO_REST_VERSION=0.1.2
HYPERLEDGER_EXPLORER_VERSION=2.0.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3483,7 +3483,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=2.2.0
"FABLO_VERSION=2.3.0
FABLO_BUILD=<date with git hash>
FABLO_REST_VERSION=0.1.2
HYPERLEDGER_EXPLORER_VERSION=2.0.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3866,7 +3866,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=2.2.0
"FABLO_VERSION=2.3.0
FABLO_BUILD=<date with git hash>
FABLO_REST_VERSION=0.1.2
HYPERLEDGER_EXPLORER_VERSION=2.0.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1655,7 +1655,7 @@ fi
`;

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

exports[`samples/fablo-config-hlf3-bft-1orgs-1chaincode.json should create proper e2e/__tmp__/samples/fablo-config-hlf3-bft-1orgs-1chaincode.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf3-bft-1orgs-1chaincode.json 1`] = `
"FABLO_VERSION=2.2.0
"FABLO_VERSION=2.3.0
FABLO_BUILD=<date with git hash>
FABLO_REST_VERSION=0.1.2
HYPERLEDGER_EXPLORER_VERSION=2.0.0
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 @@ -2972,7 +2972,7 @@ Validation warnings count: 0

exports[`init should init simple fablo config 1`] = `
"{
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.2.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.3.0/schema.json",
"global": {
"fabricVersion": "2.5.12",
"tls": false,
Expand Down Expand Up @@ -3040,7 +3040,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/2.2.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.3.0/schema.json",
"global": {
"fabricVersion": "2.5.12",
"tls": false,
Expand Down Expand Up @@ -3117,7 +3117,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/2.2.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.3.0/schema.json",
"global": {
"fabricVersion": "2.5.12",
"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/2.2.0/schema.json",
"const": "https://github.com/hyperledger-labs/fablo/releases/download/2.3.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=2.2.0
FABLO_VERSION=2.3.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": "2.2.0",
"version": "2.3.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 <piotr.hejwowski@gmail.com>, Jakub Dzikowski <jakub@dzikowski.online>",
"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/2.2.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.3.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/2.2.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.3.0/schema.json",
"global": {
"fabricVersion": "2.5.12",
"tls": false,
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/2.2.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.3.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/2.2.0/schema.json
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/2.3.0/schema.json
global:
fabricVersion: 2.5.12
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/2.2.0/schema.json
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/2.3.0/schema.json
global:
fabricVersion: 2.5.12
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/2.2.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.3.0/schema.json",
"global": {
"fabricVersion": "2.3.2",
"tls": true,
Expand Down
2 changes: 1 addition & 1 deletion samples/fablo-config-hlf3-1org-1chaincode-raft-ccaas.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.2.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.3.0/schema.json",
"global": {
"fabricVersion": "3.0.0",
"tls": true
Expand Down
2 changes: 1 addition & 1 deletion samples/fablo-config-hlf3-1orgs-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/2.2.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.3.0/schema.json",
"global": {
"fabricVersion": "3.0.0",
"tls": true,
Expand Down
2 changes: 1 addition & 1 deletion samples/fablo-config-hlf3-bft-1orgs-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/2.2.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.3.0/schema.json",
"global": {
"fabricVersion": "3.0.0",
"tls": true,
Expand Down
2 changes: 1 addition & 1 deletion samples/java-dev-mode-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/2.2.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.3.0/schema.json",
"global": {
"fabricVersion": "2.4.3",
"tls": false,
Expand Down
Loading