Merge branch 'hpsh' into test-release

Conflicts:
	CMakeLists.txt
	test/docker/Dockerfile.ubt.20.04
	test/docker/build.sh
	test/local-cluster/Dockerfile

test/docker/Dockerfile.ubt.20.04

@@ -13,6 +13,6 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/* \
     && mkdir /usr/local/bin/hotpocket
 
-COPY hpcore hpfs hpws evernode-license.pdf /usr/local/bin/hotpocket/
+COPY hpcore hpfs hpws hpsh evernode-license.pdf /usr/local/bin/hotpocket/
 
 ENTRYPOINT ["/usr/local/bin/hotpocket/hpcore"]

test/docker/build.sh

@@ -8,7 +8,7 @@ njsfile="Dockerfile.ubt.20.04-njs"
 
 # Prepare build context
 tmp=$(mktemp -d)
-cp $hpcoredir/build/hpcore $hpcoredir/test/bin/{hpfs,hpws,libblake3.so} $hpcoredir/evernode-license.pdf $tmp/
+cp $hpcoredir/build/hpcore $hpcoredir/test/bin/{hpfs,hpws,hpsh,libblake3.so} $hpcoredir/evernode-license.pdf $tmp/
 strip $tmp/hpcore
 
 # Remove the revision component from hp version to make up the image version.

test/local-cluster/Dockerfile

@@ -2,7 +2,7 @@
 FROM evernode/hotpocket:latest-ubt.20.04-njs.20
 
 # Copy (overwrite) the local build outputs into the docker image.
-COPY hpcore hpfs hpws evernode-license.pdf /usr/local/bin/hotpocket/
+COPY hpcore hpfs hpws hpsh evernode-license.pdf /usr/local/bin/hotpocket/
 
 ENTRYPOINT ["/usr/local/bin/hotpocket/hpcore"]
 

test/local-cluster/cluster-create.sh

@@ -16,6 +16,7 @@ fi
 ncount=$1
 loglevel=$2
 roundtime=$3
+fallback_enabled=$4
 hpcore=$(realpath ../..)
 iprange="172.1.1"
 
@@ -51,7 +52,7 @@ elif [ "$CONTRACT" = "diag" ]; then # Diagnostic contract
 else # nodejs echo contract (default)
     echo "Using nodejs echo contract."
     pushd $hpcore/examples/nodejs_contract/ > /dev/null 2>&1
-    npm install
+    npm install	
     npm run build-echo
     popd > /dev/null 2>&1
     copyfiles="$hpcore/examples/nodejs_contract/dist/echo-contract/index.js"
@@ -65,6 +66,9 @@ fi
 if [ "$roundtime" = "" ]; then
     roundtime=1000
 fi
+if [ "$fallback_enabled" != "true" ]; then
+    fallback_enabled=false
+fi
 
 # Delete and recreate 'hpcluster' directory.
 sudo rm -rf hpcluster > /dev/null 2>&1
@@ -115,7 +119,10 @@ do
                     consensus: { \
                         ...require('./tmp.json').contract.consensus, \
                         mode: 'public', \
-                        roundtime: $roundtime \
+                        roundtime: $roundtime,\
+                        fallback: { \
+                            execute: $fallback_enabled \
+                        } \
                     }, \
                     npl: { \
                         mode: 'public' \

test/local-cluster/cluster-start.sh

@@ -14,7 +14,7 @@ fi
 
 clusterloc=$(pwd)/hpcluster
 n=$1
-hpversion=0.6.4
+hpversion=0.6.5
 
 let pubport=8080+$n
 let peerport=22860+$n

test/local-cluster/consensus-test-continuous.sh

@@ -5,7 +5,7 @@ WINDOWSIZE=60 # size of window in seconds to examine for successful consensus ro
 PIPE=concon.pipe
 clusterloc=$(pwd)/hpcluster
 n=1
-hpversion=0.6.4
+hpversion=0.6.5
 let pubport=8080+$n
 while true; do
     

test/local-cluster/consensus-test-loop.sh

@@ -3,7 +3,7 @@
 
 clusterloc=$(pwd)/hpcluster
 n=1
-hpversion=0.6.4
+hpversion=0.6.5
 let pubport=8080+$n
 while true; do
     CONSENSUS="0"

test/local-cluster/rundir.sh

@@ -15,7 +15,7 @@ fi
 dir=$(realpath $1)
 dirname=$(basename  $dir)
 n=$1
-hpversion=0.6.4
+hpversion=0.6.5
 
 let pubport=8080