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
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Unstable
## 2.4.3

### Chore & Maintenance
* Update Node.js to 20 [#641](https://github.com/hyperledger-labs/fablo/pull/641)
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ You can keep the script in the root directory of your project or install it glob
To get a copy of Fablo for a single project, run this command in your project root:

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

To install it globally, run:

```bash
sudo curl -Lf https://github.com/hyperledger-labs/fablo/releases/download/2.4.2/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.4.3/fablo.sh -o /usr/local/bin/fablo && sudo chmod +x /usr/local/bin/fablo
```

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

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

```yaml
---
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/2.4.2/schema.json
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/2.4.3/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/2.4.2/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.3/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.4.2/schema.json"
"const": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.3/schema.json"
},
"global": {
"$id": "#/properties/global",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

exports[`samples/fablo-config-hlf2-1org-1chaincode-k8s.json should create proper e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode-k8s.json.tmpdir/fablo-target/fablo-config.json from samples/fablo-config-hlf2-1org-1chaincode-k8s.json 1`] = `
"{
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.2/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.3/schema.json",
"global": {
"fabricVersion": "2.4.7",
"tls": false,
Expand Down Expand Up @@ -146,7 +146,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.4.2
FABLO_VERSION=2.4.3
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 @@ -2,7 +2,7 @@

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/fablo-config.json from samples/fablo-config-hlf2-1org-1chaincode-peer-dev-mode.json 1`] = `
"{
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.2/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.3/schema.json",
"global": {
"fabricVersion": "2.5.12",
"tls": false,
Expand Down Expand Up @@ -1513,7 +1513,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.4.2
"FABLO_VERSION=2.4.3
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 @@ -2,7 +2,7 @@

exports[`samples/fablo-config-hlf2-1org-1chaincode.json should create proper e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode.json.tmpdir/fablo-target/fablo-config.json from samples/fablo-config-hlf2-1org-1chaincode.json 1`] = `
"{
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.2/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.3/schema.json",
"global": {
"fabricVersion": "2.5.9",
"tls": false
Expand Down Expand Up @@ -1520,7 +1520,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.4.2
"FABLO_VERSION=2.4.3
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 @@ -2,7 +2,7 @@

exports[`samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json should create proper e2e/__tmp__/samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json.tmpdir/fablo-target/fablo-config.json from samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json 1`] = `
"{
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.2/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.3/schema.json",
"global": {
"fabricVersion": "3.1.0",
"tls": true
Expand Down Expand Up @@ -1598,7 +1598,7 @@ fi
`;

exports[`samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json should create proper e2e/__tmp__/samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json 1`] = `
"FABLO_VERSION=2.4.2
"FABLO_VERSION=2.4.3
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 @@ -2,7 +2,7 @@

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/fablo-config.yaml from samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml 1`] = `
"---
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/2.4.2/schema.json
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/2.4.3/schema.json
global:
fabricVersion: 2.5.12
tls: false
Expand Down Expand Up @@ -2200,7 +2200,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.4.2
"FABLO_VERSION=2.4.3
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 @@ -2,7 +2,7 @@

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/fablo-config.yaml from samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] = `
"---
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/2.4.2/schema.json
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/2.4.3/schema.json
global:
fabricVersion: 2.5.12
tls: true
Expand Down Expand Up @@ -3569,7 +3569,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.4.2
"FABLO_VERSION=2.4.3
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 @@ -2,7 +2,7 @@

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/fablo-config.json from samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json 1`] = `
"{
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.2/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.3/schema.json",
"global": {
"fabricVersion": "2.3.2",
"tls": true,
Expand Down Expand Up @@ -4000,7 +4000,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.4.2
"FABLO_VERSION=2.4.3
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 @@ -2,7 +2,7 @@

exports[`samples/fablo-config-hlf3-1orgs-1chaincode.json should create proper e2e/__tmp__/samples/fablo-config-hlf3-1orgs-1chaincode.json.tmpdir/fablo-target/fablo-config.json from samples/fablo-config-hlf3-1orgs-1chaincode.json 1`] = `
"{
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.2/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.3/schema.json",
"global": {
"fabricVersion": "3.1.0",
"tls": true,
Expand Down Expand Up @@ -1717,7 +1717,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.4.2
"FABLO_VERSION=2.4.3
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 @@ -2,7 +2,7 @@

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/fablo-config.json from samples/fablo-config-hlf3-bft-1orgs-1chaincode.json 1`] = `
"{
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.2/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.3/schema.json",
"global": {
"fabricVersion": "3.1.0",
"tls": true,
Expand Down Expand Up @@ -1743,7 +1743,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.4.2
"FABLO_VERSION=2.4.3
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 @@ -3020,7 +3020,7 @@ Validation warnings count: 0

exports[`init should init simple fablo config 1`] = `
"{
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.2/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.3/schema.json",
"global": {
"fabricVersion": "3.1.0",
"tls": true,
Expand Down Expand Up @@ -3086,7 +3086,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.4.2/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.3/schema.json",
"global": {
"fabricVersion": "3.1.0",
"tls": true,
Expand Down Expand Up @@ -3161,7 +3161,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.4.2/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.3/schema.json",
"global": {
"fabricVersion": "3.1.0",
"tls": true,
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.4.2/schema.json",
"const": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.3/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.4.2
FABLO_VERSION=2.4.3
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.4.2",
"version": "2.4.3",
"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.4.2/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.3/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.4.2/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.3/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.4.2/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.3/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.4.2/schema.json
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/2.4.3/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.4.2/schema.json
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/2.4.3/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.4.2/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.3/schema.json",
"global": {
"fabricVersion": "2.3.2",
"tls": true,
Expand Down
2 changes: 1 addition & 1 deletion samples/fablo-config-hlf3-1org-2chaincode-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.4.2/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.3/schema.json",
"global": {
"fabricVersion": "3.1.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.4.2/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.3/schema.json",
"global": {
"fabricVersion": "3.1.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.4.2/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.3/schema.json",
"global": {
"fabricVersion": "3.1.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.4.2/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.3/schema.json",
"global": {
"fabricVersion": "2.4.3",
"tls": false,
Expand Down
Loading