Upgrade CCF version 1.0.19 to 4.0.1 for use by PDO TP. #443

prakashngit · 2023-06-16T04:12:33Z

Work in progress. Currently supports local deployment of CCF TP on bare metal, and usage with PDO. Tested on Ubuntu 20.04 on an Azure VM. Not tested behind proxy.

Please see ledgers/ccf/README_CCF_v4.md for usage instructions.

… in progress. Please see README_CCF_v4.md for usage instructions Signed-off-by: Ubuntu <ccf@prakash-services.ngrbedaihgkeramjr13nhjagoc.bx.internal.cloudapp.net>

cmickeyb · 2023-06-16T16:45:44Z

ledgers/ccf/README_CCF_v4.md

+cp service_cert.pem networkcert.pem
+cp member0_cert.pem memberccf_cert.pem
+cp member0_privk.pem memberccf_privk.pem
+```


why are you putting the keys into the source tree rather than the deployment tree?

Please ignore the deployment model used in this PR. This PR's sole purpose is to get you to a quick working ledger for local development. I need to fix deployment and docker to make the PR move beyond draft.

cmickeyb · 2023-06-16T16:47:10Z

ledgers/ccf/scripts/fetch_ledger_authority.py


-    network_cert = config["start"]["network-cert-file"]


will look at the full logic later... but this does not look like the right flow. you've changed the way we are doing things. maybe we should have a config file that we use for our deployment since we are moving away from the cchost.toml file.

same answer as above. The final PR will not have this new flow, we will use cchost to start the network and use the configure.py to carry out all member steps. cchost API, config/governance templates all have changed, which I need to understand before I can move away from the "sandbox" model to "deployment model", Thanks.

…th what currently exists for v1.0.19 Signed-off-by: Ubuntu <ccf@prakash-services.ngrbedaihgkeramjr13nhjagoc.bx.internal.cloudapp.net>

In order to get the new CCF to run with the sandbox script several changes needed to be made. Most importantly, the ledger URL must be specified with an IP address, not a domain name. Second, the docker build process is slightly changed to accommodate the lack of a configuration step in the new build process. As part of that update, the dependency on PDO_LEDGER_URL environment variable for configuration is removed and the scripts for configuring the CCF instance now take explicit host/port parameters. As part of the update a lot of old unused code was removed from those scripts. Right now the code assumes that the creation of the ledger keys by the CCF node is a sufficient indicator that the node is ready. Some additional checks are in the generate_ledger_authority script which should be the first called after CCF is started. These checks should be added to the other scripts as well. Signed-off-by: Mic Bowman <mic.bowman@intel.com>

Added a new function for forcing name/address to an ip address. This is useful since CCF requires ledger URLs and interfaces to be specified as IP addresses. Pushed changes to use the new function into the docker tools and the script to start CCF. Signed-off-by: Mic Bowman <mic.bowman@intel.com>

bvavala

looks good, just a couple of comments

bvavala · 2023-07-05T18:58:10Z

docker/ccf_base.yaml

@@ -30,7 +30,7 @@ services:
    network_mode: "host"
    volumes:
      - ./xfer/:/project/pdo/xfer/
-    entrypoint: /project/pdo/tools/start_ccf.sh
+    # entrypoint: /project/pdo/tools/start_ccf.sh


bvavala · 2023-07-05T19:02:48Z

docker/tools/run_ccf_tests.sh

+# # -----------------------------------------------------------------
+# yell configure services for host $PDO_HOSTNAME and ledger $PDO_LEDGER_URL
+# # -----------------------------------------------------------------
+# rm -f ${PDO_HOME}/ccf/etc/cchost.toml ${PDO_HOME}/ccf/etc/constitution.js
+# try make -C ${PDO_SOURCE_ROOT}/ledgers/ccf keys
+# try make -C ${PDO_SOURCE_ROOT}/ledgers/ccf config


bvavala · 2023-07-05T19:04:10Z

docker/tools/start_ccf.sh

+# if [ "${F_MODE,,}" == "build" ]; then
+#     yell configure services for host $PDO_HOSTNAME and ledger $PDO_LEDGER_URL
+#     try make -C ${PDO_SOURCE_ROOT}/ledgers/ccf keys
+#     try make -C ${PDO_SOURCE_ROOT}/ledgers/ccf config
+# elif [ "${F_MODE,,}" == "copy" ]; then
+#     yell copy the configuration from xfer/ccf/etc and xfer/ccf/keys
+#     try cp ${XFER_DIR}/ccf/etc/* ${PDO_HOME}/ccf/etc/
+#     try cp ${XFER_DIR}/ccf/keys/* ${PDO_LEDGER_KEY_ROOT}/
+# elif [ "${F_MODE,,}" == "skip" ]; then
+#     yell restart with existing configuration
+# else
+#     die "invalid restart mode; ${F_MODE}"
+# fi


bvavala · 2023-07-05T19:33:20Z

ledgers/ccf/scripts/start_ccf_network.sh


 sleep 5

-say configure ccf network : ACK the member, open network, add user
-try ${F_SERVICEHOME}/bin/configure_ccf_network.py --logfile __screen__ --loglevel WARNING
+while [ ! -f ${PDO_HOME}/ccf/workspace/sandbox_common/service_cert.pem ]; do


The while condition should cover all the ledger keys that are copied later.

maybe though I really don't think so. all this is deciding is when it is reasonable to move to the next step. its not a correctness test. not sure there is any value in adding the extra checks. they are written (more or less) atomically.

ledgers/ccf/scripts/start_ccf_network.sh

marcelamelara

Thanks! Super minor nits only.

ledgers/ccf/CMakeLists.txt

ledgers/ccf/scripts/stop_cchost.sh

Fixed spelling issue, removed commented code, and (only functional change) added one more check for port availability before starting the CCF services. Signed-off-by: Mic Bowman <mic.bowman@intel.com>

bvavala

looks good

Draft PR: Upgrade CCF version 1.0.19 to 4.0.1 for use by PDO TP. Work…

9f9fcfb

… in progress. Please see README_CCF_v4.md for usage instructions Signed-off-by: Ubuntu <ccf@prakash-services.ngrbedaihgkeramjr13nhjagoc.bx.internal.cloudapp.net>

cmickeyb reviewed Jun 16, 2023

View reviewed changes

Bare metal installation of PDO TP for CCF version 4.0.1 consistent wi…

14369dd

…th what currently exists for v1.0.19 Signed-off-by: Ubuntu <ccf@prakash-services.ngrbedaihgkeramjr13nhjagoc.bx.internal.cloudapp.net>

cmickeyb force-pushed the Prakash.CCF_upgrade_to_v4 branch 2 times, most recently from 03101b8 to b4a2fea Compare June 27, 2023 15:02

cmickeyb force-pushed the Prakash.CCF_upgrade_to_v4 branch from 34c897d to 8965e14 Compare June 27, 2023 16:46

cmickeyb force-pushed the Prakash.CCF_upgrade_to_v4 branch from 11e7e45 to 0bda9a3 Compare June 28, 2023 15:26

marcelamelara marked this pull request as ready for review June 29, 2023 17:35

marcelamelara changed the title ~~Draft PR: Upgrade CCF version 1.0.19 to 4.0.1 for use by PDO TP.~~ Upgrade CCF version 1.0.19 to 4.0.1 for use by PDO TP. Jun 29, 2023

cmickeyb self-requested a review July 5, 2023 16:01

cmickeyb approved these changes Jul 5, 2023

View reviewed changes

cmickeyb requested review from bvavala and marcelamelara July 5, 2023 16:02

cmickeyb self-assigned this Jul 5, 2023

bvavala approved these changes Jul 5, 2023

View reviewed changes

marcelamelara approved these changes Jul 5, 2023

View reviewed changes

ledgers/ccf/CMakeLists.txt Show resolved Hide resolved

ledgers/ccf/scripts/stop_cchost.sh Outdated Show resolved Hide resolved

Mostly cosmetic changes for ccf related scripts

5ca59ff

Fixed spelling issue, removed commented code, and (only functional change) added one more check for port availability before starting the CCF services. Signed-off-by: Mic Bowman <mic.bowman@intel.com>

cmickeyb force-pushed the Prakash.CCF_upgrade_to_v4 branch from 53bc73b to 5ca59ff Compare July 6, 2023 19:41

cmickeyb requested a review from bvavala July 6, 2023 20:28

marcelamelara mentioned this pull request Jul 6, 2023

Upgrade all cmake dependencies to 3.22 #444

Open

bvavala approved these changes Jul 6, 2023

View reviewed changes

cmickeyb merged commit 041784e into hyperledger-labs:main Jul 6, 2023
4 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade CCF version 1.0.19 to 4.0.1 for use by PDO TP. #443

Upgrade CCF version 1.0.19 to 4.0.1 for use by PDO TP. #443

prakashngit commented Jun 16, 2023

cmickeyb Jun 16, 2023

prakashngit Jun 16, 2023

cmickeyb Jun 16, 2023

prakashngit Jun 16, 2023

bvavala left a comment

bvavala Jul 5, 2023

bvavala Jul 5, 2023

bvavala Jul 5, 2023

bvavala Jul 5, 2023

cmickeyb Jul 5, 2023

marcelamelara left a comment

bvavala left a comment

Upgrade CCF version 1.0.19 to 4.0.1 for use by PDO TP. #443

Upgrade CCF version 1.0.19 to 4.0.1 for use by PDO TP. #443

Conversation

prakashngit commented Jun 16, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bvavala left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

marcelamelara left a comment

Choose a reason for hiding this comment

bvavala left a comment

Choose a reason for hiding this comment