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
24 changes: 12 additions & 12 deletions .github/workflows/test-on-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ jobs:
uses: rtCamp/action-slack-notify@v2
env:
SLACK_USERNAME: Fablo CI
SLACK_ICON: 'https://raw.githubusercontent.com/softwaremill/fablo/main/logo-sygnet-192.png'
SLACK_ICON: 'https://raw.githubusercontent.com/hyperledger-labs/fablo/main/logo-sygnet-192.png'
SLACK_COLOR: '#ffd963'
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
MSG_MINIMAL: ref
SLACK_FOOTER: 'Workflow <https://github.com/softwaremill/fablo/commit/${{ github.sha }}/checks|*${{ github.workflow }}*> started'
SLACK_FOOTER: 'Workflow <https://github.com/hyperledger-labs/fablo/commit/${{ github.sha }}/checks|*${{ github.workflow }}*> started'

- name: Check out repository code
uses: actions/checkout@v2
Expand Down Expand Up @@ -55,11 +55,11 @@ jobs:
uses: rtCamp/action-slack-notify@v2
env:
SLACK_USERNAME: Fablo CI
SLACK_ICON: 'https://raw.githubusercontent.com/softwaremill/fablo/main/logo-sygnet-192.png'
SLACK_ICON: 'https://raw.githubusercontent.com/hyperledger-labs/fablo/main/logo-sygnet-192.png'
SLACK_COLOR: ${{ job.status }} # or a specific color like 'green' or '#ff00ff'
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
MSG_MINIMAL: ref
SLACK_FOOTER: 'Job <https://github.com/softwaremill/fablo/commit/${{ github.sha }}/checks|*${{ github.workflow }}/${{ github.job }}*> ended with status: *${{ job.status }}*'
SLACK_FOOTER: 'Job <https://github.com/hyperledger-labs/fablo/commit/${{ github.sha }}/checks|*${{ github.workflow }}/${{ github.job }}*> ended with status: *${{ job.status }}*'

test-02-raft:
needs: test-main
Expand Down Expand Up @@ -91,11 +91,11 @@ jobs:
uses: rtCamp/action-slack-notify@v2
env:
SLACK_USERNAME: Fablo CI
SLACK_ICON: 'https://raw.githubusercontent.com/softwaremill/fablo/main/logo-sygnet-192.png'
SLACK_ICON: 'https://raw.githubusercontent.com/hyperledger-labs/fablo/main/logo-sygnet-192.png'
SLACK_COLOR: ${{ job.status }} # or a specific color like 'green' or '#ff00ff'
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
MSG_MINIMAL: ref
SLACK_FOOTER: 'Job <https://github.com/softwaremill/fablo/commit/${{ github.sha }}/checks|*${{ github.workflow }}/${{ github.job }}*> ended with status: *${{ job.status }}*'
SLACK_FOOTER: 'Job <https://github.com/hyperledger-labs/fablo/commit/${{ github.sha }}/checks|*${{ github.workflow }}/${{ github.job }}*> ended with status: *${{ job.status }}*'

test-03-private-data:
needs: test-main
Expand Down Expand Up @@ -127,11 +127,11 @@ jobs:
uses: rtCamp/action-slack-notify@v2
env:
SLACK_USERNAME: Fablo CI
SLACK_ICON: 'https://raw.githubusercontent.com/softwaremill/fablo/main/logo-sygnet-192.png'
SLACK_ICON: 'https://raw.githubusercontent.com/hyperledger-labs/fablo/main/logo-sygnet-192.png'
SLACK_COLOR: ${{ job.status }} # or a specific color like 'green' or '#ff00ff'
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
MSG_MINIMAL: ref
SLACK_FOOTER: 'Job <https://github.com/softwaremill/fablo/commit/${{ github.sha }}/checks|*${{ github.workflow }}/${{ github.job }}*> ended with status: *${{ job.status }}*'
SLACK_FOOTER: 'Job <https://github.com/hyperledger-labs/fablo/commit/${{ github.sha }}/checks|*${{ github.workflow }}/${{ github.job }}*> ended with status: *${{ job.status }}*'

test-04-snapshot:
needs: test-main
Expand Down Expand Up @@ -163,11 +163,11 @@ jobs:
uses: rtCamp/action-slack-notify@v2
env:
SLACK_USERNAME: Fablo CI
SLACK_ICON: 'https://raw.githubusercontent.com/softwaremill/fablo/main/logo-sygnet-192.png'
SLACK_ICON: 'https://raw.githubusercontent.com/hyperledger-labs/fablo/main/logo-sygnet-192.png'
SLACK_COLOR: ${{ job.status }} # or a specific color like 'green' or '#ff00ff'
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
MSG_MINIMAL: ref
SLACK_FOOTER: 'Job <https://github.com/softwaremill/fablo/commit/${{ github.sha }}/checks|*${{ github.workflow }}/${{ github.job }}*> ended with status: *${{ job.status }}*'
SLACK_FOOTER: 'Job <https://github.com/hyperledger-labs/fablo/commit/${{ github.sha }}/checks|*${{ github.workflow }}/${{ github.job }}*> ended with status: *${{ job.status }}*'

node-chaincodes-unit-tests:
needs: test-main
Expand Down Expand Up @@ -195,8 +195,8 @@ jobs:
uses: rtCamp/action-slack-notify@v2
env:
SLACK_USERNAME: Fablo CI
SLACK_ICON: 'https://raw.githubusercontent.com/softwaremill/fablo/main/logo-sygnet-192.png'
SLACK_ICON: 'https://raw.githubusercontent.com/hyperledger-labs/fablo/main/logo-sygnet-192.png'
SLACK_COLOR: ${{ job.status }} # or a specific color like 'green' or '#ff00ff'
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
MSG_MINIMAL: ref
SLACK_FOOTER: 'Job <https://github.com/softwaremill/fablo/commit/${{ github.sha }}/checks|*${{ github.workflow }}/${{ github.job }}*> ended with status: *${{ job.status }}*'
SLACK_FOOTER: 'Job <https://github.com/hyperledger-labs/fablo/commit/${{ github.sha }}/checks|*${{ github.workflow }}/${{ github.job }}*> ended with status: *${{ job.status }}*'
52 changes: 27 additions & 25 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## 1.1.0-unstable
## 1.1.0

### Features
* Support Fabric Gateway since Fabric 2.4 [#305](https://github.com/hyperledger-labs/fablo/issues/305)
Expand All @@ -12,10 +12,12 @@
### Fixes
* Support Apple M1 / arm64 architecture
* Various fixes in channel scripts
* Remove remaining docker containers and images after prune

### Chore & Maintenance
* Add `fabricNodeenvVersion` global configuration
* Update Node.js runtime compatibility ([details](https://github.com/hyperledger-labs/fablo/issues/274))
* Update legacy URLs

## 1.0.2

Expand Down Expand Up @@ -47,29 +49,29 @@
* Add [Fablo REST](https://github.com/softwaremill/fablo-rest/) support
* By default all peers are anchor peers
* Support `postGenerate` hook
* Added support for [Orderer sharding](https://github.com/softwaremill/fablo/issues/220) (multiple orderer groups).
* Support for [Orderer groups](https://github.com/softwaremill/fablo/issues/238) (orderer group can be spread between many orgs).
* Added support for [Orderer sharding](https://github.com/hyperledger-labs/fablo/issues/220) (multiple orderer groups).
* Support for [Orderer groups](https://github.com/hyperledger-labs/fablo/issues/238) (orderer group can be spread between many orgs).

### Fixes
* Fixed issue with bad `requiredPeerCount` in private data collection
* Fixed issues with `fablo up` on older bash versions ([details](https://github.com/softwaremill/fablo/issues/210))
* Fixed issues with `fablo up` on older bash versions ([details](https://github.com/hyperledger-labs/fablo/issues/210))

### Chore & Maintenance

## 0.2.0
* Rename Fabrica to Fablo

## 0.1.1
* Broken Node.js chaincode build ([#211](https://github.com/softwaremill/fablo/pull/211))
* Broken Node.js chaincode build ([#211](https://github.com/hyperledger-labs/fablo/pull/211))

## 0.1.0

### Features
* Support for private data ([#104](https://github.com/softwaremill/fablo/issues/104))
* Added channel query scripts ([#169](https://github.com/softwaremill/fablo/issues/169))
* Support for Hyperledger Fabric 2.x ([#132](https://github.com/softwaremill/fablo/issues/132)
, [#178](https://github.com/softwaremill/fablo/issues/178), [#190](https://github.com/softwaremill/fablo/issues/178))
* Support default endorsement policy ([#189](https://github.com/softwaremill/fablo/issues/189))
* Support for private data ([#104](https://github.com/hyperledger-labs/fablo/issues/104))
* Added channel query scripts ([#169](https://github.com/hyperledger-labs/fablo/issues/169))
* Support for Hyperledger Fabric 2.x ([#132](https://github.com/hyperledger-labs/fablo/issues/132)
, [#178](https://github.com/hyperledger-labs/fablo/issues/178), [#190](https://github.com/hyperledger-labs/fablo/issues/178))
* Support default endorsement policy ([#189](https://github.com/hyperledger-labs/fablo/issues/189))
* Support for fablo config in YAML format

### Chore & Maintenance
Expand All @@ -82,26 +84,26 @@
* Generate simple Hyperledger Fabric network
* Support for multiple organizations
* Support for solo consensus protocol
* Support for RAFT consensus protocol ([#16](https://github.com/softwaremill/fablo/issues/16)
, [#38](https://github.com/softwaremill/fablo/issues/38))
* Support for RAFT consensus protocol ([#16](https://github.com/hyperledger-labs/fablo/issues/16)
, [#38](https://github.com/hyperledger-labs/fablo/issues/38))
* Validation of `fablo-config.json` based on JSON schema and other rules
* Allow to upgrade chaincode ([#45](https://github.com/softwaremill/fablo/issues/36))
* Network recreation in one step ([#105](https://github.com/softwaremill/fablo/issues/105))
* Init command to provide simple config ([#90](https://github.com/softwaremill/fablo/issues/90)) with
chaincode ([#100](https://github.com/softwaremill/fablo/issues/100))
* Allow to upgrade chaincode ([#45](https://github.com/hyperledger-labs/fablo/issues/36))
* Network recreation in one step ([#105](https://github.com/hyperledger-labs/fablo/issues/105))
* Init command to provide simple config ([#90](https://github.com/hyperledger-labs/fablo/issues/90)) with
chaincode ([#100](https://github.com/hyperledger-labs/fablo/issues/100))
* Proper exposing Orderer and Peers ports for service
discovery ([#116](https://github.com/softwaremill/fablo/issues/116))
discovery ([#116](https://github.com/hyperledger-labs/fablo/issues/116))

### Fixes
* Missing notify anchor peers step ([#26](https://github.com/softwaremill/fablo/issues/26))
* Missing notify anchor peers step ([#26](https://github.com/hyperledger-labs/fablo/issues/26))

### Chore & Maintenance
* Lint bash and YAML files ([#48](https://github.com/softwaremill/fablo/issues/48))
* Format generated scripts and YAML files ([#75](https://github.com/softwaremill/fablo/issues/75))
* Test Java chaincode on generated network ([#25](https://github.com/softwaremill/fablo/issues/25))
* Test JS chaincode on generated network ([#46](https://github.com/softwaremill/fablo/issues/46))
* Test generated Hyperledger Fabric networks ([#36](https://github.com/softwaremill/fablo/issues/36))
* Test generators with simple snapshot tests ([#5](https://github.com/softwaremill/fablo/issues/5))
* Lint JS files ([#1](https://github.com/softwaremill/fablo/issues/1))
* Lint bash and YAML files ([#48](https://github.com/hyperledger-labs/fablo/issues/48))
* Format generated scripts and YAML files ([#75](https://github.com/hyperledger-labs/fablo/issues/75))
* Test Java chaincode on generated network ([#25](https://github.com/hyperledger-labs/fablo/issues/25))
* Test JS chaincode on generated network ([#46](https://github.com/hyperledger-labs/fablo/issues/46))
* Test generated Hyperledger Fabric networks ([#36](https://github.com/hyperledger-labs/fablo/issues/36))
* Test generators with simple snapshot tests ([#5](https://github.com/hyperledger-labs/fablo/issues/5))
* Lint JS files ([#1](https://github.com/hyperledger-labs/fablo/issues/1))
* Run Yeoman generators inside Docker container

4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -557,4 +557,6 @@ Provide for your organization `"tools": { "explorer": true }`, if you want to us

## Testimonials

Fablo was originally created at [SoftwareMill](https://softwaremill.com).
Fablo was originally created at [SoftwareMill](https://softwaremill.com) by [@Hejwo](https://github.com/Hejwo/) and [@dzikowski](https://github.com/dzikowski/).
In December 2021, Fablo joined [Hyperledger Labs](https://labs.hyperledger.org/).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

4 changes: 2 additions & 2 deletions docs/index.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<html>
<head>
<meta http-equiv="refresh" content="0;url=https://github.com/softwaremill/fablo" />
<meta http-equiv="refresh" content="0;url=https://github.com/hyperledger-labs/fablo" />
<title>Redirecting to main repo page</title>
</head>
<body>
<p>Redirecting to <a href="https://github.com/softwaremill/fablo">https://github.com/softwaremill/fablo</a>...</p>
<p>Redirecting to <a href="https://github.com/hyperledger-labs/fablo">https://github.com/hyperledger-labs/fablo</a>...</p>
</body>
</html>
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/softwaremill/fablo/releases/download/1.1.0-unstable/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.1.0/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/softwaremill/fablo/releases/download/1.1.0-unstable/schema.json"
"const": "https://github.com/hyperledger-labs/fablo/releases/download/1.1.0/schema.json"
},
"global": {
"$id": "#/properties/global",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2038,7 +2038,7 @@ networkUp() {
installChannels
installChaincodes
notifyOrgsAboutChannels
printHeadline \\"Done! Enjoy your fresh network\\" \\"U1F984\\"
printStartSuccessInfo
}

if [ \\"$1\\" = \\"up\\" ]; then
Expand Down Expand Up @@ -2081,7 +2081,7 @@ fi
`;

exports[`samples/fablo-config-hlf1.3-2orgs-1chaincode-private-data.json should create proper e2e/__tmp__/samples/fablo-config-hlf1.3-2orgs-1chaincode-private-data.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf1.3-2orgs-1chaincode-private-data.json 1`] = `
"FABLO_VERSION=1.1.0-unstable
"FABLO_VERSION=1.1.0
FABLO_BUILD=<date with git hash>
FABLO_REST_VERSION=0.1.0
HYPERLEDGER_EXPLORER_VERSION=1.1.8
Expand Down Expand Up @@ -2406,6 +2406,10 @@ notifyOrgsAboutChannels() {
deleteNewChannelUpdateTx \\"my-channel1\\" \\"Org2MSP\\" \\"cli.org2.example.com\\"
}

printStartSuccessInfo() {
printHeadline \\"Done! Enjoy your fresh network\\" \\"U1F984\\"
}

stopNetwork() {
printHeadline \\"Stopping network\\" \\"U1F68F\\"
(cd \\"$FABLO_NETWORK_ROOT\\"/fabric-docker && docker-compose stop)
Expand All @@ -2417,12 +2421,30 @@ networkDown() {
(cd \\"$FABLO_NETWORK_ROOT\\"/fabric-docker && docker-compose down)

printf \\"\\\\nRemoving chaincode containers & images... \\\\U1F5D1 \\\\n\\"
docker rm -f $(docker ps -a | grep dev-peer0.org1.example.com-chaincode1-0.0.1-* | awk '{print $1}') || echo \\"docker rm failed, Check if all fabric dockers properly was deleted\\"
docker rmi $(docker images dev-peer0.org1.example.com-chaincode1-0.0.1-* -q) || echo \\"docker rm failed, Check if all fabric dockers properly was deleted\\"
docker rm -f $(docker ps -a | grep dev-peer1.org1.example.com-chaincode1-0.0.1-* | awk '{print $1}') || echo \\"docker rm failed, Check if all fabric dockers properly was deleted\\"
docker rmi $(docker images dev-peer1.org1.example.com-chaincode1-0.0.1-* -q) || echo \\"docker rm failed, Check if all fabric dockers properly was deleted\\"
docker rm -f $(docker ps -a | grep dev-peer0.org2.example.com-chaincode1-0.0.1-* | awk '{print $1}') || echo \\"docker rm failed, Check if all fabric dockers properly was deleted\\"
docker rmi $(docker images dev-peer0.org2.example.com-chaincode1-0.0.1-* -q) || echo \\"docker rm failed, Check if all fabric dockers properly was deleted\\"
for container in $(docker ps -a | grep \\"dev-peer0.org1.example.com-chaincode1\\" | awk '{print $1}'); do
echo \\"Removing container $container...\\"
docker rm -f \\"$container\\" || echo \\"docker rm of $container failed. Check if all fabric dockers properly was deleted\\"
done
for image in $(docker images \\"dev-peer0.org1.example.com-chaincode1*\\" -q); do
echo \\"Removing image $image...\\"
docker rmi \\"$image\\" || echo \\"docker rmi of $image failed. Check if all fabric dockers properly was deleted\\"
done
for container in $(docker ps -a | grep \\"dev-peer1.org1.example.com-chaincode1\\" | awk '{print $1}'); do
echo \\"Removing container $container...\\"
docker rm -f \\"$container\\" || echo \\"docker rm of $container failed. Check if all fabric dockers properly was deleted\\"
done
for image in $(docker images \\"dev-peer1.org1.example.com-chaincode1*\\" -q); do
echo \\"Removing image $image...\\"
docker rmi \\"$image\\" || echo \\"docker rmi of $image failed. Check if all fabric dockers properly was deleted\\"
done
for container in $(docker ps -a | grep \\"dev-peer0.org2.example.com-chaincode1\\" | awk '{print $1}'); do
echo \\"Removing container $container...\\"
docker rm -f \\"$container\\" || echo \\"docker rm of $container failed. Check if all fabric dockers properly was deleted\\"
done
for image in $(docker images \\"dev-peer0.org2.example.com-chaincode1*\\" -q); do
echo \\"Removing image $image...\\"
docker rmi \\"$image\\" || echo \\"docker rmi of $image failed. Check if all fabric dockers properly was deleted\\"
done

printf \\"\\\\nRemoving generated configs... \\\\U1F5D1 \\\\n\\"
rm -rf \\"$FABLO_NETWORK_ROOT/fabric-config/config\\"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1449,7 +1449,7 @@ networkUp() {
installChannels
installChaincodes
notifyOrgsAboutChannels
printHeadline \\"Done! Enjoy your fresh network\\" \\"U1F984\\"
printStartSuccessInfo
}

if [ \\"$1\\" = \\"up\\" ]; then
Expand Down Expand Up @@ -1492,7 +1492,7 @@ fi
`;

exports[`samples/fablo-config-hlf1.4-1org-1chaincode-raft.json should create proper e2e/__tmp__/samples/fablo-config-hlf1.4-1org-1chaincode-raft.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf1.4-1org-1chaincode-raft.json 1`] = `
"FABLO_VERSION=1.1.0-unstable
"FABLO_VERSION=1.1.0
FABLO_BUILD=<date with git hash>
FABLO_REST_VERSION=0.1.0
HYPERLEDGER_EXPLORER_VERSION=1.1.8
Expand Down Expand Up @@ -1762,6 +1762,10 @@ notifyOrgsAboutChannels() {
deleteNewChannelUpdateTx \\"my-channel1\\" \\"Org1MSP\\" \\"cli.org1.example.com\\"
}

printStartSuccessInfo() {
printHeadline \\"Done! Enjoy your fresh network\\" \\"U1F984\\"
}

stopNetwork() {
printHeadline \\"Stopping network\\" \\"U1F68F\\"
(cd \\"$FABLO_NETWORK_ROOT\\"/fabric-docker && docker-compose stop)
Expand All @@ -1773,10 +1777,22 @@ networkDown() {
(cd \\"$FABLO_NETWORK_ROOT\\"/fabric-docker && docker-compose down)

printf \\"\\\\nRemoving chaincode containers & images... \\\\U1F5D1 \\\\n\\"
docker rm -f $(docker ps -a | grep dev-peer0.org1.example.com-chaincode1-0.0.1-* | awk '{print $1}') || echo \\"docker rm failed, Check if all fabric dockers properly was deleted\\"
docker rmi $(docker images dev-peer0.org1.example.com-chaincode1-0.0.1-* -q) || echo \\"docker rm failed, Check if all fabric dockers properly was deleted\\"
docker rm -f $(docker ps -a | grep dev-peer1.org1.example.com-chaincode1-0.0.1-* | awk '{print $1}') || echo \\"docker rm failed, Check if all fabric dockers properly was deleted\\"
docker rmi $(docker images dev-peer1.org1.example.com-chaincode1-0.0.1-* -q) || echo \\"docker rm failed, Check if all fabric dockers properly was deleted\\"
for container in $(docker ps -a | grep \\"dev-peer0.org1.example.com-chaincode1\\" | awk '{print $1}'); do
echo \\"Removing container $container...\\"
docker rm -f \\"$container\\" || echo \\"docker rm of $container failed. Check if all fabric dockers properly was deleted\\"
done
for image in $(docker images \\"dev-peer0.org1.example.com-chaincode1*\\" -q); do
echo \\"Removing image $image...\\"
docker rmi \\"$image\\" || echo \\"docker rmi of $image failed. Check if all fabric dockers properly was deleted\\"
done
for container in $(docker ps -a | grep \\"dev-peer1.org1.example.com-chaincode1\\" | awk '{print $1}'); do
echo \\"Removing container $container...\\"
docker rm -f \\"$container\\" || echo \\"docker rm of $container failed. Check if all fabric dockers properly was deleted\\"
done
for image in $(docker images \\"dev-peer1.org1.example.com-chaincode1*\\" -q); do
echo \\"Removing image $image...\\"
docker rmi \\"$image\\" || echo \\"docker rmi of $image failed. Check if all fabric dockers properly was deleted\\"
done

printf \\"\\\\nRemoving generated configs... \\\\U1F5D1 \\\\n\\"
rm -rf \\"$FABLO_NETWORK_ROOT/fabric-config/config\\"
Expand Down
Loading