Merge branch 'main' into CI-tests

Author: OsamaRab3

.github/workflows/publish-docker-on-main.yml

@@ -39,4 +39,4 @@ jobs:
             --platform linux/amd64,linux/arm64 \
             --tag "ghcr.io/fablo-io/fablo-kv-node-chaincode-sample:$FABLO_VERSION" \
             --push \
-            samples/chaincodes/chaincode-kv-node
+            samples/chaincodes/chaincode-kv-node

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

@@ -172,35 +172,11 @@ jobs:
 
   test-05-v3:
     needs: test-main
-    runs-on: macos-13
+    runs-on: ubuntu-latest
     steps:
       - name: Check out repository code
         uses: actions/checkout@v2
-
-      - name: Fix Python conflicts between macOS runner and Homebrew
-        run: |
-          # see https://github.com/actions/setup-python/issues/577
-          brew list -1 | grep python | while read formula; do brew unlink $formula; brew link --overwrite $formula; done
-
-      - name: Install homebrew dependencies
-        run: |
-          set -x
-          sudo chmod ugo+w /usr/local/bin
-          brew install docker docker-compose lima qemu
-
-      - name: Install and start Colima
-        run: |
-          brew install colima
-          colima version
-          colima start --cpu 3 --memory 6 --disk 100 --vm-type=qemu --mount-type=sshfs --dns=1.1.1.1
-          colima restart
-
-      - name: Install dependencies
-        run: |
-          brew install shellcheck yamllint
-          npm install -g npm@latest
-          npm install
-
+        
       - name: Build Fablo
         run: |
           shellcheck --version && \
@@ -219,7 +195,7 @@ jobs:
             e2e-network/docker/test-05-v3.sh.logs/*
             e2e-network/docker/test-05-v3.sh.tmpdir/fablo-target/**/*
 
-  test-05-v3-BFT:
+  test-06-v3-BFT:
     needs: test-main
     runs-on: ubuntu-latest
     steps:

.gitignore

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

CHANGELOG.md

@@ -9,6 +9,9 @@
   [#569](https://github.com/hyperledger-labs/fablo/pull/569)
 * Export network topology with Mermaid 
   [#565](https://github.com/hyperledger-labs/fablo/pull/565)
+* Support installing Chaincode from Docker image using CCaaS
+  [#550](https://github.com/hyperledger-labs/fablo/pull/550)
+  [#582](https://github.com/hyperledger-labs/fablo/pull/582)
 
 ## 2.2.0
 

COVERAGE_TRACKER.md

@@ -22,7 +22,7 @@ This document provides an overview of Fablo features. The table below tracks fea
 | 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) |                 |
 | Go                                     | ✓         | ✓         |            |          |                 |
 | Java                                   | ✓         | ✓         |            | [02_v2](/e2e-network/docker/test-02-v2-raft-2orgs.sh) |                 |
-| Chaincode-as-a-Service (CCaaS)         | ✕         | ✕         |            |          |                 |
+| Chaincode-as-a-Service (CCaaS)         | ✓         | ✕         |            | [04_v2](/e2e-network/docker/test-04-v2-snapshot.sh)         |                 |
 | Endorsement Policies                   | ✓         | ✓         |            | [03_v2](/e2e-network/docker/test-03-v2-private-data.sh), [02_v2](/e2e-network/docker/test-02-v2-raft-2orgs.sh) |                 |
 | Multi-org Endorsements                 | ✓         | ✓         |            | [03_v2](/e2e-network/docker/test-03-v2-private-data.sh) |                 |
 | Private Data Collections               | ✓         | ✓         |            | [03_v2](/e2e-network/docker/test-03-v2-private-data.sh) |                 |

README.md

@@ -201,6 +201,7 @@ Example:
 3. Execute `./fablo prune` to destroy the current network. If the network was present, Fablo would not be able to restore the new one from backup.
 4. Execute `./fablo restore /tmp/my-snapshot` to restore the network.
 5. Execute `./fablo start` to start the restored network.
+6. When running external chaincodes(CCAAS), Execute `./fablo chaincodes install` to start the CCAAS container
 
 Typically, a snapshot of the network with little data will take less than 1 MB, so it is easy to share.
 

docs/schema.json

@@ -416,8 +416,20 @@
           "name",
           "version",
           "lang",
-          "channel",
-          "directory"
+          "channel"
+        ],
+        "allOf": [
+          {
+            "if": {
+              "properties": { "lang": { "const": "ccaas"}}
+            },
+            "then": {
+              "required": [ "image"]
+            },
+            "else": {
+              "required": [ "directory" ]
+            }
+          }
         ],
         "properties": {
           "name": {
@@ -439,7 +451,8 @@
             "enum": [
               "golang",
               "java",
-              "node"
+              "node",
+              "ccaas"
             ]
           },
           "channel": {
@@ -478,6 +491,11 @@
             "title": "Chaincode directory",
             "type": "string"
           },
+          "image": {
+            "$id": "#/properties/chaincodes/items/properties/image",
+            "title": "Chaincode image URI",
+            "type": "string"
+          },
           "privateData": {
             "$id": "#/properties/chaincodes/items/properties/privateData",
             "title": "Private data collections",

e2e-network/docker/test-01-v2-simple.sh

@@ -91,7 +91,6 @@ expectInvoke "peer0.org1.example.com" "my-channel1" "chaincode1" \
   '{"Args":["KVContract:put", "name", "James Bond"]}' \
   '{\"success\":\"OK\"}'
 
-
 # Test export-network-topology to Mermaid
 cp -f "$FABLO_HOME/samples/fablo-config-hlf2-1org-1chaincode.json" "$TEST_TMP/simple-config.json"
 (cd "$TEST_TMP" && "$FABLO_HOME/fablo.sh" export-network-topology simple-config.json simple-network-topology.mmd)

e2e-network/docker/test-04-v2-snapshot.sh

@@ -111,6 +111,7 @@ hook_command="perl -i -pe 's/FABRIC_VERSION=2\.3\.3/FABRIC_VERSION=2\.4\.2/g' ./
     "$FABLO_HOME/fablo.sh" prune &&
     "$FABLO_HOME/fablo.sh" restore "$snapshot_name" "$hook_command" &&
     "$FABLO_HOME/fablo.sh" start
+    "$FABLO_HOME/fablo.sh" chaincodes install
 )
 
 waitForContainer "explorer.example.com" "Successfully created channel event hub for \[my-channel1\]" "200"
@@ -129,3 +130,5 @@ expectInvokeRest "$fablo_rest_org1 $user_token" "my-channel1" "chaincode1" \
 expectInvokeRest "$fablo_rest_org1 $user_token" "my-channel1" "chaincode1" \
   "KVContract:getPrivateMessage" '["_implicit_org_Org1MSP"]' \
   '{"success":"RHIgVmljdG9yIEZyaWVz"}'
+
+echo "✅ Test passed!"

e2e-network/docker/test-05-v3.sh

@@ -109,11 +109,11 @@ expectInvoke "peer1.org1.example.com" "my-channel1" "chaincode1" \
 expectCommand "cat \"$TEST_TMP/newest.block\"" "KVContract:get"
 
 (cd "$TEST_TMP" && "$FABLO_HOME/fablo.sh" channel fetch 3 my-channel1 org1 peer1 "another.block")
-expectCommand "cat \"$TEST_TMP/another.block\"" "KVContract:put"
+expectCommand "cat \"$TEST_TMP/another.block\"" "put"
 
 (cd "$TEST_TMP" && "$FABLO_HOME/fablo.sh" channel fetch config my-channel1 org1 peer1 "channel-config.json")
 expectCommand "cat \"$TEST_TMP/channel-config.json\"" "\"mod_policy\": \"Admins\","
 
-expectCommand "(cd \"$TEST_TMP\" && \"$FABLO_HOME/fablo.sh\" channel getinfo my-channel1 org1 peer1)" "\"height\":5"
+expectCommand "(cd \"$TEST_TMP\" && \"$FABLO_HOME/fablo.sh\" channel getinfo my-channel1 org1 peer1)" "\"height\":6"
 
 echo "🎉 Test passed! 🎉"