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
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18
20
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
## Unstable

### Chore & Maintenance
* Update Node.js to 20 [#641](https://github.com/hyperledger-labs/fablo/pull/641)

## Documentation
* Update `README.md` to provide talk links [#637](https://github.com/hyperledger-labs/fablo/pull/637)


## 2.4.2

### Bug Fixes
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:18-alpine3.16
FROM node:20-alpine

RUN apk add --no-cache sudo shfmt
RUN npm install --global --silent yo
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1562,7 +1562,6 @@ chaincodeList() {
peerChaincodeList "cli.org1.example.com" "peer0.org1.example.com:7041" "$2" # $2 is channel name

else

echo "Fail to call listChaincodes. No peer or channel found. Provided peer: $1, channel: $2"
exit 1

Expand Down Expand Up @@ -1648,10 +1647,7 @@ channelQuery() {

peerChannelList "cli.org1.example.com" "peer0.org1.example.com:7041"

elif

[ "$1" = "getinfo" ] && [ "$2" = "my-channel1" ] && [ "$3" = "org1" ] && [ "$4" = "peer0" ]
then
elif [ "$1" = "getinfo" ] && [ "$2" = "my-channel1" ] && [ "$3" = "org1" ] && [ "$4" = "peer0" ]; then

peerChannelGetInfo "my-channel1" "cli.org1.example.com" "peer0.org1.example.com:7041"

Expand All @@ -1667,7 +1663,6 @@ channelQuery() {
peerChannelFetchBlock "my-channel1" "cli.org1.example.com" "\${BLOCK_NAME}" "peer0.org1.example.com:7041" "$TARGET_FILE"

else

echo "$@"
echo "$1, $2, $3, $4, $5, $6, $7, $#"
printChannelsHelp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1568,14 +1568,11 @@ chaincodeList() {

peerChaincodeList "cli.org1.example.com" "peer0.org1.example.com:7041" "$2" # $2 is channel name

elif
[ "$1" = "peer1.org1.example.com" ]
then
elif [ "$1" = "peer1.org1.example.com" ]; then

peerChaincodeList "cli.org1.example.com" "peer1.org1.example.com:7042" "$2" # $2 is channel name

else

echo "Fail to call listChaincodes. No peer or channel found. Provided peer: $1, channel: $2"
exit 1

Expand Down Expand Up @@ -1670,16 +1667,11 @@ channelQuery() {

peerChannelList "cli.org1.example.com" "peer0.org1.example.com:7041"

elif
[ "$1" = "list" ] && [ "$2" = "org1" ] && [ "$3" = "peer1" ]
then
elif [ "$1" = "list" ] && [ "$2" = "org1" ] && [ "$3" = "peer1" ]; then

peerChannelList "cli.org1.example.com" "peer1.org1.example.com:7042"

elif

[ "$1" = "getinfo" ] && [ "$2" = "my-channel1" ] && [ "$3" = "org1" ] && [ "$4" = "peer0" ]
then
elif [ "$1" = "getinfo" ] && [ "$2" = "my-channel1" ] && [ "$3" = "org1" ] && [ "$4" = "peer0" ]; then

peerChannelGetInfo "my-channel1" "cli.org1.example.com" "peer0.org1.example.com:7041"

Expand All @@ -1694,9 +1686,7 @@ channelQuery() {

peerChannelFetchBlock "my-channel1" "cli.org1.example.com" "\${BLOCK_NAME}" "peer0.org1.example.com:7041" "$TARGET_FILE"

elif
[ "$1" = "getinfo" ] && [ "$2" = "my-channel1" ] && [ "$3" = "org1" ] && [ "$4" = "peer1" ]
then
elif [ "$1" = "getinfo" ] && [ "$2" = "my-channel1" ] && [ "$3" = "org1" ] && [ "$4" = "peer1" ]; then

peerChannelGetInfo "my-channel1" "cli.org1.example.com" "peer1.org1.example.com:7042"

Expand All @@ -1712,7 +1702,6 @@ channelQuery() {
peerChannelFetchBlock "my-channel1" "cli.org1.example.com" "\${BLOCK_NAME}" "peer1.org1.example.com:7042" "$TARGET_FILE"

else

echo "$@"
echo "$1, $2, $3, $4, $5, $6, $7, $#"
printChannelsHelp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1647,7 +1647,6 @@ chaincodeList() {
peerChaincodeListTls "cli.org1.example.com" "peer0.org1.example.com:7041" "$2" "crypto-orderer/tlsca.orderer.example.com-cert.pem" # Third argument is channel name

else

echo "Fail to call listChaincodes. No peer or channel found. Provided peer: $1, channel: $2"
exit 1

Expand Down Expand Up @@ -1769,10 +1768,7 @@ channelQuery() {

peerChannelListTls "cli.org1.example.com" "peer0.org1.example.com:7041" "crypto-orderer/tlsca.orderer.example.com-cert.pem"

elif

[ "$1" = "getinfo" ] && [ "$2" = "my-channel1" ] && [ "$3" = "org1" ] && [ "$4" = "peer0" ]
then
elif [ "$1" = "getinfo" ] && [ "$2" = "my-channel1" ] && [ "$3" = "org1" ] && [ "$4" = "peer0" ]; then

peerChannelGetInfoTls "my-channel1" "cli.org1.example.com" "peer0.org1.example.com:7041" "crypto-orderer/tlsca.orderer.example.com-cert.pem"

Expand All @@ -1787,9 +1783,7 @@ channelQuery() {

peerChannelFetchBlockTls "my-channel1" "cli.org1.example.com" "\${BLOCK_NAME}" "peer0.org1.example.com:7041" "crypto-orderer/tlsca.orderer.example.com-cert.pem" "$TARGET_FILE"

elif
[ "$1" = "getinfo" ] && [ "$2" = "my-channel2" ] && [ "$3" = "org1" ] && [ "$4" = "peer0" ]
then
elif [ "$1" = "getinfo" ] && [ "$2" = "my-channel2" ] && [ "$3" = "org1" ] && [ "$4" = "peer0" ]; then

peerChannelGetInfoTls "my-channel2" "cli.org1.example.com" "peer0.org1.example.com:7041" "crypto-orderer/tlsca.orderer.example.com-cert.pem"

Expand All @@ -1805,7 +1799,6 @@ channelQuery() {
peerChannelFetchBlockTls "my-channel2" "cli.org1.example.com" "\${BLOCK_NAME}" "peer0.org1.example.com:7041" "crypto-orderer/tlsca.orderer.example.com-cert.pem" "$TARGET_FILE"

else

echo "$@"
echo "$1, $2, $3, $4, $5, $6, $7, $#"
printChannelsHelp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2251,20 +2251,15 @@ chaincodeList() {

peerChaincodeList "cli.org1.example.com" "peer0.org1.example.com:7041" "$2" # $2 is channel name

elif
[ "$1" = "peer1.org1.example.com" ]
then
elif [ "$1" = "peer1.org1.example.com" ]; then

peerChaincodeList "cli.org1.example.com" "peer1.org1.example.com:7042" "$2" # $2 is channel name

elif
[ "$1" = "peer0.org2.example.com" ]
then
elif [ "$1" = "peer0.org2.example.com" ]; then

peerChaincodeList "cli.org2.example.com" "peer0.org2.example.com:7061" "$2" # $2 is channel name

else

echo "Fail to call listChaincodes. No peer or channel found. Provided peer: $1, channel: $2"
exit 1

Expand Down Expand Up @@ -2368,22 +2363,15 @@ channelQuery() {

peerChannelList "cli.org1.example.com" "peer0.org1.example.com:7041"

elif
[ "$1" = "list" ] && [ "$2" = "org1" ] && [ "$3" = "peer1" ]
then
elif [ "$1" = "list" ] && [ "$2" = "org1" ] && [ "$3" = "peer1" ]; then

peerChannelList "cli.org1.example.com" "peer1.org1.example.com:7042"

elif
[ "$1" = "list" ] && [ "$2" = "org2" ] && [ "$3" = "peer0" ]
then
elif [ "$1" = "list" ] && [ "$2" = "org2" ] && [ "$3" = "peer0" ]; then

peerChannelList "cli.org2.example.com" "peer0.org2.example.com:7061"

elif

[ "$1" = "getinfo" ] && [ "$2" = "my-channel1" ] && [ "$3" = "org1" ] && [ "$4" = "peer0" ]
then
elif [ "$1" = "getinfo" ] && [ "$2" = "my-channel1" ] && [ "$3" = "org1" ] && [ "$4" = "peer0" ]; then

peerChannelGetInfo "my-channel1" "cli.org1.example.com" "peer0.org1.example.com:7041"

Expand All @@ -2398,9 +2386,7 @@ channelQuery() {

peerChannelFetchBlock "my-channel1" "cli.org1.example.com" "\${BLOCK_NAME}" "peer0.org1.example.com:7041" "$TARGET_FILE"

elif
[ "$1" = "getinfo" ] && [ "$2" = "my-channel1" ] && [ "$3" = "org1" ] && [ "$4" = "peer1" ]
then
elif [ "$1" = "getinfo" ] && [ "$2" = "my-channel1" ] && [ "$3" = "org1" ] && [ "$4" = "peer1" ]; then

peerChannelGetInfo "my-channel1" "cli.org1.example.com" "peer1.org1.example.com:7042"

Expand All @@ -2415,9 +2401,7 @@ channelQuery() {

peerChannelFetchBlock "my-channel1" "cli.org1.example.com" "\${BLOCK_NAME}" "peer1.org1.example.com:7042" "$TARGET_FILE"

elif
[ "$1" = "getinfo" ] && [ "$2" = "my-channel1" ] && [ "$3" = "org2" ] && [ "$4" = "peer0" ]
then
elif [ "$1" = "getinfo" ] && [ "$2" = "my-channel1" ] && [ "$3" = "org2" ] && [ "$4" = "peer0" ]; then

peerChannelGetInfo "my-channel1" "cli.org2.example.com" "peer0.org2.example.com:7061"

Expand All @@ -2433,7 +2417,6 @@ channelQuery() {
peerChannelFetchBlock "my-channel1" "cli.org2.example.com" "\${BLOCK_NAME}" "peer0.org2.example.com:7061" "$TARGET_FILE"

else

echo "$@"
echo "$1, $2, $3, $4, $5, $6, $7, $#"
printChannelsHelp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3623,26 +3623,19 @@ chaincodeList() {

peerChaincodeListTls "cli.org1.example.com" "peer0.org1.example.com:7061" "$2" "crypto-orderer/tlsca.orderer1.com-cert.pem" # Third argument is channel name

elif
[ "$1" = "peer1.org1.example.com" ]
then
elif [ "$1" = "peer1.org1.example.com" ]; then

peerChaincodeListTls "cli.org1.example.com" "peer1.org1.example.com:7062" "$2" "crypto-orderer/tlsca.orderer1.com-cert.pem" # Third argument is channel name

elif
[ "$1" = "peer0.org2.example.com" ]
then
elif [ "$1" = "peer0.org2.example.com" ]; then

peerChaincodeListTls "cli.org2.example.com" "peer0.org2.example.com:7081" "$2" "crypto-orderer/tlsca.orderer1.com-cert.pem" # Third argument is channel name

elif
[ "$1" = "peer1.org2.example.com" ]
then
elif [ "$1" = "peer1.org2.example.com" ]; then

peerChaincodeListTls "cli.org2.example.com" "peer1.org2.example.com:7082" "$2" "crypto-orderer/tlsca.orderer1.com-cert.pem" # Third argument is channel name

else

echo "Fail to call listChaincodes. No peer or channel found. Provided peer: $1, channel: $2"
exit 1

Expand Down Expand Up @@ -3806,28 +3799,19 @@ channelQuery() {

peerChannelListTls "cli.org1.example.com" "peer0.org1.example.com:7061" "crypto-orderer/tlsca.orderer1.com-cert.pem"

elif
[ "$1" = "list" ] && [ "$2" = "org1" ] && [ "$3" = "peer1" ]
then
elif [ "$1" = "list" ] && [ "$2" = "org1" ] && [ "$3" = "peer1" ]; then

peerChannelListTls "cli.org1.example.com" "peer1.org1.example.com:7062" "crypto-orderer/tlsca.orderer1.com-cert.pem"

elif
[ "$1" = "list" ] && [ "$2" = "org2" ] && [ "$3" = "peer0" ]
then
elif [ "$1" = "list" ] && [ "$2" = "org2" ] && [ "$3" = "peer0" ]; then

peerChannelListTls "cli.org2.example.com" "peer0.org2.example.com:7081" "crypto-orderer/tlsca.orderer1.com-cert.pem"

elif
[ "$1" = "list" ] && [ "$2" = "org2" ] && [ "$3" = "peer1" ]
then
elif [ "$1" = "list" ] && [ "$2" = "org2" ] && [ "$3" = "peer1" ]; then

peerChannelListTls "cli.org2.example.com" "peer1.org2.example.com:7082" "crypto-orderer/tlsca.orderer1.com-cert.pem"

elif

[ "$1" = "getinfo" ] && [ "$2" = "my-channel1" ] && [ "$3" = "org1" ] && [ "$4" = "peer0" ]
then
elif [ "$1" = "getinfo" ] && [ "$2" = "my-channel1" ] && [ "$3" = "org1" ] && [ "$4" = "peer0" ]; then

peerChannelGetInfoTls "my-channel1" "cli.org1.example.com" "peer0.org1.example.com:7061" "crypto-orderer/tlsca.orderer1.com-cert.pem"

Expand All @@ -3842,9 +3826,7 @@ channelQuery() {

peerChannelFetchBlockTls "my-channel1" "cli.org1.example.com" "\${BLOCK_NAME}" "peer0.org1.example.com:7061" "crypto-orderer/tlsca.orderer1.com-cert.pem" "$TARGET_FILE"

elif
[ "$1" = "getinfo" ] && [ "$2" = "my-channel1" ] && [ "$3" = "org2" ] && [ "$4" = "peer0" ]
then
elif [ "$1" = "getinfo" ] && [ "$2" = "my-channel1" ] && [ "$3" = "org2" ] && [ "$4" = "peer0" ]; then

peerChannelGetInfoTls "my-channel1" "cli.org2.example.com" "peer0.org2.example.com:7081" "crypto-orderer/tlsca.orderer1.com-cert.pem"

Expand All @@ -3859,9 +3841,7 @@ channelQuery() {

peerChannelFetchBlockTls "my-channel1" "cli.org2.example.com" "\${BLOCK_NAME}" "peer0.org2.example.com:7081" "crypto-orderer/tlsca.orderer1.com-cert.pem" "$TARGET_FILE"

elif
[ "$1" = "getinfo" ] && [ "$2" = "my-channel2" ] && [ "$3" = "org1" ] && [ "$4" = "peer1" ]
then
elif [ "$1" = "getinfo" ] && [ "$2" = "my-channel2" ] && [ "$3" = "org1" ] && [ "$4" = "peer1" ]; then

peerChannelGetInfoTls "my-channel2" "cli.org1.example.com" "peer1.org1.example.com:7062" "crypto-orderer/tlsca.orderer1.com-cert.pem"

Expand All @@ -3876,9 +3856,7 @@ channelQuery() {

peerChannelFetchBlockTls "my-channel2" "cli.org1.example.com" "\${BLOCK_NAME}" "peer1.org1.example.com:7062" "crypto-orderer/tlsca.orderer1.com-cert.pem" "$TARGET_FILE"

elif
[ "$1" = "getinfo" ] && [ "$2" = "my-channel2" ] && [ "$3" = "org2" ] && [ "$4" = "peer1" ]
then
elif [ "$1" = "getinfo" ] && [ "$2" = "my-channel2" ] && [ "$3" = "org2" ] && [ "$4" = "peer1" ]; then

peerChannelGetInfoTls "my-channel2" "cli.org2.example.com" "peer1.org2.example.com:7082" "crypto-orderer/tlsca.orderer1.com-cert.pem"

Expand All @@ -3893,9 +3871,7 @@ channelQuery() {

peerChannelFetchBlockTls "my-channel2" "cli.org2.example.com" "\${BLOCK_NAME}" "peer1.org2.example.com:7082" "crypto-orderer/tlsca.orderer1.com-cert.pem" "$TARGET_FILE"

elif
[ "$1" = "getinfo" ] && [ "$2" = "my-channel3" ] && [ "$3" = "org1" ] && [ "$4" = "peer0" ]
then
elif [ "$1" = "getinfo" ] && [ "$2" = "my-channel3" ] && [ "$3" = "org1" ] && [ "$4" = "peer0" ]; then

peerChannelGetInfoTls "my-channel3" "cli.org1.example.com" "peer0.org1.example.com:7061" "crypto-orderer/tlsca.orderer2.com-cert.pem"

Expand All @@ -3910,9 +3886,7 @@ channelQuery() {

peerChannelFetchBlockTls "my-channel3" "cli.org1.example.com" "\${BLOCK_NAME}" "peer0.org1.example.com:7061" "crypto-orderer/tlsca.orderer2.com-cert.pem" "$TARGET_FILE"

elif
[ "$1" = "getinfo" ] && [ "$2" = "my-channel3" ] && [ "$3" = "org1" ] && [ "$4" = "peer1" ]
then
elif [ "$1" = "getinfo" ] && [ "$2" = "my-channel3" ] && [ "$3" = "org1" ] && [ "$4" = "peer1" ]; then

peerChannelGetInfoTls "my-channel3" "cli.org1.example.com" "peer1.org1.example.com:7062" "crypto-orderer/tlsca.orderer2.com-cert.pem"

Expand All @@ -3927,9 +3901,7 @@ channelQuery() {

peerChannelFetchBlockTls "my-channel3" "cli.org1.example.com" "\${BLOCK_NAME}" "peer1.org1.example.com:7062" "crypto-orderer/tlsca.orderer2.com-cert.pem" "$TARGET_FILE"

elif
[ "$1" = "getinfo" ] && [ "$2" = "my-channel3" ] && [ "$3" = "org2" ] && [ "$4" = "peer0" ]
then
elif [ "$1" = "getinfo" ] && [ "$2" = "my-channel3" ] && [ "$3" = "org2" ] && [ "$4" = "peer0" ]; then

peerChannelGetInfoTls "my-channel3" "cli.org2.example.com" "peer0.org2.example.com:7081" "crypto-orderer/tlsca.orderer2.com-cert.pem"

Expand All @@ -3944,9 +3916,7 @@ channelQuery() {

peerChannelFetchBlockTls "my-channel3" "cli.org2.example.com" "\${BLOCK_NAME}" "peer0.org2.example.com:7081" "crypto-orderer/tlsca.orderer2.com-cert.pem" "$TARGET_FILE"

elif
[ "$1" = "getinfo" ] && [ "$2" = "my-channel3" ] && [ "$3" = "org2" ] && [ "$4" = "peer1" ]
then
elif [ "$1" = "getinfo" ] && [ "$2" = "my-channel3" ] && [ "$3" = "org2" ] && [ "$4" = "peer1" ]; then

peerChannelGetInfoTls "my-channel3" "cli.org2.example.com" "peer1.org2.example.com:7082" "crypto-orderer/tlsca.orderer2.com-cert.pem"

Expand All @@ -3962,7 +3932,6 @@ channelQuery() {
peerChannelFetchBlockTls "my-channel3" "cli.org2.example.com" "\${BLOCK_NAME}" "peer1.org2.example.com:7082" "crypto-orderer/tlsca.orderer2.com-cert.pem" "$TARGET_FILE"

else

echo "$@"
echo "$1, $2, $3, $4, $5, $6, $7, $#"
printChannelsHelp
Expand Down
Loading
Loading