diff --git a/CHANGELOG.md b/CHANGELOG.md index 375fa265..04e172d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,20 @@ -## 2.4.4 +## 2.5.0 + +### Features +* Add MySQL database support for CA [#618](https://github.com/hyperledger-labs/fablo/pull/618) +* Quick start [#645](https://github.com/hyperledger-labs/fablo/pull/645) ### Bug Fixes * Get chaincode container name by peer address instead of index [#649](https://github.com/hyperledger-labs/fablo/pull/649) +* Empty chaincode directory mount [#651](https://github.com/hyperledger-labs/fablo/pull/651) +* Show duplicated chaincodes in mermaid [#639](https://github.com/hyperledger-labs/fablo/pull/639) +* Quick installation URL fix [#646](https://github.com/hyperledger-labs/fablo/pull/646) -### Documentation -* Quick start [#645](https://github.com/hyperledger-labs/fablo/pull/645) [#646](https://github.com/hyperledger-labs/fablo/pull/646) +### Testing +* Fix flaky snapshot ccaas test [#648](https://github.com/hyperledger-labs/fablo/pull/648) + +### Chore & Maintenance +* Bump lodash from 4.17.21 to 4.17.23 [#650](https://github.com/hyperledger-labs/fablo/pull/650) ## 2.4.3 diff --git a/README.md b/README.md index aa3410a3..726a5ac3 100644 --- a/README.md +++ b/README.md @@ -459,7 +459,7 @@ The basic structure of Fablo config file is as follows: ```json { - "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.3/schema.json", + "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.5.0/schema.json", "global": { ... }, "orgs": [ ... ], "channels": [ ... ], @@ -636,7 +636,7 @@ Generated hooks are saved in `fablo-target/hooks`. ```yaml --- -"$schema": https://github.com/hyperledger-labs/fablo/releases/download/2.4.3/schema.json +"$schema": https://github.com/hyperledger-labs/fablo/releases/download/2.5.0/schema.json global: fabricVersion: 2.4.2 tls: false diff --git a/SUPPORTED_FEATURES.md b/SUPPORTED_FEATURES.md index 80fa1b5c..625f981c 100644 --- a/SUPPORTED_FEATURES.md +++ b/SUPPORTED_FEATURES.md @@ -16,8 +16,8 @@ This document provides an overview of Fablo features. The table below tracks fea | Peer DB - LevelDB | ✓ | ✓ | ✓ | [01_v3](/e2e-network/docker/test-01-v3-simple.sh), [05_v3](/e2e-network/docker/test-05-v3.sh), [06_v3](/e2e-network/docker/test-06-v3-bft.sh) | | | Peer DB - CouchDB | ✓ | ✓ | ✓ | [04_v3](/e2e-network/docker/test-04-v3-snapshot-ccaas.sh) | | | CA DB - SQLite | ✓ | ✓ | ✓ | [01_v3](/e2e-network/docker/test-01-v3-simple.sh), [05_v3](/e2e-network/docker/test-05-v3.sh), [06_v3](/e2e-network/docker/test-06-v3-bft.sh) | | -| CA DB - Postgres | ✓ | ✓ | ✓ | [04_v3](/e2e-network/docker/test-04-v3-snapshot-ccaas.sh) | | -| CA DB - MySQL | ✕ | ✕ | ✓ | | [#561](https://github.com/hyperledger-labs/fablo/issues/561) | +| CA DB - Postgres | ✓ | ✓ | ✓ | | | +| CA DB - MySQL | ✓ | ✓ | ✓ | [04_v3](/e2e-network/docker/test-04-v3-snapshot-ccaas.sh) | | |
**CHANNELS** | | | | | | | Channel query scripts | ✓ | ✓ | | [01_v3](/e2e-network/docker/test-01-v3-simple.sh), [05_v3](/e2e-network/docker/test-05-v3.sh), [06_v3](/e2e-network/docker/test-06-v3-bft.sh) | | |
**CHAINCODES** | | | | | | diff --git a/bump-version.sh b/bump-version.sh index 8d3ca5e5..f922baf2 100755 --- a/bump-version.sh +++ b/bump-version.sh @@ -27,10 +27,14 @@ npm version "$new_version" --no-git-tag-version > /dev/null echo "done" echo -n " - FABLO_VERSION... " -perl -i -pe "s/FABLO_VERSION=.*\\n/FABLO_VERSION=${new_version}\\n/g" fablo.sh perl -i -pe "s/FABLO_VERSION=.*\\n/FABLO_VERSION=${new_version}\\n/g" e2e/__snapshots__/* echo "done" +echo -n " - fablo.sh... " +perl -i -pe "s/FABLO_VERSION=.*\\n/FABLO_VERSION=${new_version}\\n/g" fablo.sh +cp fablo.sh docs/fablo.sh +echo "done" + echo -n " - JSON schema URL... " schema_update_pattern="s/download\/[0-9-.a-zA-Z]*\/schema.json/download\/${new_version}\/schema.json/g" if [ "$include_readme" = true ]; then diff --git a/docs/fablo.sh b/docs/fablo.sh index 80cbef19..c7f86678 100755 --- a/docs/fablo.sh +++ b/docs/fablo.sh @@ -2,7 +2,7 @@ set -e -FABLO_VERSION=2.4.3 +FABLO_VERSION=2.5.0 FABLO_IMAGE_NAME="ghcr.io/fablo-io/fablo" FABLO_IMAGE="$FABLO_IMAGE_NAME:$FABLO_VERSION" diff --git a/docs/sample.json b/docs/sample.json index dcbb0e14..aa912cbb 100644 --- a/docs/sample.json +++ b/docs/sample.json @@ -1,5 +1,5 @@ { - "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.3/schema.json", + "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.5.0/schema.json", "global": { "fabricVersion": "2.3.2", "tls": false, diff --git a/docs/schema.json b/docs/schema.json index 37896da0..73f38b71 100644 --- a/docs/schema.json +++ b/docs/schema.json @@ -12,7 +12,7 @@ ], "properties": { "$schema": { - "const": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.3/schema.json" + "const": "https://github.com/hyperledger-labs/fablo/releases/download/2.5.0/schema.json" }, "global": { "$id": "#/properties/global", diff --git a/e2e-network/docker/test-04-v3-snapshot-ccaas.sh b/e2e-network/docker/test-04-v3-snapshot-ccaas.sh index 43582a18..69673e2c 100755 --- a/e2e-network/docker/test-04-v3-snapshot-ccaas.sh +++ b/e2e-network/docker/test-04-v3-snapshot-ccaas.sh @@ -121,8 +121,8 @@ waitForChaincode "peer0.org1.example.com" "my-channel1" "chaincode1" "0.0.1" waitForContainer "ccaas_peer0.org1.example.com_my-channel1_chaincode1_0.0.1" "Bootstrap process completed" waitForContainer "ccaas_peer0.org1.example.com_my-channel2_chaincode1_0.0.1" "Bootstrap process completed" -# sleep one second to ensure the CCAAS container is ready -sleep 1 +# sleep to ensure the CCAAS container is ready +sleep 3 # check if state is kept after restoration user_token_response="$(expectCARest "$fablo_rest_org1/user/enroll" '' '{"id": "gordon", "secret": "gordonpw"}' 'token')" 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 62f34589..898ada8b 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 @@ -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.3/schema.json", + "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.5.0/schema.json", "global": { "fabricVersion": "2.4.7", "tls": false, @@ -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.3 +FABLO_VERSION=2.5.0 FABLO_BUILD= FABLO_CONFIG= ORDERER_IMAGE=hyperledger/fabric-orderer diff --git a/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-peer-dev-mode.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-peer-dev-mode.json.test.ts.snap index 279f1f82..7153f6fe 100644 --- a/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-peer-dev-mode.json.test.ts.snap +++ b/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-peer-dev-mode.json.test.ts.snap @@ -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.3/schema.json", + "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.5.0/schema.json", "global": { "fabricVersion": "2.5.12", "tls": false, @@ -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.3 +"FABLO_VERSION=2.5.0 FABLO_BUILD= FABLO_REST_VERSION=0.1.2 HYPERLEDGER_EXPLORER_VERSION=2.0.0 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 7f2420bd..baef1ea6 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 @@ -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.3/schema.json", + "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.5.0/schema.json", "global": { "fabricVersion": "2.5.9", "tls": false @@ -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.3 +"FABLO_VERSION=2.5.0 FABLO_BUILD= FABLO_REST_VERSION=0.1.2 HYPERLEDGER_EXPLORER_VERSION=2.0.0 diff --git a/e2e/__snapshots__/fablo-config-hlf2-1org-2chaincode-raft-ccaas.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-1org-2chaincode-raft-ccaas.json.test.ts.snap index 8a90bdf2..bc6bf9fc 100644 --- a/e2e/__snapshots__/fablo-config-hlf2-1org-2chaincode-raft-ccaas.json.test.ts.snap +++ b/e2e/__snapshots__/fablo-config-hlf2-1org-2chaincode-raft-ccaas.json.test.ts.snap @@ -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.3/schema.json", + "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.5.0/schema.json", "global": { "fabricVersion": "3.1.0", "tls": true @@ -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.3 +"FABLO_VERSION=2.5.0 FABLO_BUILD= FABLO_REST_VERSION=0.1.2 HYPERLEDGER_EXPLORER_VERSION=2.0.0 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 8d0fda69..6348c350 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 @@ -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.3/schema.json +"$schema": https://github.com/hyperledger-labs/fablo/releases/download/2.5.0/schema.json global: fabricVersion: 2.5.12 tls: false @@ -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.3 +"FABLO_VERSION=2.5.0 FABLO_BUILD= FABLO_REST_VERSION=0.1.2 HYPERLEDGER_EXPLORER_VERSION=2.0.0 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 575d3a9a..96c40e44 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 @@ -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.3/schema.json +"$schema": https://github.com/hyperledger-labs/fablo/releases/download/2.5.0/schema.json global: fabricVersion: 2.5.12 tls: true @@ -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.3 +"FABLO_VERSION=2.5.0 FABLO_BUILD= FABLO_REST_VERSION=0.1.2 HYPERLEDGER_EXPLORER_VERSION=2.0.0 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 a90a9e05..122ded60 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 @@ -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.3/schema.json", + "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.5.0/schema.json", "global": { "fabricVersion": "2.3.2", "tls": true, @@ -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.3 +"FABLO_VERSION=2.5.0 FABLO_BUILD= FABLO_REST_VERSION=0.1.2 HYPERLEDGER_EXPLORER_VERSION=2.0.0 diff --git a/e2e/__snapshots__/fablo-config-hlf3-1orgs-1chaincode.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf3-1orgs-1chaincode.json.test.ts.snap index 2ac2eacd..afe7a6fd 100644 --- a/e2e/__snapshots__/fablo-config-hlf3-1orgs-1chaincode.json.test.ts.snap +++ b/e2e/__snapshots__/fablo-config-hlf3-1orgs-1chaincode.json.test.ts.snap @@ -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.3/schema.json", + "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.5.0/schema.json", "global": { "fabricVersion": "3.1.0", "tls": true, @@ -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.3 +"FABLO_VERSION=2.5.0 FABLO_BUILD= FABLO_REST_VERSION=0.1.2 HYPERLEDGER_EXPLORER_VERSION=2.0.0 diff --git a/e2e/__snapshots__/fablo-config-hlf3-2orgs-1chaincode-raft-ccaas.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf3-2orgs-1chaincode-raft-ccaas.test.ts.snap index 3974d83f..67c79c36 100644 --- a/e2e/__snapshots__/fablo-config-hlf3-2orgs-1chaincode-raft-ccaas.test.ts.snap +++ b/e2e/__snapshots__/fablo-config-hlf3-2orgs-1chaincode-raft-ccaas.test.ts.snap @@ -2,7 +2,7 @@ exports[`samples/fablo-config-hlf3-2orgs-1chaincode-raft-ccaas.json should create proper e2e/__tmp__/samples/fablo-config-hlf3-2orgs-1chaincode-raft-ccaas.json.tmpdir/fablo-target/fablo-config.json from samples/fablo-config-hlf3-2orgs-1chaincode-raft-ccaas.json 1`] = ` "{ - "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.3/schema.json", + "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.5.0/schema.json", "global": { "fabricVersion": "3.1.0", "tls": true @@ -2286,7 +2286,7 @@ fi `; exports[`samples/fablo-config-hlf3-2orgs-1chaincode-raft-ccaas.json should create proper e2e/__tmp__/samples/fablo-config-hlf3-2orgs-1chaincode-raft-ccaas.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf3-2orgs-1chaincode-raft-ccaas.json 1`] = ` -"FABLO_VERSION=2.4.3 +"FABLO_VERSION=2.5.0 FABLO_BUILD= FABLO_REST_VERSION=0.1.2 HYPERLEDGER_EXPLORER_VERSION=2.0.0 diff --git a/e2e/__snapshots__/fablo-config-hlf3-bft-1orgs-1chaincode.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf3-bft-1orgs-1chaincode.json.test.ts.snap index 644cf3a5..70f16d70 100644 --- a/e2e/__snapshots__/fablo-config-hlf3-bft-1orgs-1chaincode.json.test.ts.snap +++ b/e2e/__snapshots__/fablo-config-hlf3-bft-1orgs-1chaincode.json.test.ts.snap @@ -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.3/schema.json", + "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.5.0/schema.json", "global": { "fabricVersion": "3.1.0", "tls": true, @@ -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.3 +"FABLO_VERSION=2.5.0 FABLO_BUILD= FABLO_REST_VERSION=0.1.2 HYPERLEDGER_EXPLORER_VERSION=2.0.0 diff --git a/e2e/__snapshots__/fabloCommands.test.ts.snap b/e2e/__snapshots__/fabloCommands.test.ts.snap index a41d275c..818dd56e 100644 --- a/e2e/__snapshots__/fabloCommands.test.ts.snap +++ b/e2e/__snapshots__/fabloCommands.test.ts.snap @@ -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.3/schema.json", + "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.5.0/schema.json", "global": { "fabricVersion": "3.1.0", "tls": true, @@ -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.3/schema.json", + "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.5.0/schema.json", "global": { "fabricVersion": "3.1.0", "tls": true, @@ -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.3/schema.json", + "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.5.0/schema.json", "global": { "fabricVersion": "3.1.0", "tls": true, diff --git a/e2e/__snapshots__/schema.test.ts.snap b/e2e/__snapshots__/schema.test.ts.snap index a24f9d1d..ffbd6f45 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/2.4.3/schema.json", + "const": "https://github.com/hyperledger-labs/fablo/releases/download/2.5.0/schema.json", }, "chaincodes": { "$id": "#/properties/chaincodes", diff --git a/fablo.sh b/fablo.sh index 80cbef19..c7f86678 100755 --- a/fablo.sh +++ b/fablo.sh @@ -2,7 +2,7 @@ set -e -FABLO_VERSION=2.4.3 +FABLO_VERSION=2.5.0 FABLO_IMAGE_NAME="ghcr.io/fablo-io/fablo" FABLO_IMAGE="$FABLO_IMAGE_NAME:$FABLO_VERSION" diff --git a/package-lock.json b/package-lock.json index be8ae258..4fd70aee 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "generator-fablo", - "version": "2.4.3", + "version": "2.5.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "generator-fablo", - "version": "2.4.3", + "version": "2.5.0", "license": "Apache-2.0", "dependencies": { "chalk": "^4.1.0", diff --git a/package.json b/package.json index 35332799..ccee091f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "generator-fablo", - "version": "2.4.3", + "version": "2.5.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 ae7a5859..55d823c1 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/2.4.3/schema.json", + "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.5.0/schema.json", "global": { "fabricVersion": "2.4.7", "tls": false, diff --git a/samples/fablo-config-hlf2-1org-1chaincode-peer-dev-mode.json b/samples/fablo-config-hlf2-1org-1chaincode-peer-dev-mode.json index 5cf9e4aa..f0c70901 100644 --- a/samples/fablo-config-hlf2-1org-1chaincode-peer-dev-mode.json +++ b/samples/fablo-config-hlf2-1org-1chaincode-peer-dev-mode.json @@ -1,5 +1,5 @@ { - "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.3/schema.json", + "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.5.0/schema.json", "global": { "fabricVersion": "2.5.12", "tls": false, diff --git a/samples/fablo-config-hlf2-1org-1chaincode.json b/samples/fablo-config-hlf2-1org-1chaincode.json index 4170f805..358746b9 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/2.4.3/schema.json", + "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.5.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 6d6e945e..e55e9afe 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/2.4.3/schema.json +"$schema": https://github.com/hyperledger-labs/fablo/releases/download/2.5.0/schema.json global: fabricVersion: 2.5.12 tls: false diff --git a/samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml b/samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml index c0cd9741..b95f4c38 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/2.4.3/schema.json +"$schema": https://github.com/hyperledger-labs/fablo/releases/download/2.5.0/schema.json global: fabricVersion: 2.5.12 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 f544f401..9dcad8a4 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/2.4.3/schema.json", + "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.5.0/schema.json", "global": { "fabricVersion": "2.3.2", "tls": true, diff --git a/samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json b/samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json index 784d5445..b6dd1c9c 100644 --- a/samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json +++ b/samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json @@ -1,5 +1,5 @@ { - "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.3/schema.json", + "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.5.0/schema.json", "global": { "fabricVersion": "3.1.0", "tls": true diff --git a/samples/fablo-config-hlf3-1orgs-1chaincode.json b/samples/fablo-config-hlf3-1orgs-1chaincode.json index c77d5d3f..4d5caf6a 100644 --- a/samples/fablo-config-hlf3-1orgs-1chaincode.json +++ b/samples/fablo-config-hlf3-1orgs-1chaincode.json @@ -1,5 +1,5 @@ { - "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.3/schema.json", + "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.5.0/schema.json", "global": { "fabricVersion": "3.1.0", "tls": true, diff --git a/samples/fablo-config-hlf3-2orgs-1chaincode-raft-ccaas.json b/samples/fablo-config-hlf3-2orgs-1chaincode-raft-ccaas.json index 4a8f5e71..cc0b7f2d 100644 --- a/samples/fablo-config-hlf3-2orgs-1chaincode-raft-ccaas.json +++ b/samples/fablo-config-hlf3-2orgs-1chaincode-raft-ccaas.json @@ -1,5 +1,5 @@ { - "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.3/schema.json", + "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.5.0/schema.json", "global": { "fabricVersion": "3.1.0", "tls": true diff --git a/samples/fablo-config-hlf3-bft-1orgs-1chaincode.json b/samples/fablo-config-hlf3-bft-1orgs-1chaincode.json index 00559d68..45cb625f 100644 --- a/samples/fablo-config-hlf3-bft-1orgs-1chaincode.json +++ b/samples/fablo-config-hlf3-bft-1orgs-1chaincode.json @@ -1,5 +1,5 @@ { - "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.3/schema.json", + "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.5.0/schema.json", "global": { "fabricVersion": "3.1.0", "tls": true, diff --git a/samples/java-dev-mode-sample.json b/samples/java-dev-mode-sample.json index 9305f0d8..c4b9add0 100644 --- a/samples/java-dev-mode-sample.json +++ b/samples/java-dev-mode-sample.json @@ -1,5 +1,5 @@ { - "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.3/schema.json", + "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.5.0/schema.json", "global": { "fabricVersion": "2.4.3", "tls": false,