Merge branch 'main' into hardcodeed-fablo-config

Author: dzikowski

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

@@ -3,7 +3,7 @@ name: Release on tag
 on:
   push:
     tags:
-      - 'v*.*.*'
+      - '*.*.*'
 
 jobs:
   release:
@@ -53,7 +53,7 @@ jobs:
 
       - name: Create next development version PR
         run: |
-          ./bump_version.sh unstable
+          sh ./bump_version.sh unstable
           NEW_VERSION=$(jq -r '.version' <"$GITHUB_WORKSPACE/package.json")
           BRANCH_NAME="bump-version-to-$NEW_VERSION"
           git checkout -b $BRANCH_NAME

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

@@ -40,6 +40,7 @@ jobs:
       - name: Lint
         run: npm run lint && ./lint.sh
 
+    
   #  test-k8:
   #    needs: test-main
   #    runs-on: ubuntu-latest
@@ -172,10 +173,32 @@ jobs:
   
   test-05-v3:
     needs: test-main
-    runs-on: ubuntu-latest
+    runs-on:  macos-15
     steps:
       - name: Check out repository code
         uses: actions/checkout@v2
+      
+      - name: Install Docker + Colima
+        run: |
+          brew update
+          brew install qemu colima  docker 
+          brew uninstall --ignore-dependencies lima
+          curl https://raw.githubusercontent.com/Homebrew/homebrew-core/45464b6c4788a80be3f131ab5e2a4468cdfa960c/Formula/l/lima.rb > lima.rb
+          brew install lima.rb
+          LIMACTL_PATH=$(brew --prefix)/bin/limactl
+          sudo curl -L -o $LIMACTL_PATH https://github.com/mikekazakov/lima-nohvf/raw/master/limactl
+          sudo chmod +x $LIMACTL_PATH
+          colima start --network-address --arch arm64 --vm-type=qemu
+          mkdir -p ~/.docker/cli-plugins
+          brew install docker-compose
+          ln -sfn $(brew --prefix)/opt/docker-compose/bin/docker-compose ~/.docker/cli-plugins/docker-compose
+
+      - name: Install dependencies
+        run: |
+          brew install shellcheck yamllint
+          npm install -g npm@latest
+          npm install
+
   
       - name: Build Fablo
         run: |

.gitignore

@@ -7,3 +7,4 @@ node_modules
 .idea
 .vscode
 samples/invalid-fablo-config.json
+.DS_Store

CONTRIBUTING.md

@@ -39,7 +39,7 @@ See `git help commit`:
    - **Ent-to-End network tests**: Execute relevant shell scripts from `e2e-network` directory with E2E network tests.
 3. **Update snapshots**: If you've made changes that affect snapshots (esp. any template changes), update them using `npm run test:e2e-update`.
 
-## ## Running Fablo locally
+## Running Fablo locally
 
 You may want to verify some changes by running Fablo locally. To do so:
 1. Execute `./fablo-build.sh` script to create a Fablo Docker image locally.

e2e-network/docker/test-03-private-data.sh

@@ -89,18 +89,11 @@ expectInvoke "peer0.org2.example.com" "my-channel1" "or-policy-chaincode" \
   'tx creator does not have write access permission on privatedata in chaincodeName:or-policy-chaincode collectionName: org1-collection' \
   '{"message":"Q29ycnVwdGVkIG1lc3NhZ2U="}'
 
-# TODO to be added in https://github.com/hyperledger-labs/fablo/issues/466
-#expectInvoke "peer0.org1.example.com,peer0.org2.example.com" "my-channel1" "and-policy-chaincode" \
-#  '{"Args":["KVContract:putPrivateMessage", "both-orgs-collection"]}' \
-#  '{\"success\":\"OK\"}' \
-#  '{"message":"RG9udCBjaGFuZ2UgbWUgcGx6"}'
-#expectInvoke "peer0.org2.example.com,peer0.org1.example.com" "my-channel1" "and-policy-chaincode" \
-#  '{"Args":["KVContract:getPrivateMessage", "both-orgs-collection"]}' \
-#  'tx creator does not have read access permission on privatedata in chaincodeName:and-policy-chaincode collectionName: org1-collection'
-#expectInvoke "peer0.org2.example.com,peer0.org1.example.com" "my-channel1" "and-policy-chaincode" \
-#  '{"Args":["KVContract:putPrivateMessage", "both-orgs-collection"]}' \
-#  '{\"success\":\"OK\"}' \
-#  '{"message":"QW5kIGFub3RoZXIgb25l"}'
-#expectInvoke "peer0.org1.example.com,peer0.org2.example.com" "my-channel1" "and-policy-chaincode" \
-#  '{"Args":["KVContract:getPrivateMessage", "both-orgs-collection"]}' \
-#  'Error: could not assemble transaction: ProposalResponsePayloads do not match'
+# Org1 and Org2: Test chaincode with AND endorsement policy
+expectInvoke "peer0.org2.example.com,peer0.org1.example.com" "my-channel1" "and-policy-chaincode" \
+ '{"Args":["KVContract:putPrivateMessage", "both-orgs-collection"]}' \
+ '{\"success\":\"OK\"}' \
+ '{"message":"QW5kIGFub3RoZXIgb25l"}'
+expectInvoke "peer0.org1.example.com,peer0.org2.example.com" "my-channel1" "and-policy-chaincode" \
+ '{"Args":["KVContract:getPrivateMessage", "both-orgs-collection"]}' \
+ '{\"success\":\"And another one\"}'

e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.test.ts.snap

@@ -1592,29 +1592,22 @@ chaincodeInvoke() {
     echo "Usage: fablo chaincode invoke <peer_domains_comma_separated> <channel_name> <chaincode_name> <command> [transient]"
     exit 1
   fi
-  cli=""
-  peer_addresses=""
 
-  peer_certs=""
-
-  if [[ "$1" == *"peer0.org1.example.com"* ]]; then
+  # Cli needs to be from the same org as the first peer
+  if [[ "$1" == "peer0.org1.example.com"* ]]; then
     cli="cli.org1.example.com"
-    peer_addresses="$peer_addresses,peer0.org1.example.com:7041"
+  fi
 
-    peer_certs="$peer_certs,crypto/peers/peer0.org1.example.com/tls/ca.crt"
+  peer_addresses="$1"
+  peer_addresses="\${peer_addresses//peer0.org1.example.com/peer0.org1.example.com:7041}"
 
-  fi
-  if [ -z "$peer_addresses" ]; then
-    echo "Unknown peers: $1"
-    exit 1
-  fi
+  peer_certs="$1"
+  peer_certs="\${peer_certs//peer0.org1.example.com/crypto/peers/peer0.org1.example.com/tls/ca.crt}"
 
   if [ "$2" = "my-channel1" ]; then
     ca_cert="crypto-orderer/tlsca.orderer.example.com-cert.pem"
   fi
-
-  peerChaincodeInvokeTls "$cli" "\${peer_addresses:1}" "$2" "$3" "$4" "$5" "\${peer_certs:1}" "$ca_cert"
-
+  peerChaincodeInvokeTls "$cli" "$peer_addresses" "$2" "$3" "$4" "$5" "$peer_certs" "$ca_cert"
 }
 "
 `;
@@ -1627,8 +1620,6 @@ source "$FABLO_NETWORK_ROOT/fabric-docker/scripts/channel-query-functions.sh"
 set -eu
 
 channelQuery() {
-  echo "-> Channel query: " + "$@"
-
   if [ "$#" -eq 1 ]; then
     printChannelsHelp
 

e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap

@@ -1509,26 +1509,20 @@ chaincodeInvoke() {
     echo "Usage: fablo chaincode invoke <peer_domains_comma_separated> <channel_name> <chaincode_name> <command> [transient]"
     exit 1
   fi
-  cli=""
-  peer_addresses=""
 
-  if [[ "$1" == *"peer0.org1.example.com"* ]]; then
+  # Cli needs to be from the same org as the first peer
+  if [[ "$1" == "peer0.org1.example.com"* ]]; then
     cli="cli.org1.example.com"
-    peer_addresses="$peer_addresses,peer0.org1.example.com:7041"
-
   fi
-  if [[ "$1" == *"peer1.org1.example.com"* ]]; then
+  if [[ "$1" == "peer1.org1.example.com"* ]]; then
     cli="cli.org1.example.com"
-    peer_addresses="$peer_addresses,peer1.org1.example.com:7042"
-
-  fi
-  if [ -z "$peer_addresses" ]; then
-    echo "Unknown peers: $1"
-    exit 1
   fi
 
-  peerChaincodeInvoke "$cli" "\${peer_addresses:1}" "$2" "$3" "$4" "$5"
+  peer_addresses="$1"
+  peer_addresses="\${peer_addresses//peer0.org1.example.com/peer0.org1.example.com:7041}"
+  peer_addresses="\${peer_addresses//peer1.org1.example.com/peer1.org1.example.com:7042}"
 
+  peerChaincodeInvoke "$cli" "$peer_addresses" "$2" "$3" "$4" "$5"
 }
 "
 `;
@@ -1541,8 +1535,6 @@ source "$FABLO_NETWORK_ROOT/fabric-docker/scripts/channel-query-functions.sh"
 set -eu
 
 channelQuery() {
-  echo "-> Channel query: " + "$@"
-
   if [ "$#" -eq 1 ]; then
     printChannelsHelp
 

e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.test.ts.snap

@@ -2179,31 +2179,24 @@ chaincodeInvoke() {
     echo "Usage: fablo chaincode invoke <peer_domains_comma_separated> <channel_name> <chaincode_name> <command> [transient]"
     exit 1
   fi
-  cli=""
-  peer_addresses=""
 
-  if [[ "$1" == *"peer0.org1.example.com"* ]]; then
+  # Cli needs to be from the same org as the first peer
+  if [[ "$1" == "peer0.org1.example.com"* ]]; then
     cli="cli.org1.example.com"
-    peer_addresses="$peer_addresses,peer0.org1.example.com:7041"
-
   fi
-  if [[ "$1" == *"peer1.org1.example.com"* ]]; then
+  if [[ "$1" == "peer1.org1.example.com"* ]]; then
     cli="cli.org1.example.com"
-    peer_addresses="$peer_addresses,peer1.org1.example.com:7042"
-
   fi
-  if [[ "$1" == *"peer0.org2.example.com"* ]]; then
+  if [[ "$1" == "peer0.org2.example.com"* ]]; then
     cli="cli.org2.example.com"
-    peer_addresses="$peer_addresses,peer0.org2.example.com:7061"
-
-  fi
-  if [ -z "$peer_addresses" ]; then
-    echo "Unknown peers: $1"
-    exit 1
   fi
 
-  peerChaincodeInvoke "$cli" "\${peer_addresses:1}" "$2" "$3" "$4" "$5"
+  peer_addresses="$1"
+  peer_addresses="\${peer_addresses//peer0.org1.example.com/peer0.org1.example.com:7041}"
+  peer_addresses="\${peer_addresses//peer1.org1.example.com/peer1.org1.example.com:7042}"
+  peer_addresses="\${peer_addresses//peer0.org2.example.com/peer0.org2.example.com:7061}"
 
+  peerChaincodeInvoke "$cli" "$peer_addresses" "$2" "$3" "$4" "$5"
 }
 "
 `;
@@ -2216,8 +2209,6 @@ source "$FABLO_NETWORK_ROOT/fabric-docker/scripts/channel-query-functions.sh"
 set -eu
 
 channelQuery() {
-  echo "-> Channel query: " + "$@"
-
   if [ "$#" -eq 1 ]; then
     printChannelsHelp
 

e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap

@@ -3111,58 +3111,43 @@ chaincodeInvoke() {
     echo "Usage: fablo chaincode invoke <peer_domains_comma_separated> <channel_name> <chaincode_name> <command> [transient]"
     exit 1
   fi
-  cli=""
-  peer_addresses=""
 
-  peer_certs=""
-
-  if [[ "$1" == *"peer0.org1.example.com"* ]]; then
+  # Cli needs to be from the same org as the first peer
+  if [[ "$1" == "peer0.org1.example.com"* ]]; then
     cli="cli.org1.example.com"
-    peer_addresses="$peer_addresses,peer0.org1.example.com:7061"
-
-    peer_certs="$peer_certs,crypto/peers/peer0.org1.example.com/tls/ca.crt"
-
   fi
-  if [[ "$1" == *"peer1.org1.example.com"* ]]; then
+  if [[ "$1" == "peer1.org1.example.com"* ]]; then
     cli="cli.org1.example.com"
-    peer_addresses="$peer_addresses,peer1.org1.example.com:7062"
-
-    peer_certs="$peer_certs,crypto/peers/peer1.org1.example.com/tls/ca.crt"
-
   fi
-  if [[ "$1" == *"peer0.org2.example.com"* ]]; then
+  if [[ "$1" == "peer0.org2.example.com"* ]]; then
     cli="cli.org2.example.com"
-    peer_addresses="$peer_addresses,peer0.org2.example.com:7081"
-
-    peer_certs="$peer_certs,crypto/peers/peer0.org2.example.com/tls/ca.crt"
-
   fi
-  if [[ "$1" == *"peer1.org2.example.com"* ]]; then
+  if [[ "$1" == "peer1.org2.example.com"* ]]; then
     cli="cli.org2.example.com"
-    peer_addresses="$peer_addresses,peer1.org2.example.com:7082"
+  fi
 
-    peer_certs="$peer_certs,crypto/peers/peer1.org2.example.com/tls/ca.crt"
+  peer_addresses="$1"
+  peer_addresses="\${peer_addresses//peer0.org1.example.com/peer0.org1.example.com:7061}"
+  peer_addresses="\${peer_addresses//peer1.org1.example.com/peer1.org1.example.com:7062}"
+  peer_addresses="\${peer_addresses//peer0.org2.example.com/peer0.org2.example.com:7081}"
+  peer_addresses="\${peer_addresses//peer1.org2.example.com/peer1.org2.example.com:7082}"
 
-  fi
-  if [ -z "$peer_addresses" ]; then
-    echo "Unknown peers: $1"
-    exit 1
-  fi
+  peer_certs="$1"
+  peer_certs="\${peer_certs//peer0.org1.example.com/crypto/peers/peer0.org1.example.com/tls/ca.crt}"
+  peer_certs="\${peer_certs//peer1.org1.example.com/crypto/peers/peer1.org1.example.com/tls/ca.crt}"
+  peer_certs="\${peer_certs//peer0.org2.example.com/crypto/peers/peer0.org2.example.com/tls/ca.crt}"
+  peer_certs="\${peer_certs//peer1.org2.example.com/crypto/peers/peer1.org2.example.com/tls/ca.crt}"
 
   if [ "$2" = "my-channel1" ]; then
     ca_cert="crypto-orderer/tlsca.orderer1.com-cert.pem"
   fi
-
   if [ "$2" = "my-channel2" ]; then
     ca_cert="crypto-orderer/tlsca.orderer1.com-cert.pem"
   fi
-
   if [ "$2" = "my-channel3" ]; then
     ca_cert="crypto-orderer/tlsca.orderer1.com-cert.pem"
   fi
-
-  peerChaincodeInvokeTls "$cli" "\${peer_addresses:1}" "$2" "$3" "$4" "$5" "\${peer_certs:1}" "$ca_cert"
-
+  peerChaincodeInvokeTls "$cli" "$peer_addresses" "$2" "$3" "$4" "$5" "$peer_certs" "$ca_cert"
 }
 "
 `;
@@ -3175,8 +3160,6 @@ source "$FABLO_NETWORK_ROOT/fabric-docker/scripts/channel-query-functions.sh"
 set -eu
 
 channelQuery() {
-  echo "-> Channel query: " + "$@"
-
   if [ "$#" -eq 1 ]; then
     printChannelsHelp