commit

.dockerignore

@@ -39,4 +39,3 @@ src/bin_client/test/LOG.*
 .git
 .gitignore
 .gitlab-ci.yml
-

.gitignore

@@ -8,6 +8,13 @@ __pycache__
 /_build
 /_opam
 /_docker_build
+/docs/_build
+/docs/api/tezos-client.html
+/docs/api/tezos-admin-client.html
+/docs/api/tezos-signer.html
+/docs/api/tezos-accuser-alpha.html
+/docs/api/tezos-baker-alpha.html
+/docs/api/tezos-endorser-alpha.html
 
 /tzlibre-node
 /tzlibre-protocol-compiler
@@ -17,10 +24,16 @@ __pycache__
 /tzlibre-endorser-*
 /tzlibre-accuser-*
 /tzlibre-signer
+/tzlibre-sandbox
 
 /scripts/opam-test-all.sh.DONE
 /scripts/create_genesis/src
 
+/docs/introduction/readme.rst
+/docs/api/errors.rst
+/docs/api/rpc.rst
+/docs/api/p2p.rst
+
 /src/bin_client/test/LOG.*
 
 dune-project
@@ -38,4 +51,4 @@ dune-project
 *.rej
 *.orig
 
-.\#*
+.idea

Makefile

@@ -37,7 +37,7 @@ endif
 	   cp _build/default/src/proto_$$p/bin_accuser/main_accuser_$$p.exe tzlibre-accuser-`echo $$p | tr -- _ -` ; \
 	 done
 
-PROTOCOLS := 000_Ps9mPmXa 001_PtCJ7pwo 002_PsYLVpVv 003_PsWqDswK demo
+PROTOCOLS := 000_Ps9mPmXa 001_PtCJ7pwo 002_PsYLVpVv 003_PsddFKi3 004_PstsZhmG demo
 DUNE_INCS=$(patsubst %,src/proto_%/lib_protocol/dune.inc, ${PROTOCOLS})
 
 generate_dune: ${DUNE_INCS}
@@ -59,7 +59,30 @@ $(addsuffix .test,${PACKAGES}): %.test:
 	@dune build \
 	    @$(patsubst %/$*.opam,%,$(shell find src vendors -name $*.opam))/runtest
 
-build-test:
+doc-html: all
+	@dune build @doc
+	@./tzlibre-client -protocol PsddFKi32cMJ2qPjf43Qv5GDWLDPZb3T3bF6fLKiF5HtvHNU7aP man -verbosity 3 -format html | sed "s#${HOME}#\$$HOME#g" > docs/api/tzlibre-client.html
+	@./tzlibre-admin-client man -verbosity 3 -format html | sed "s#${HOME}#\$$HOME#g" > docs/api/tzlibre-admin-client.html
+	@./tzlibre-signer man -verbosity 3 -format html | sed "s#${HOME}#\$$HOME#g" > docs/api/tzlibre-signer.html
+	@./tzlibre-baker-alpha man -verbosity 3 -format html | sed "s#${HOME}#\$$HOME#g" > docs/api/tzlibre-baker-alpha.html
+	@./tzlibre-endorser-alpha man -verbosity 3 -format html | sed "s#${HOME}#\$$HOME#g" > docs/api/tzlibre-endorser-alpha.html
+	@./tzlibre-accuser-alpha man -verbosity 3 -format html | sed "s#${HOME}#\$$HOME#g" > docs/api/tzlibre-accuser-alpha.html
+	@mkdir -p $$(pwd)/docs/_build/api/odoc
+	@rm -rf $$(pwd)/docs/_build/api/odoc/*
+	@cp -r $$(pwd)/_build/default/_doc/* $$(pwd)/docs/_build/api/odoc/
+	@${MAKE} -C docs html
+	@echo '@media (min-width: 745px) {.content {margin-left: 4ex}}' >> $$(pwd)/docs/_build/api/odoc/_html/odoc.css
+	@sed -e 's/@media only screen and (max-width: 95ex) {/@media only screen and (max-width: 744px) {/' $$(pwd)/docs/_build/api/odoc/_html/odoc.css > $$(pwd)/docs/_build/api/odoc/_html/odoc.css2
+	@mv $$(pwd)/docs/_build/api/odoc/_html/odoc.css2  $$(pwd)/docs/_build/api/odoc/_html/odoc.css
+
+doc-html-and-linkcheck: doc-html
+	@${MAKE} -C docs all
+
+build-sandbox:
+	@dune build src/bin_flextesa/main.exe
+	@cp _build/default/src/bin_flextesa/main.exe tzlibre-sandbox
+
+build-test: build-sandbox
 	@dune build @buildtest
 
 test:
@@ -90,12 +113,15 @@ uninstall:
 
 clean:
 	@-dune clean
+	@-find . -name dune-project -delete
 	@-rm -f \
 		tzlibre-node \
 		tzlibre-client \
 		tzlibre-signer \
 		tzlibre-admin-client \
 		tzlibre-protocol-compiler \
 	  $(foreach p, $(active_protocol_versions), tzlibre-baker-$(p) tzlibre-endorser-$(p) tzlibre-accuser-$(p))
+	@-${MAKE} -C docs clean
+	@-rm -f docs/api/tzlibre-{baker,endorser,accuser}-alpha.html docs/api/tzlibre-{admin-,}client.html docs/api/tzlibre-signer.html
 
 .PHONY: all test build-deps docker-image clean

active_protocol_versions

@@ -1 +1 @@
-003-PsWqDswK
+004-PstsZhmG

composes/scripts/node.sh

@@ -5,4 +5,4 @@ if [ ! -f /root/.tzlibre-node/identity.json ]; then
     /tzlibre/tzlibre-node identity generate 26
 fi
 
-/tzlibre/tzlibre-node run --bootstrap-threshold=0 --net-addr=0.0.0.0:9732 --rpc-addr=0.0.0.0:8732
+/tzlibre/tzlibre-node run --bootstrap-threshold=0 --net-addr=0.0.0.0:9732 --rpc-addr=0.0.0.0:8732 --history-mode full

scripts/activate_protocol.sh

@@ -6,7 +6,7 @@ usage="Usage:
 $ ./scripts/activate_protocol.sh src/proto_004_PtDPBVyN
 Inserts the protocol in the right files of the build system to compile it
 If in master activates in addition to alpha.
-If in mainnet activates in addition to its predecessor, here proto_003_PsWqDswK."
+If in mainnet activates in addition to its predecessor, here proto_003_PsddFKi3."
 
 script_dir="$(cd "$(dirname "$0")" && echo "$(pwd -P)/")"
 cd "$script_dir"/..
@@ -18,13 +18,13 @@ fi
 
 is_mainnet () {
     # need to check a real file because of phantom git directories
-    if [ -f "src/proto_000_Ps9mPmXa/lib_protocol/src/TEZOS_PROTOCOL" ]
+    if [ -f "src/proto_000_Ps9mPmXa/lib_protocol/TEZOS_PROTOCOL" ]
     then return 0; else return 1; fi
 }
 
 new_version=$(basename $1 | awk -F'_' '{print $2}')
 new_hash=$(basename $1 | awk -F'_' '{print $3}')
-full_hash=$(jq .hash < $1/lib_protocol/src/TEZOS_PROTOCOL)
+full_hash=$(jq .hash < $1/lib_protocol/TEZOS_PROTOCOL)
 replacement=${new_version}-${new_hash}
 if [[ -z "${new_version}" || -z "${new_hash}" || -z "${full_hash}" ]] ; then
     echo "$usage"
@@ -84,6 +84,7 @@ if [[ "$ans" == "Y" || "$ans" == "y" || -z "$ans" ]]; then
         { if (!found){print}}
        }}' src/lib_base/block_header.ml
 
-    sed -i '/let forced_protocol_upgrades/ a \ \ 3l, Protocol_hash.of_b58check_exn '${full_hash}' ;' \
+    sed -i.old '/let forced_protocol_upgrades/ a \ \ 3l, Protocol_hash.of_b58check_exn '${full_hash}' ;' \
         src/lib_base/block_header.ml
+    rm src/lib_base/block_header.ml.old
 fi

scripts/alphanet.sh

@@ -59,8 +59,32 @@ services:
       - client_data:/var/run/tezos/client
     restart: on-failure
 
+  upgrader:
+    image: $docker_image
+    hostname: node
+    command: tezos-upgrade-storage
+    volumes:
+      - node_data:/var/run/tezos/node
+      - client_data:/var/run/tezos/client
+
+EOF
+
+if [ -n "$local_snapshot_path" ]; then
+    cat >> "$docker_compose_yml" <<EOF
+
+  importer:
+    image: $docker_image
+    hostname: node
+    command: tezos-snapshot-import
+    volumes:
+      - node_data:/var/run/tezos/node
+      - client_data:/var/run/tezos/client
+      - $local_snapshot_path:/snapshot
+
 EOF
 
+fi
+
 for proto in $(cat "$active_protocol_versions") ; do
 
     cat >> "$docker_compose_yml" <<EOF
@@ -101,6 +125,43 @@ for proto in $(cat "$active_protocol_versions") ; do
       - client_data:/var/run/tezos/client
     restart: on-failure
 
+  baker-$proto-test:
+    image: $docker_image
+    hostname: baker-$proto-test
+    environment:
+      - PROTOCOL=$proto
+    command: tezos-baker-test --max-priority 128
+    links:
+      - node
+    volumes:
+      - node_data:/var/run/tezos/node:ro
+      - client_data:/var/run/tezos/client
+    restart: on-failure
+
+  endorser-$proto-test:
+    image: $docker_image
+    hostname: endorser-$proto-test
+    environment:
+      - PROTOCOL=$proto
+    command: tezos-endorser-test
+    links:
+      - node
+    volumes:
+      - client_data:/var/run/tezos/client
+    restart: on-failure
+
+  accuser-$proto-test:
+    image: $docker_image
+    hostname: accuser-$proto-test
+    environment:
+      - PROTOCOL=$proto
+    command: tezos-accuser-test
+    links:
+      - node
+    volumes:
+      - client_data:/var/run/tezos/client
+    restart: on-failure
+
 EOF
 
 done
@@ -286,12 +347,14 @@ stop_node() {
 
 check_baker() {
     update_active_protocol_version
-    bakers="$(sed s/^/baker-/g "$active_protocol_versions")"
-    docker_baker_containers="$(sed "s/^\(.*\)$/${docker_compose_name}_baker-\1_1/g" "$active_protocol_versions")"
-    res=$(docker inspect \
-                 --format="{{ .State.Running }}" \
-                 --type=container "$(container_name "$docker_baker_containers")" 2>/dev/null || echo false)
-    [ "$res" = "true" ]
+    bakers="$(sed "s/^\(.*\)$/baker-\1 baker-\1-test/g" "$active_protocol_versions")"
+    docker_baker_containers="$(sed "s/^\(.*\)$/${docker_compose_name}_baker-\1_1 ${docker_compose_name}_baker-\1-test_1/g" "$active_protocol_versions")"
+    for docker_baker_container in $docker_baker_containers; do
+        res=$(docker inspect \
+                     --format="{{ .State.Running }}" \
+                     --type=container "$(container_name "$docker_baker_container")" 2>/dev/null || echo false)
+        if ! [ "$res" = "true" ]; then return 1; fi
+    done
 }
 
 assert_baker() {
@@ -351,12 +414,14 @@ stop_baker() {
 
 check_endorser() {
     update_active_protocol_version
-    endorsers="$(sed s/^/endorser-/g "$active_protocol_versions")"
-    docker_endorser_containers="$(sed "s/^\(.*\)$/${docker_compose_name}_endorser-\1_1/g" "$active_protocol_versions")"
-    res=$(docker inspect \
-                 --format="{{ .State.Running }}" \
-                 --type=container "$(container_name "$docker_endorser_containers")" 2>/dev/null || echo false)
-    [ "$res" = "true" ]
+    endorsers="$(sed "s/^\(.*\)$/endorser-\1 endorser-\1-test/g" "$active_protocol_versions")"
+    docker_endorser_containers="$(sed "s/^\(.*\)$/${docker_compose_name}_endorser-\1_1 ${docker_compose_name}_endorser-\1-test_1/g" "$active_protocol_versions")"
+    for docker_endorser_container in $docker_endorser_containers; do
+        res=$(docker inspect \
+                     --format="{{ .State.Running }}" \
+                     --type=container "$(container_name "$docker_endorser_container")" 2>/dev/null || echo false)
+        if ! [ "$res" = "true" ]; then return 1; fi
+    done
 }
 
 assert_endorser() {
@@ -416,12 +481,14 @@ stop_endorser() {
 
 check_accuser() {
     update_active_protocol_version
-    accusers="$(sed s/^/accuser-/g "$active_protocol_versions")"
-    docker_accuser_containers="$(sed "s/^\(.*\)$/${docker_compose_name}_accuser-\1_1/g" "$active_protocol_versions")"
-    res=$(docker inspect \
-                 --format="{{ .State.Running }}" \
-                 --type=container "$(container_name "$docker_accuser_containers")" 2>/dev/null || echo false)
-    [ "$res" = "true" ]
+    accusers="$(sed "s/^\(.*\)$/accuser-\1 accuser-\1-test/g" "$active_protocol_versions")"
+    docker_accuser_containers="$(sed "s/^\(.*\)$/${docker_compose_name}_accuser-\1_1 ${docker_compose_name}_accuser-\1-test_1/g" "$active_protocol_versions")"
+    for docker_accuser_container in $docker_accuser_containers; do
+        res=$(docker inspect \
+                     --format="{{ .State.Running }}" \
+                     --type=container "$(container_name "$docker_accuser_container")" 2>/dev/null || echo false)
+        if ! [ "$res" = "true" ]; then return 1; fi
+    done
 }
 
 assert_accuser() {
@@ -528,6 +595,14 @@ status() {
     warn_script_uptodate verbose
 }
 
+snapshot_import() {
+    pull_image
+    local_snapshot_path="$1"
+    update_compose_file
+    call_docker_compose up importer
+    warn_script_uptodate
+}
+
 warn_script_uptodate() {
     if [[ $ALPHANET_EMACS ]]; then
        return
@@ -555,6 +630,14 @@ update_script() {
     fi
 }
 
+upgrade_node_storage() {
+    pull_image
+    local_snapshot_path="$1"
+    update_compose_file
+    call_docker_compose up upgrader
+    warn_script_uptodate
+}
+
 usage() {
     echo "Usage: $0 [GLOBAL_OPTIONS] <command> [OPTIONS]"
     echo "  Main commands:"
@@ -588,6 +671,8 @@ usage() {
     echo "       Replace 'alphanet.sh' with the one found in the docker image."
     echo "  Advanced commands:"
     echo "    $0 node <start|stop|status|log>"
+    echo "    $0 upgrade"
+    echo "    $0 snapshot import <snapshot_file>"
     echo "    $0 baker <start|stop|status|log>"
     echo "    $0 endorser <start|stop|status|log>"
     echo "    $0 shell"
@@ -713,6 +798,10 @@ case "$command" in
 
     ## Node
 
+    upgrade)
+        upgrade_node_storage
+        ;;
+
     node)
         subcommand="$1"
         if [ "$#" -eq 0 ] ; then usage ; exit 1;  else shift ; fi
@@ -733,6 +822,22 @@ case "$command" in
                 usage
                 exit 1
         esac ;;
+
+    ## Snapshot import
+
+    snapshot)
+        subcommand="$1"
+        if [ "$#" -ne 2 ] ; then usage ; exit 1;  else shift ; fi
+        snapshot_file="$1"
+        case "$subcommand" in
+            import)
+                snapshot_import "$snapshot_file"
+                ;;
+            *)
+                usage
+                exit 1
+        esac ;;
+
     ## Baker
 
     baker)

scripts/alphanet_version

@@ -1 +1 @@
-2019-05-22T07:06:38Z-betanetBLockGenesisGenesisGenesisGenesisGenesise1c5edSipZb
+2019-06-03T09:25:38Z-betanetBLockGenesisGenesisGenesisGenesisGenesised488cdRaAg