From 0ebd06f8af7afa6e136832350537634a8cee890f Mon Sep 17 00:00:00 2001 From: Jakub Dzikowski Date: Wed, 8 Jan 2025 14:05:23 +0100 Subject: [PATCH 1/4] Set Fablo 2.1.0 Signed-off-by: Jakub Dzikowski --- chain-cli/package.json | 2 +- package-lock.json | 25 +++++++++++++++++-------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/chain-cli/package.json b/chain-cli/package.json index ade1d284bb..9d459742ad 100644 --- a/chain-cli/package.json +++ b/chain-cli/package.json @@ -20,7 +20,7 @@ "@oclif/plugin-help": "^3", "axios": "^1.6.0", "dotenv": "16.3.1", - "fablo": "2.0.0", + "fablo": "2.1.0", "nanoid": "^3.3.6", "tslib": "^2.6.2" }, diff --git a/package-lock.json b/package-lock.json index 96dca08807..5e7149551a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -102,7 +102,7 @@ "@oclif/plugin-help": "^3", "axios": "^1.6.0", "dotenv": "16.3.1", - "fablo": "2.0.0", + "fablo": "2.1.0", "nanoid": "^3.3.6", "tslib": "^2.6.2" }, @@ -8402,7 +8402,9 @@ "license": "MIT" }, "node_modules/cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "license": "MIT", "dependencies": { "path-key": "^3.1.0", @@ -9097,7 +9099,9 @@ "license": "ISC" }, "node_modules/elliptic": { - "version": "6.5.7", + "version": "6.6.1", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.6.1.tgz", + "integrity": "sha512-RaddvvMatK2LJHqFJ+YA4WysVN5Ita9E35botqIYspQ4TkRAlCicdzKOjlyv/1Za5RyTNn7di//eEV0uTAfe3g==", "license": "MIT", "dependencies": { "bn.js": "^4.11.9", @@ -10224,7 +10228,9 @@ } }, "node_modules/eslint-prettier-config/node_modules/eslint/node_modules/cross-spawn": { - "version": "6.0.5", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.6.tgz", + "integrity": "sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==", "dev": true, "license": "MIT", "dependencies": { @@ -10977,9 +10983,10 @@ } }, "node_modules/fablo": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fablo/-/fablo-2.0.0.tgz", - "integrity": "sha512-VedT2BGY8OEAW9ESkf0TjC4Dp8pDcpflqLhtXHmJ1RWcGJwA62em86RKmY2ea+uBMnOY3zlXVJ3ei3BWCrfYHw==" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fablo/-/fablo-2.1.0.tgz", + "integrity": "sha512-D43AbnApTiVi/DTHrrcKSmcqcninjiwfpioTFgFBEDWSA0A8bHolcGsp2uU5plB5SN1LzNVnXAHBGgyafg6pgg==", + "license": "Apache-2.0" }, "node_modules/fabric-ca-client": { "version": "2.2.20", @@ -14180,7 +14187,9 @@ } }, "node_modules/nanoid": { - "version": "3.3.7", + "version": "3.3.8", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz", + "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==", "funding": [ { "type": "github", From 5cecbca0b17e2547b11c81843ed57442a1049544 Mon Sep 17 00:00:00 2001 From: Jakub Dzikowski Date: Wed, 8 Jan 2025 14:08:57 +0100 Subject: [PATCH 2/4] Update relevant Fablo configs and use BFT Signed-off-by: Jakub Dzikowski --- chain-cli/network/fablo-config-default.json | 8 ++++---- chain-cli/network/fablo-config-dev-mode.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/chain-cli/network/fablo-config-default.json b/chain-cli/network/fablo-config-default.json index fdb9065bb3..5aa662968c 100644 --- a/chain-cli/network/fablo-config-default.json +++ b/chain-cli/network/fablo-config-default.json @@ -1,7 +1,7 @@ { - "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json", + "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json", "global": { - "fabricVersion": "2.5.10", + "fabricVersion": "3.0.0-beta", "tls": true, "monitoring": { "loglevel": "info" @@ -17,8 +17,8 @@ "orderers": [ { "groupName": "group1", - "type": "raft", - "instances": 1 + "type": "BFT", + "instances": 3 } ] }, diff --git a/chain-cli/network/fablo-config-dev-mode.json b/chain-cli/network/fablo-config-dev-mode.json index 9bc088e6d1..bd35bbe626 100644 --- a/chain-cli/network/fablo-config-dev-mode.json +++ b/chain-cli/network/fablo-config-dev-mode.json @@ -1,5 +1,5 @@ { - "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json", + "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json", "global": { "fabricVersion": "2.5.10", "tls": false, From 2cdee1c3a2280ad4307add45d3262ae538af1ea4 Mon Sep 17 00:00:00 2001 From: Jakub Dzikowski Date: Wed, 8 Jan 2025 14:12:24 +0100 Subject: [PATCH 3/4] Update Fablo version Signed-off-by: Jakub Dzikowski --- .github/workflows/test-on-push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-on-push.yml b/.github/workflows/test-on-push.yml index 7384a79955..af604999e0 100644 --- a/.github/workflows/test-on-push.yml +++ b/.github/workflows/test-on-push.yml @@ -42,7 +42,7 @@ jobs: - name: Prefetch Fabric Docker layers run: | cd chain-cli/network - curl -Lf https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/fablo.sh -o ./fablo && chmod +x ./fablo + curl -Lf https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/fablo.sh -o ./fablo && chmod +x ./fablo ./fablo generate fablo-config-default.json docker compose -f fablo-target/fabric-docker/docker-compose.yaml pull From e1193aa8670a7f9901cb89e8af29952d00a593b0 Mon Sep 17 00:00:00 2001 From: Jakub Dzikowski Date: Wed, 8 Jan 2025 14:44:23 +0100 Subject: [PATCH 4/4] Fix Fablo version Signed-off-by: Jakub Dzikowski --- chain-cli/package.json | 2 +- package-lock.json | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/chain-cli/package.json b/chain-cli/package.json index 9d459742ad..48d2eee94a 100644 --- a/chain-cli/package.json +++ b/chain-cli/package.json @@ -20,7 +20,7 @@ "@oclif/plugin-help": "^3", "axios": "^1.6.0", "dotenv": "16.3.1", - "fablo": "2.1.0", + "fablo": "2.1.1", "nanoid": "^3.3.6", "tslib": "^2.6.2" }, diff --git a/package-lock.json b/package-lock.json index 5e7149551a..a93f7a1290 100644 --- a/package-lock.json +++ b/package-lock.json @@ -102,7 +102,7 @@ "@oclif/plugin-help": "^3", "axios": "^1.6.0", "dotenv": "16.3.1", - "fablo": "2.1.0", + "fablo": "2.1.1", "nanoid": "^3.3.6", "tslib": "^2.6.2" }, @@ -10983,9 +10983,9 @@ } }, "node_modules/fablo": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fablo/-/fablo-2.1.0.tgz", - "integrity": "sha512-D43AbnApTiVi/DTHrrcKSmcqcninjiwfpioTFgFBEDWSA0A8bHolcGsp2uU5plB5SN1LzNVnXAHBGgyafg6pgg==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/fablo/-/fablo-2.1.1.tgz", + "integrity": "sha512-HxaiYXDh0TEgOVIOJ1JgUr+PVHVQcyj8z0dnIIdbrHED1DkV3DKaOjw2fx6x4epY/6V1LI2CFgSVj6m5BRLnEQ==", "license": "Apache-2.0" }, "node_modules/fabric-ca-client": {