Skip to content

Commit d981ac3

Browse files
OsamaRab3OsamaRab3
committed
Merge branch 'main' into 561-CaDB
2 parents fbe7c49 + d91902b commit d981ac3

File tree

52 files changed

+3286
-1117
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+3286
-1117
lines changed

‎.github/workflows/release-on-tag.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
5252
- name: Create next development version PR
5353
run: |
54-
sh ./bump_version.sh unstable
54+
sh ./bump-version.sh unstable
5555
NEW_VERSION=$(jq -r '.version' <"$GITHUB_WORKSPACE/package.json")
5656
BRANCH_NAME="bump-version-to-$NEW_VERSION"
5757
git checkout -b $BRANCH_NAME

‎.github/workflows/test-on-push.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ jobs:
2121
./fablo-build.sh
2222
2323
- name: Test simple network
24-
run: e2e-network/docker/test-01-v2-simple.sh
24+
run: e2e-network/docker/test-01-v3-simple.sh
2525

2626
- uses: actions/upload-artifact@v4
2727
if: always()
2828
with:
2929
name: test-main
3030
path: |
31-
e2e-network/docker/test-01-v2-simple.sh.logs/*
32-
e2e-network/docker/test-01-v2-simple.sh.tmpdir/fablo-target/**/*
31+
e2e-network/docker/test-01-v3-simple.sh.logs/*
32+
e2e-network/docker/test-01-v3-simple.sh.tmpdir/fablo-target/**/*
3333
3434
- name: Test generators
3535
run: |

‎CHANGELOG.md‎

Lines changed: 93 additions & 131 deletions
Large diffs are not rendered by default.

‎README.md‎

Lines changed: 193 additions & 146 deletions
Large diffs are not rendered by default.

‎SUPPORTED_FEATURES.md‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,62 +7,64 @@ This document provides an overview of Fablo features. The table below tracks fea
77
| Feature | Fabric v2 | Fabric v3 | Documented | CI tests | Relevant issues |
88
|----------------------------------------|-----------|-----------|------------|----------|-----------------|
99
| <br>**NETWORK CONFIGURATION** | | | | | |
10+
| BFT Consensus | - | ✓ | ✓ | [01_v3](/e2e-network/docker/test-01-v3-simple.sh), [06_v3](/e2e-network/docker/test-06-v3-bft.sh) | |
1011
| RAFT Consensus | ✓ | ✓ | ✓ | [02_v2](/e2e-network/docker/test-02-v2-raft-2orgs.sh) | |
11-
| SOLO Consensus | ✓ | - | ✓ | [07_v2](/e2e-network/docker/test-07-v2-peer-dev-mode.sh) | |
12-
| BFT Consensus | - | ✓ | ✓ | [06_v3](/e2e-network/docker/test-06-v3-bft.sh) | [#559](https://github.com/hyperledger-labs/fablo/issues/559) |
13-
| TLS | ✓ | ✓ | ✓ | [02_v2](/e2e-network/docker/test-02-v2-raft-2orgs.sh), [05_v3](/e2e-network/docker/test-05-v3.sh), [06_v3](/e2e-network/docker/test-06-v3-bft.sh) | |
12+
| SOLO Consensus | ✓ | - | ✓ | [03_v2](/e2e-network/docker/test-03-v2-private-data.sh), [07_v2](/e2e-network/docker/test-07-v2-peer-dev-mode.sh) | |
13+
| TLS | ✓ | ✓ | ✓ | [01_v3](/e2e-network/docker/test-01-v3-simple.sh), [02_v2](/e2e-network/docker/test-02-v2-raft-2orgs.sh), [05_v3](/e2e-network/docker/test-05-v3.sh), [06_v3](/e2e-network/docker/test-06-v3-bft.sh) | |
1414
| Orderer Groups | ✕ | ✕ | ✕ | [02_v2](/e2e-network/docker/test-02-v2-raft-2orgs.sh) | [#560](https://github.com/hyperledger-labs/fablo/issues/560) |
15-
| Peer DB - LevelDB | ✓ | ✓ | ✓ | [01_v2](/e2e-network/docker/test-01-v2-simple.sh), [05_v3](/e2e-network/docker/test-05-v3.sh), [06_v3](/e2e-network/docker/test-06-v3-bft.sh) | |
15+
| Peer dev mode | ✓ (no TLS) | ✕ . | ✓ | [07_v2](/e2e-network/docker/test-07-v2-peer-dev-mode.sh) | |
16+
| 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) | |
1617
| Peer DB - CouchDB | ✓ | ✓ | ✓ | [04_v3](/e2e-network/docker/test-04-v3-snapshot-ccaas.sh) | |
17-
| CA DB - SQLite | ✓ | ✓ | ✓ | [01_v2](/e2e-network/docker/test-01-v2-simple.sh), [05_v3](/e2e-network/docker/test-05-v3.sh), [06_v3](/e2e-network/docker/test-06-v3-bft.sh) | |
18+
| 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) | |
1819
| CA DB - Postgres | ✓ | ✓ | ✓ | [04_v3](/e2e-network/docker/test-04-v3-snapshot-ccaas.sh) | |
1920
| CA DB - MySQL | ✕ | ✕ | ✓ | | [#561](https://github.com/hyperledger-labs/fablo/issues/561) |
2021
| <br>**CHANNELS** | | | | | |
21-
| Channel query scripts | ✓ | ✓ | | [01_v2](/e2e-network/docker/test-01-v2-simple.sh), [05_v3](/e2e-network/docker/test-05-v3.sh), [06_v3](/e2e-network/docker/test-06-v3-bft.sh) | |
22+
| 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) | |
2223
| <br>**CHAINCODES** | | | | | |
23-
| Node | ✓ | ✓ | | [01_v2](/e2e-network/docker/test-01-v2-simple.sh), [02_v2](/e2e-network/docker/test-02-v2-raft-2orgs.sh), [05_v3](/e2e-network/docker/test-05-v3.sh), [06_v3](/e2e-network/docker/test-06-v3-bft.sh) | |
24+
| Node | ✓ | ✓ | | [01_v3](/e2e-network/docker/test-01-v3-simple.sh), [02_v2](/e2e-network/docker/test-02-v2-raft-2orgs.sh), [05_v3](/e2e-network/docker/test-05-v3.sh), [06_v3](/e2e-network/docker/test-06-v3-bft.sh) | |
2425
| Go | ✓ | ✓ | | | |
2526
| Java | ✓ | ✓ | | [02_v2](/e2e-network/docker/test-02-v2-raft-2orgs.sh) | |
2627
| Chaincode-as-a-Service (CCaaS) | ✓ | ✓ | | [04_v3](/e2e-network/docker/test-04-v3-snapshot-ccaas.sh) | |
28+
| CCaaS hot reload | ✓ | ✓ | | [01_v3](/e2e-network/docker/test-01-v3-simple.sh) | |
2729
| Endorsement Policies | ✓ | ✓ | | [03_v2](/e2e-network/docker/test-03-v2-private-data.sh), [02_v2](/e2e-network/docker/test-02-v2-raft-2orgs.sh) | |
2830
| Multi-org Endorsements | ✓ | ✓ | | [03_v2](/e2e-network/docker/test-03-v2-private-data.sh) | |
2931
| Private Data Collections | ✓ | ✓ | | [03_v2](/e2e-network/docker/test-03-v2-private-data.sh) | |
30-
| Chaincode scripts (list/query/invoke) | ✓ | ✓ | | [01_v2](/e2e-network/docker/test-01-v2-simple.sh), [02_v2](/e2e-network/docker/test-02-v2-raft-2orgs.sh), [03_v2](/e2e-network/docker/test-03-v2-private-data.sh), [04_v2](/e2e-network/docker/test-04-v2-snapshot.sh), [05_v3](/e2e-network/docker/test-05-v3.sh), [06_v3](/e2e-network/docker/test-06-v3-bft.sh) | |
32+
| Chaincode scripts (list/query/invoke) | ✓ | ✓ | | [01_v3](/e2e-network/docker/test-01-v3-simple.sh), [02_v2](/e2e-network/docker/test-02-v2-raft-2orgs.sh), [03_v2](/e2e-network/docker/test-03-v2-private-data.sh), [04_v2](/e2e-network/docker/test-04-v2-snapshot.sh), [05_v3](/e2e-network/docker/test-05-v3.sh), [06_v3](/e2e-network/docker/test-06-v3-bft.sh) | |
3133
| Commands: install / upgrade | ✓ | ✓ | | [02_v2](/e2e-network/docker/test-02-v2-raft-2orgs.sh) | |
3234
| <br>**TOOLS** | | | | | |
3335
| Fablo REST | ✓ | ✓ | | [02_v2](/e2e-network/docker/test-02-v2-raft-2orgs.sh), [04_v3](/e2e-network/docker/test-04-v3-snapshot-ccaas.sh) | |
3436
| Explorer | ✓ | ✕ | | [02_v2](/e2e-network/docker/test-02-v2-raft-2orgs.sh) | |
3537
| <br>**FABLO COMMANDS** | | | | | |
36-
| `generate` | ✓ | ✓ | ✓ | [01_v2](/e2e-network/docker/test-01-v2-simple.sh), [02_v2](/e2e-network/docker/test-02-v2-raft-2orgs.sh), [05_v3](/e2e-network/docker/test-05-v3.sh), [06_v3](/e2e-network/docker/test-06-v3-bft.sh) | |
37-
| `up` | ✓ | ✓ | ✓ | [01_v2](/e2e-network/docker/test-01-v2-simple.sh), [02_v2](/e2e-network/docker/test-02-v2-raft-2orgs.sh), [05_v3](/e2e-network/docker/test-05-v3.sh), [06_v3](/e2e-network/docker/test-06-v3-bft.sh) | |
38+
| `generate` | ✓ | ✓ | ✓ | [01_v3](/e2e-network/docker/test-01-v3-simple.sh), [02_v2](/e2e-network/docker/test-02-v2-raft-2orgs.sh), [05_v3](/e2e-network/docker/test-05-v3.sh), [06_v3](/e2e-network/docker/test-06-v3-bft.sh) | |
39+
| `up` | ✓ | ✓ | ✓ | [01_v3](/e2e-network/docker/test-01-v3-simple.sh), [02_v2](/e2e-network/docker/test-02-v2-raft-2orgs.sh), [05_v3](/e2e-network/docker/test-05-v3.sh), [06_v3](/e2e-network/docker/test-06-v3-bft.sh) | |
3840
| `start`, `stop`, `restart` | ✓ | ✓ | ✓ | [02_v2](/e2e-network/docker/test-02-v2-raft-2orgs.sh) | |
39-
| `down`, `reset` | ✓ | ✓ | ✓ | [01_v2](/e2e-network/docker/test-01-v2-simple.sh), [02_v2](/e2e-network/docker/test-02-v2-raft-2orgs.sh), [05_v3](/e2e-network/docker/test-05-v3.sh), [06_v3](/e2e-network/docker/test-06-v3-bft.sh) | |
41+
| `down`, `reset` | ✓ | ✓ | ✓ | [01_v3](/e2e-network/docker/test-01-v3-simple.sh), [02_v2](/e2e-network/docker/test-02-v2-raft-2orgs.sh), [05_v3](/e2e-network/docker/test-05-v3.sh), [06_v3](/e2e-network/docker/test-06-v3-bft.sh) | |
4042
| `prune`, `recreate` | ✓ | ✓ | ✓ | [04_v3](/e2e-network/docker/test-04-v3-snapshot-ccaas.sh) | |
4143
| `validate`, `extend-config` | ✓ | ✓ | ✓ | [e2e](/e2e/fabloCommands.test.ts) | |
4244
| `version` | ✓ | ✓ | ✓ | [e2e](/e2e/fabloCommands.test.ts) | |
43-
| `init` (node, rest, dev) | ✓ | ✓ | ✓ | [01_v2](/e2e-network/docker/test-01-v2-simple.sh), [05_v3](/e2e-network/docker/test-05-v3.sh), [06_v3](/e2e-network/docker/test-06-v3-bft.sh) | |
45+
| `init` (node, rest, dev) | ✓ | ✓ | ✓ | [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) | |
4446
| `export-network-topology` to Mermaid | ✓ | ✓ | ✓ | | [#579](https://github.com/hyperledger-labs/fablo/pull/579) |
4547
| Other `init` options | | | | | [#444](https://github.com/hyperledger-labs/fablo/issues/444) |
4648
| <br>**SNAPSHOT** | | | | | |
4749
| Create snapshot | ✓ | ✓ | ✓ | [04_v3](/e2e-network/docker/test-04-v3-snapshot-ccaas.sh) | |
4850
| Restore snapshot | ✓ | ✓ | ✓ | [04_v3](/e2e-network/docker/test-04-v3-snapshot-ccaas.sh) | |
49-
| Post-start hook | | | | | [#111](https://github.com/hyperledger-labs/fablo/issues/111) |
5051
| <br>**OTHER FEATURES** | | | | | |
5152
| Peer dev mode | ✓ | ✕ | ✓ | [07_v2](/e2e-network/docker/test-07-v2-peer-dev-mode.sh) | [#472](https://github.com/hyperledger-labs/fablo/issues/472) |
5253
| Connection profiles | ✓ | ✓ | ✓ | [e2e_snap](/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap) | |
5354
| Gateway client | | | | [05__v3](/e2e-network/docker/test-05-v3.sh) | [#544](https://github.com/hyperledger-labs/fablo/pull/544) |
54-
| Hooks: post-generate | ✓ | ✓ | ✓ | | [#580](https://github.com/hyperledger-labs/fablo/pull/580) |
55+
| Hooks: post-generate | ✓ | ✓ | ✓ | [02_v2](/e2e-network/docker/test-02-v2-raft-2orgs.sh) | [#580](https://github.com/hyperledger-labs/fablo/pull/580) |
56+
| Hooks: post-start | ✓ | ✓ | ✓ | [02_v2](/e2e-network/docker/test-02-v2-raft-2orgs.sh) | [#111](https://github.com/hyperledger-labs/fablo/issues/111) |
5557
| JSON/YAML support | ✓ | ✓ | ✓ | | |
5658

5759
---
5860

5961
**Supported Fabric versions:**
6062

6163
Fabric v2 = 2.5.12<br>
62-
Fabric v3 = 3.0.0
64+
Fabric v3 = 3.1.0
6365

6466
**Legend:**
6567

6668
✓ = supported<br>
6769
✕ = not supported<br>
68-
<span>-</span> = not applicable
70+
<span>-</span> = not applicable

‎docs/sample.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.3.0/schema.json",
2+
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.2/schema.json",
33
"global": {
44
"fabricVersion": "2.3.2",
55
"tls": false,

‎docs/schema.json‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
],
1313
"properties": {
1414
"$schema": {
15-
"const": "https://github.com/hyperledger-labs/fablo/releases/download/2.3.0/schema.json"
15+
"const": "https://github.com/hyperledger-labs/fablo/releases/download/2.4.2/schema.json"
1616
},
1717
"global": {
1818
"$id": "#/properties/global",
@@ -554,6 +554,12 @@
554554
"title": "Post generate hook",
555555
"description": "Operation to run run after a network config is generated",
556556
"type": "string"
557+
},
558+
"postStart": {
559+
"$id": "#/properties/hooks/postStart",
560+
"title": "Post start hook",
561+
"description": "Operation to run after the network is started (after 'up' or 'start')",
562+
"type": "string"
557563
}
558564
}
559565
}

0 commit comments

Comments
 (0)