From 1da6053acfbc9dc01e4d425e2f285f5557165fe5 Mon Sep 17 00:00:00 2001
From: Valentyn Faychuk <valy@detee.ltd>
Date: Sun, 22 Dec 2024 17:43:20 +0200
Subject: [PATCH] build scripts

---
 docker/challenge.Dockerfile | 5 +++--
 docker/challenge.sh         | 2 --
 scripts/build-container.sh  | 2 +-
 scripts/testnet.sh          | 4 ++--
 src/datastore.rs            | 2 +-
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/docker/challenge.Dockerfile b/docker/challenge.Dockerfile
index 0551a04..ab01f6a 100644
--- a/docker/challenge.Dockerfile
+++ b/docker/challenge.Dockerfile
@@ -17,6 +17,7 @@ COPY --from=build /opt/occlum/build/bin/occlum-run /opt/occlum/build/bin/occlum-
 COPY --from=build /opt/occlum/build/bin/occlum /usr/bin/occlum
 COPY --from=build /sgx_libs /sgx_libs
 RUN cp /sgx_libs/* /usr/lib/x86_64-linux-gnu/
+RUN tar -xzf /challenge.tar.gz && cp /challenge.sh /challenge/challenge.sh
 
-WORKDIR /
-ENTRYPOINT ["/challenge.sh"]
+WORKDIR /challenge
+ENTRYPOINT ["/challenge/challenge.sh"]
diff --git a/docker/challenge.sh b/docker/challenge.sh
index 1d00ed4..0254423 100755
--- a/docker/challenge.sh
+++ b/docker/challenge.sh
@@ -2,8 +2,6 @@
 
 # This script is the entrypoint of the challenge container
 
-tar -xzf challenge.tar.gz && cd challenge
-
 if [ -z "${INIT_NODES}" ]; then
   echo "The INIT_NODES environment variable is not set."
 else
diff --git a/scripts/build-container.sh b/scripts/build-container.sh
index fc6d61b..2c21d3d 100755
--- a/scripts/build-container.sh
+++ b/scripts/build-container.sh
@@ -14,7 +14,7 @@ fi
 
 cd docker
 cp ../challenge_instance/challenge.tar.gz challenge.tar.gz
-docker build -f challenge.Dockerfile -t hacker-challenge:latest .
+docker build -f challenge.Dockerfile -t detee/hacker-challenge:latest .
 cd ..
 
 echo "Container named 'hacker-challenge' built"
diff --git a/scripts/testnet.sh b/scripts/testnet.sh
index df8c0eb..682a039 100755
--- a/scripts/testnet.sh
+++ b/scripts/testnet.sh
@@ -41,7 +41,7 @@ echo "Waiting for the network root to start"
 docker run --device /dev/sgx/enclave \
            --device /dev/sgx/provision \
            --name "hacker-challenge" \
-           -d hacker-challenge:latest
+           -d detee/hacker-challenge:latest
 while true; do
     echo -n "." && sleep 1
     docker logs hacker-challenge | grep -q "SOL" && echo && break
@@ -62,7 +62,7 @@ for p in {31311..31320}; do
                --env INIT_NODES="172.17.0.2 172.17.0.3 172.17.0.4" \
                -v "/tmp/hacker-challenge${p}:/challenge/main" \
                --name "hacker-challenge${p}" -p "${p}:31372" \
-               -d hacker-challenge:latest
+               -d detee/hacker-challenge:latest
 done
 sleep 15 # Wait for the cluster to start
 
diff --git a/src/datastore.rs b/src/datastore.rs
index dbc1a18..73e6bab 100644
--- a/src/datastore.rs
+++ b/src/datastore.rs
@@ -26,7 +26,7 @@ pub struct NodeInfo {
 
 impl NodeInfo {
     pub fn is_newer_than(&self, older_self: &Self) -> bool {
-        self > older_self
+        self.keepalive > older_self.keepalive
     }
 
     pub fn to_json(&self) -> String {