Docker: update docker configuration and fix wallet names

scripts/alphanet.sh

@@ -59,6 +59,7 @@ services:
     links:
       - node
     volumes:
+      - node_data:/var/run/tezos/node:ro
       - client_data:/var/run/tezos/client
     restart: on-failure
 

scripts/ci/create_docker_image.minimal.sh

@@ -33,7 +33,8 @@ cp -a "$build_dir"/hidapi-$hidapi_version-r0.apk \
 mkdir -p "$tmp_dir"/bin
 mkdir -p "$tmp_dir"/scripts
 container=$(docker create $build_image_name)
-for bin in tezos-client tezos-admin-client tezos-node; do
+for bin in tezos-client tezos-admin-client tezos-node \
+	   tezos-alpha-baker tezos-alpha-endorser tezos-alpha-accuser; do
     docker cp -L $container:/home/opam/tezos/$bin "$tmp_dir"/bin
 done
 cp -a "$script_dir"/docker/entrypoint.sh "$tmp_dir"/bin/

scripts/docker/entrypoint.inc.sh

@@ -43,18 +43,18 @@ wait_for_the_node_to_be_bootstraped() {
 
 launch_node() {
 
-    mkdir -p "$node_dir"
+    mkdir -p "$node_data_dir"
 
-    if [ ! -f "$node_dir/config.json" ]; then
+    if [ ! -f "$node_data_dir/config.json" ]; then
         echo "Configuring the node..."
         "$node" config init \
-                --data-dir "$node_dir" \
+                --data-dir "$node_data_dir" \
                 --rpc-addr ":$NODE_RPC_PORT" \
                 "$@"
     else
         echo "Updating the node configuration..."
         "$node" config update \
-                --data-dir "$node_dir" \
+                --data-dir "$node_data_dir" \
                 --rpc-addr ":$NODE_RPC_PORT" \
                 "$@"
     fi
@@ -76,16 +76,15 @@ launch_node() {
     fi
     if [ "$local_data_version" != "$image_version" ]; then
         echo "Removing outdated chain data..."
-        if [ -f "$node_dir/identities.json" ]; then \
-            mv "$node_dir/identities.json" /tmp
+        if [ -f "$node_data_dir/identities.json" ]; then \
+            mv "$node_data_dir/identities.json" /tmp
         fi
         rm -rf "$node_dir"/*
-        rm -rf "$client_dir/blockss"
-        rm -rf "$client_dir/noncess"
-        rm -rf "$client_dir/endorsementss"
-        rm -rf "$client_dir/endorsed_levels"
+        rm -rf "$client_dir/baking"
+        rm -rf "$client_dir/nonces"
+        rm -rf "$client_dir/endorsements"
         if [ -f "/tmp/identities.json" ]; then \
-            mv /tmp/identities.json "$node_dir/"
+            mv /tmp/identities.json "$node_data_dir/"
         fi
         cp "/usr/local/share/tezos/alphanet_version" \
            "$node_dir/alphanet_version"
@@ -94,28 +93,32 @@ launch_node() {
 
     # Generate a new identity if not present
 
-    if [ ! -f "$node_dir/identity.json" ]; then
+    if [ ! -f "$node_data_dir/identity.json" ]; then
         echo "Generating a new node identity..."
         "$node" identity generate 24. \
-                --data-dir "$node_dir"
+                --data-dir "$node_data_dir"
     fi
 
     configure_client
 
     # Launching the node
 
-    exec "$node" run --data-dir "$node_dir"
+    exec "$node" run --data-dir "$node_data_dir"
 
 }
 
 launch_baker() {
     configure_client
     wait_for_the_node_to_be_bootstraped
-    exec "$client" launch daemon --baking "$@"
+    exec "$baker" --base-dir "$client_dir" \
+         --addr "$NODE_HOST" --port "$NODE_RPC_PORT" \
+	 launch with context "$node_data_dir/context/"
 }
 
 launch_endorser() {
     configure_client
     wait_for_the_node_to_be_bootstraped
-    exec "$client" launch daemon --endorsement "$@"
+    exec "$endorser" --base-dir "$client_dir" \
+         --addr "$NODE_HOST" --port "$NODE_RPC_PORT" \
+	 launch
 }

scripts/docker/entrypoint.sh

@@ -12,9 +12,12 @@ bin_dir="$(cd "$(dirname "$0")" && echo "$(pwd -P)/")"
 node="/usr/local/bin/tezos-node"
 client="/usr/local/bin/tezos-client"
 admin_client="/usr/local/bin/tezos-admin-client"
+baker="/usr/local/bin/tezos-alpha-baker"
+endorser="/usr/local/bin/tezos-alpha-endorser"
 
 client_dir="$DATA_DIR/client"
 node_dir="$DATA_DIR/node"
+node_data_dir="$node_dir/data"
 
 . "$bin_dir/entrypoint.inc.sh"
 
@@ -49,4 +52,3 @@ Available commands:
 EOF
         ;;
 esac
-

src/proto_alpha/lib_delegate/client_baking_endorsement.ml

@@ -12,7 +12,7 @@ open Alpha_context
 
 include Logging.Make(struct let name = "client.endorsement" end)
 
-module State = Daemon_state.Make(struct let name = "endorsements" end)
+module State = Daemon_state.Make(struct let name = "endorsement" end)
 
 let get_signing_slots cctxt ?(chain = `Main) block delegate level =
   Alpha_services.Delegate.Endorsing_rights.get cctxt

src/proto_alpha/lib_delegate/client_baking_forge.ml

@@ -348,7 +348,7 @@ let forge_block cctxt ?(chain = `Main) block
 
 (** Worker *)
 
-module State = Daemon_state.Make(struct let name = "baking" end)
+module State = Daemon_state.Make(struct let name = "block" end)
 
 let previously_baked_level cctxt pkh new_lvl  =
   State.get cctxt pkh  >>=? function

src/proto_alpha/lib_delegate/client_baking_nonces.ml

@@ -21,7 +21,7 @@ let encoding : t Data_encoding.t =
        (req "block" Block_hash.encoding)
        (req "nonce" Nonce.encoding))
 
-let name = "nonces"
+let name = "nonce"
 
 let load (wallet : #Client_context.wallet) =
   wallet#load ~default:[] name encoding