Feat/ccaas

.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

.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                                   | ✓         | ✓         |            |          |                 |
 | Go                                     | ✓         | ✓         |            |          |                 |
 | Java                                   | ✓         | ✓         |            |          |                 |
-| Chaincode-as-a-Service (CCaaS)         | ✕         | ✕         |            |          |                 |
+| Chaincode-as-a-Service (CCaaS)         | ✓         | ✕         |            |  [04_v2](/e2e-network/docker/test-04-v2-snapshot.sh)        |                 |
 | Endorsement Policies                   | ✓         | ✓         |            |          |                 |
 | Multi-org Endorsements                 | ✓         | ✓         |            |          |                 |
 | Private Data Collections               | ✓         | ✓         |            |          |                 |

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

@@ -49,7 +49,7 @@ trap 'networkDown ; echo "Test failed" ; exit 1' ERR SIGINT
 networkUp
 
 waitForContainer "orderer0.group1.orderer.example.com" "Created and started new.*my-channel1"
-waitForContainer "ca.org1.example.com" "Listening on http://0.0.0.0:7054"
+waitForContainer "ca.org1.example.com" "Listening on https://0.0.0.0:7054"
 waitForContainer "peer0.org1.example.com" "Joining gossip network of channel my-channel1 with 1 organizations"
 waitForContainer "peer1.org1.example.com" "Joining gossip network of channel my-channel1 with 1 organizations"
 waitForContainer "peer0.org1.example.com" "Learning about the configured anchor peers of Org1MSP for channel my-channel1"
@@ -91,11 +91,4 @@ 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)
-expectCommand "head -n 1 \"$TEST_TMP/simple-network-topology.mmd\"" "graph TD"
-expectCommand "cat \"$TEST_TMP/simple-network-topology.mmd\"" "Org_Orderer"
-expectCommand "cat \"$TEST_TMP/simple-network-topology.mmd\"" "Org_Org1"
-expectCommand "cat \"$TEST_TMP/simple-network-topology.mmd\"" "Channel_my_channel1"
+echo "✅ Test passed!"

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.sh

@@ -0,0 +1,93 @@
+#!/usr/bin/env bash
+
+set -eux
+
+TEST_TMP="$(rm -rf "$0.tmpdir" && mkdir -p "$0.tmpdir" && (cd "$0.tmpdir" && pwd))"
+TEST_LOGS="$(mkdir -p "$0.logs" && (cd "$0.logs" && pwd))"
+FABLO_HOME="$TEST_TMP/../../.."
+
+CONFIG="$FABLO_HOME/samples/fablo-config-hlf3-1orgs-1chaincode.json"
+
+networkUp() {
+  "$FABLO_HOME/fablo-build.sh"
+  (cd "$TEST_TMP" && "$FABLO_HOME/fablo.sh" generate "$CONFIG")
+  (cd "$TEST_TMP" && "$FABLO_HOME/fablo.sh" up)
+}
+
+dumpLogs() {
+  echo "Saving logs of $1 to $TEST_LOGS/$1.log"
+  mkdir -p "$TEST_LOGS"
+  docker logs "$1" >"$TEST_LOGS/$1.log" 2>&1
+}
+
+networkDown() {
+  rm -rf "$TEST_LOGS"
+  (for name in $(docker ps --format '{{.Names}}'); do dumpLogs "$name"; done)
+  dumpLogs orderer0.group1.orderer.example.com
+  (cd "$TEST_TMP" && "$FABLO_HOME/fablo.sh" down)
+}
+
+waitForContainer() {
+  sh "$TEST_TMP/../wait-for-container.sh" "$1" "$2"
+}
+
+waitForChaincode() {
+  (cd "$TEST_TMP" && sh ../wait-for-chaincode.sh "$1" "$2" "$3" "$4") 
+}
+
+expectInvoke() {
+  (cd "$TEST_TMP" && sh ../expect-invoke-cli.sh "$1" "$2" "$3" "$4" "$5" "$6")
+}
+
+expectCommand() {
+  sh "$TEST_TMP/../expect-command.sh" "$1" "$2"
+}
+
+trap networkDown EXIT
+trap 'networkDown ; echo "Test failed" ; exit 1' ERR SIGINT
+
+# start the network
+networkUp
+
+waitForContainer "orderer0.group1.orderer.example.com" "Created and started new.*my-channel1"
+waitForContainer "ca.org1.example.com" "Listening on http://0.0.0.0:7054"
+waitForContainer "peer0.org1.example.com" "Joining gossip network of channel my-channel1 with 1 organizations"
+waitForContainer "peer1.org1.example.com" "Joining gossip network of channel my-channel1 with 1 organizations"
+waitForContainer "peer0.org1.example.com" "Learning about the configured anchor peers of Org1MSP for channel my-channel1"
+waitForContainer "peer0.org1.example.com" "Anchor peer.*with same endpoint, skipping connecting to myself"
+waitForContainer "peer0.org1.example.com" "Membership view has changed. peers went online:.*peer1.org1.example.com:7042"
+waitForContainer "peer1.org1.example.com" "Learning about the configured anchor peers of Org1MSP for channel my-channel1"
+waitForContainer "peer1.org1.example.com" "Membership view has changed. peers went online:.*peer0.org1.example.com:7041"
+
+# Test simple chaincode
+expectInvoke "peer0.org1.example.com" "my-channel1" "chaincode1" \
+  '{"Args":["KVContract:put", "name", "Willy Wonka"]}' \
+  '{\"success\":\"OK\"}'
+expectInvoke "peer1.org1.example.com" "my-channel1" "chaincode1" \
+  '{"Args":["KVContract:get", "name"]}' \
+  '{\"success\":\"Willy Wonka\"}'
+
+# Verify channel query scripts
+(cd "$TEST_TMP" && "$FABLO_HOME/fablo.sh" channel fetch newest my-channel1 org1 peer1)
+expectCommand "cat \"$TEST_TMP/newest.block\"" "KVContract:get"
+
+(cd "$TEST_TMP" && "$FABLO_HOME/fablo.sh" channel fetch 4 my-channel1 org1 peer1 "another.block")
+expectCommand "cat \"$TEST_TMP/another.block\"" "KVContract: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\":6"
+
+# Reset and ensure the state is lost after reset
+(cd "$TEST_TMP" && "$FABLO_HOME/fablo.sh" reset)
+waitForChaincode "peer0.org1.example.com" "my-channel1" "chaincode1" "0.0.1"
+waitForChaincode "peer1.org1.example.com" "my-channel1" "chaincode1" "0.0.1"
+expectInvoke "peer0.org1.example.com" "my-channel1" "chaincode1" \
+  '{"Args":["KVContract:get", "name"]}' \
+  '{\"error\":\"NOT_FOUND\"}'
+
+# Put some data again
+expectInvoke "peer0.org1.example.com" "my-channel1" "chaincode1" \
+  '{"Args":["KVContract:put", "name", "James Bond"]}' \
+  '{\"success\":\"OK\"}'