From 3d2fe3175b4d2d963c064be0f7858744e5f59e25 Mon Sep 17 00:00:00 2001 From: Jakub Dzikowski Date: Tue, 10 Sep 2024 12:19:05 +0200 Subject: [PATCH 1/3] Set version 2.0.0 Signed-off-by: Jakub Dzikowski --- README.md | 8 ++++---- docs/sample.json | 2 +- docs/schema.json | 2 +- ...ablo-config-hlf2-1org-1chaincode-k8s.json.test.ts.snap | 2 +- ...g-hlf2-1org-1chaincode-raft-explorer.json.test.ts.snap | 2 +- .../fablo-config-hlf2-1org-1chaincode.json.test.ts.snap | 2 +- ...-hlf2-2orgs-2chaincodes-private-data.yaml.test.ts.snap | 2 +- ...o-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap | 2 +- ...-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap | 2 +- e2e/__snapshots__/fabloCommands.test.ts.snap | 6 +++--- e2e/__snapshots__/schema.test.ts.snap | 2 +- fablo.sh | 2 +- package-lock.json | 4 ++-- package.json | 2 +- samples/fablo-config-hlf2-1org-1chaincode-k8s.json | 2 +- .../fablo-config-hlf2-1org-1chaincode-raft-explorer.json | 2 +- samples/fablo-config-hlf2-1org-1chaincode.json | 2 +- .../fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml | 2 +- samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml | 2 +- .../fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json | 2 +- 20 files changed, 26 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index d86d2c8e..99cb8fc5 100644 --- a/README.md +++ b/README.md @@ -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 @@ -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": [ ... ], @@ -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 diff --git a/docs/sample.json b/docs/sample.json index 4f31cb0f..360bec3d 100644 --- a/docs/sample.json +++ b/docs/sample.json @@ -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, diff --git a/docs/schema.json b/docs/schema.json index a493429c..fd598100 100644 --- a/docs/schema.json +++ b/docs/schema.json @@ -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", diff --git a/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-k8s.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-k8s.json.test.ts.snap index 06005696..94939945 100644 --- a/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-k8s.json.test.ts.snap +++ b/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-k8s.json.test.ts.snap @@ -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= FABLO_CONFIG= ORDERER_IMAGE=hyperledger/fabric-orderer diff --git a/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.test.ts.snap index e61f8f44..99c2362a 100644 --- a/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.test.ts.snap +++ b/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.test.ts.snap @@ -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= FABLO_REST_VERSION=0.1.0 HYPERLEDGER_EXPLORER_VERSION=1.1.8 diff --git a/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap index 285db2bd..1271012f 100644 --- a/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap +++ b/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap @@ -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= FABLO_REST_VERSION=0.1.0 HYPERLEDGER_EXPLORER_VERSION=1.1.8 diff --git a/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.test.ts.snap index ac9973f3..3b5fff10 100644 --- a/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.test.ts.snap +++ b/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.test.ts.snap @@ -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= FABLO_REST_VERSION=0.1.0 HYPERLEDGER_EXPLORER_VERSION=1.1.8 diff --git a/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap index 283f90b1..a509860f 100644 --- a/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap +++ b/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap @@ -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= FABLO_REST_VERSION=0.1.0 HYPERLEDGER_EXPLORER_VERSION=1.1.8 diff --git a/e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap index b1db86d3..64a22652 100644 --- a/e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap +++ b/e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap @@ -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= FABLO_REST_VERSION=0.1.0 HYPERLEDGER_EXPLORER_VERSION=1.1.8 diff --git a/e2e/__snapshots__/fabloCommands.test.ts.snap b/e2e/__snapshots__/fabloCommands.test.ts.snap index f8acf3d6..10cdeed9 100644 --- a/e2e/__snapshots__/fabloCommands.test.ts.snap +++ b/e2e/__snapshots__/fabloCommands.test.ts.snap @@ -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, @@ -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, @@ -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, diff --git a/e2e/__snapshots__/schema.test.ts.snap b/e2e/__snapshots__/schema.test.ts.snap index a2096822..6923640c 100644 --- a/e2e/__snapshots__/schema.test.ts.snap +++ b/e2e/__snapshots__/schema.test.ts.snap @@ -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", diff --git a/fablo.sh b/fablo.sh index 83e55161..ffcbc3cc 100755 --- a/fablo.sh +++ b/fablo.sh @@ -2,7 +2,7 @@ set -e -FABLO_VERSION=1.2.1-unstable.0 +FABLO_VERSION=2.0.0 FABLO_IMAGE_NAME="softwaremill/fablo" FABLO_IMAGE="$FABLO_IMAGE_NAME:$FABLO_VERSION" diff --git a/package-lock.json b/package-lock.json index 41a98db1..dcfd8743 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "generator-fablo", - "version": "1.2.1-unstable.0", + "version": "2.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "generator-fablo", - "version": "1.2.1-unstable.0", + "version": "2.0.0", "license": "Apache-2.0", "dependencies": { "chalk": "^4.1.0", diff --git a/package.json b/package.json index 1fd58280..0127a603 100644 --- a/package.json +++ b/package.json @@ -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 , Jakub Dzikowski ", "repository": { diff --git a/samples/fablo-config-hlf2-1org-1chaincode-k8s.json b/samples/fablo-config-hlf2-1org-1chaincode-k8s.json index 04798481..62ef917d 100644 --- a/samples/fablo-config-hlf2-1org-1chaincode-k8s.json +++ b/samples/fablo-config-hlf2-1org-1chaincode-k8s.json @@ -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, diff --git a/samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json b/samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json index 8c0886b4..176cb5a0 100644 --- a/samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json +++ b/samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json @@ -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, diff --git a/samples/fablo-config-hlf2-1org-1chaincode.json b/samples/fablo-config-hlf2-1org-1chaincode.json index 2188ecbd..4053ad5a 100644 --- a/samples/fablo-config-hlf2-1org-1chaincode.json +++ b/samples/fablo-config-hlf2-1org-1chaincode.json @@ -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 diff --git a/samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml b/samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml index 65e6ec0e..c71fef02 100644 --- a/samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml +++ b/samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml @@ -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 diff --git a/samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml b/samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml index c150b9d6..2fdb0d9c 100644 --- a/samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml +++ b/samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml @@ -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 diff --git a/samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json b/samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json index 42b60d1c..e1686dbf 100644 --- a/samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json +++ b/samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json @@ -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, From 92eb8f945409a14fee5930bcec2978e04b5be776 Mon Sep 17 00:00:00 2001 From: Jakub Dzikowski Date: Tue, 10 Sep 2024 12:24:42 +0200 Subject: [PATCH 2/3] Update changelog with version 2.0.0 changes Signed-off-by: Jakub Dzikowski --- CHANGELOG.md | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dba0850f..c054daef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,14 +1,64 @@ -## 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) ## 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) From 960fd0e03a8298fa53bb7c83c3757273d8ffa699 Mon Sep 17 00:00:00 2001 From: Jakub Dzikowski Date: Thu, 12 Sep 2024 12:29:43 +0200 Subject: [PATCH 3/3] Update changelog: add info about new Fablo Docker image registry Signed-off-by: Jakub Dzikowski --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c054daef..5efde50d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -56,6 +56,8 @@ [#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