update to M4

Author: electronix

DockerfileM4

@@ -37,8 +37,8 @@ ENV sdk_bin https://download.01.org/intel-sgx/linux-2.5/ubuntu18.04-server/sgx_l
 ENV psw_deb https://download.01.org/intel-sgx/linux-2.5/ubuntu18.04-server/libsgx-enclave-common_2.5.101.50123-bionic1_amd64.deb
 ENV psw_dev_deb https://download.01.org/intel-sgx/linux-2.5/ubuntu18.04-server/libsgx-enclave-common-dev_2.5.101.50123-bionic1_amd64.deb
 ENV psw_dbgsym_deb https://download.01.org/intel-sgx/linux-2.5/ubuntu18.04-server/libsgx-enclave-common-dbgsym_2.5.101.50123-bionic1_amd64.ddeb
-ENV substratee_node https://github.com/scs/substraTEE-node/archive/master.zip       # FIXME: update to M4
-ENV substratee_worker https://github.com/scs/substraTEE-worker/archive/master.zip   # FIXME: update to M4
+ENV substratee_node https://github.com/scs/substraTEE-node/archive/M4.zip
+ENV substratee_worker https://github.com/scs/substraTEE-worker/archive/M4.zip
 ENV rust_toolchain nightly
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TERM xterm
@@ -99,12 +99,12 @@ RUN /root/.cargo/bin/rustup install nightly-2019-05-21 && \
 # init the rust environment
 RUN source /opt/sgxsdk/environment && \
     source /root/.cargo/env && \
-    /substraTEE/substraTEE-node-master/scripts/init.sh
+    /substraTEE/substraTEE-node-M4/scripts/init.sh
 
 # build the substraTEE-node
 RUN source /opt/sgxsdk/environment && \
     source /root/.cargo/env && \
-    cd /substraTEE/substraTEE-node-master && \
+    cd /substraTEE/substraTEE-node-M4 && \
     ./scripts/build.sh && \
     cargo build --release
 
@@ -114,15 +114,15 @@ RUN source /opt/sgxsdk/environment && \
     source /root/.cargo/env && \
     /root/.cargo/bin/rustup default nightly && \
     /root/.cargo/bin/rustup target add wasm32-unknown-unknown && \
-    cd /substraTEE/substraTEE-worker-master && \
+    cd /substraTEE/substraTEE-worker-M4 && \
     /root/.cargo/bin/rustup override set nightly-2019-05-22 && \
     make
 
 # copy the shell scripts to the docker to launch to node and the workers
 COPY scriptsM4/* /substraTEE/
 
 # copy the certificates for the RA
-COPY intel_cert/* /substraTEE/substraTEE-worker-master/bin/
+COPY intel_cert/* /substraTEE/substraTEE-worker-M4/bin/
 
 # install ipfs
 RUN mkdir /ipfs && \

M4.sh

@@ -74,13 +74,13 @@ then
         \"/substraTEE/start_worker2.sh\"" Enter
 
     # start the substratee-client in pane 2
-    # tmux send-keys -t2 "docker run -ti \
-    #     --device /dev/isgx \
-    #     -v $(pwd)/output:/substraTEE/output \
-    #     -v $(pwd)/rust-sgx-sdk:/root/sgx \
-    #     -v /var/run/aesmd:/var/run/aesmd \
-    #     substratee \
-    #     \"/substraTEE/start_client.sh\"" Enter
+    tmux send-keys -t2 "docker run -ti \
+        --ip=192.168.10.30 \
+        --network=substratee-net \
+        -v $(pwd)/output:/substraTEE/output \
+        -v /home/marcel/substraTEE-worker:/substraTEE/worker_local \
+        substratee \
+        \"/substraTEE/start_client.sh\"" Enter
 fi
 
 # Attach to session

scriptsM4/start_client.sh

@@ -6,23 +6,21 @@ clear
 sleep 30s
 
 # start the client and send first transaction
-cd /substraTEE/substraTEE-worker-master/bin
-./substratee_client -p 9977 2>&1 | tee /substraTEE/output/client_first.log
+cd /substraTEE/substraTEE-worker-M4/bin
+./substratee_client -p 9977 -s 192.168.10.10 2>&1 | tee /substraTEE/output/client_first.log
 
 # wait until worker 2 registered
 sleep 10s
 
 # start the client and send second transaction
-cd /substraTEE/substraTEE-worker-master/bin
-./substratee_client -p 9977 2>&1 | tee /substraTEE/output/client_second.log
+cd /substraTEE/substraTEE-worker-M4/bin
+./substratee_client -p 9977 -s 192.168.10.10 2>&1 | tee /substraTEE/output/client_second.log
 
 # wait until transaction is processed
 sleep 20s
 
 # query the counter
-cd /substraTEE/substraTEE-worker-master/bin
-./substratee_client -p 9977 getcounter 2>&1 | tee /substraTEE/output/client_counter.log
-
-echo "Client finished"
+cd /substraTEE/substraTEE-worker-M4/bin
+./substratee_client -p 9977 -s 192.168.10.10 getcounter 2>&1 | tee /substraTEE/output/client_counter.log
 
 read -p "Press enter to continue"

scriptsM4/start_node.sh

@@ -5,4 +5,4 @@ clear
 
 # start the dev node
 #  with specific ws-port and listening to external connections
-/substraTEE/substraTEE-node-master/target/release/substratee-node --dev --ws-port 9977 --ws-external 2>&1 | tee /substraTEE/backup/node.log
+/substraTEE/substraTEE-node-M4/target/release/substratee-node --dev --ws-port 9977 --ws-external 2>&1 | tee /substraTEE/backup/node.log

scriptsM4/start_worker1.sh

@@ -10,13 +10,8 @@ ipfs daemon > /substraTEE/output/ipfs_daemon1.log &
 # allow the node to get ready
 sleep 3s
 
-# copy from the local build
-# FIXME: remove this step
-cp -R worker_local/bin/bin ./bin
-cd bin
-
 # start the worker 1
-# cd /substraTEE/substraTEE-worker-master/bin
+cd /substraTEE/substraTEE-worker-M4/bin
 ./substratee_worker getsignkey 2>&1 | tee /substraTEE/output/worker1_getsignkey.log
 ./substratee_worker getpublickey 2>&1 | tee /substraTEE/output/worker1_getpublickey.log
 ./substratee_worker -p 9977 -w 9111 -r 8111 --ns 192.168.10.10 --ws 192.168.10.21 worker 2>&1 | tee /substraTEE/output/worker1.log

scriptsM4/start_worker2.sh

@@ -10,13 +10,8 @@ ipfs daemon > /substraTEE/output/ipfs_daemon2.log &
 # wait until the worker 1 and the client have interacted
 sleep 1m
 
-# copy from the local build
-# FIXME: remove this step
-cp -R worker_local/bin/bin ./bin
-cd bin
-
 # start the worker 2
-# cd /substraTEE/substraTEE-worker-master/bin
+cd /substraTEE/substraTEE-worker-M4/bin
 ./substratee_worker getsignkey 2>&1 | tee /substraTEE/output/worker2_getsignkey.log
 ./substratee_worker getpublickey 2>&1 | tee /substraTEE/output/worker2_getpublickey.log
 ./substratee_worker -p 9977 -w 9112 -r 8112 --ns 192.168.10.10 --ws 192.168.10.22 worker 2>&1 | tee /substraTEE/output/worker2.log