Merge branch 'develop' into bug/update-dependencies

.github/workflows/dockerimage.yml

-name: Build and push SGX container
+name: Build, test and push sgxwallet container
 
 on: [push]
 

.github/workflows/dockerimagesim.yml

-name: Build and push sim container
-
+name: Build, test and push sim mode container
 on: [push]
-
 jobs:
-
   build:
-
     runs-on: ubuntu-latest
-
     steps:
     - name: Login to docker
       env:
@@ -16,12 +11,12 @@ jobs:
     - uses: actions/checkout@v1
     - name: submodule update
       run: git submodule update --init --recursive
-    - name: Build the Docker image
-      run: docker build . --file DockerfileSimulation --tag  skalenetwork/sgxwalletsim:latest
-    - name: run docker image
-      run: docker run -v ${PWD}/sgx_data:/usr/src/sdk/sgx_data -d --network=host skalenetwork/sgxwalletsim:latest
-    - name: sleep and check
-      run: sleep 5; scripts/docker_test.py
-    - name: push docker image
-      run:  docker push skalenetwork/sgxwalletsim:latest
+    - name: build
+      run: python3 scripts/docker_build.py ${GITHUB_REF##*/} DockerfileSimulation sgxwalletsim
+    - name: test
+      run: python3 scripts/docker_test.py ${GITHUB_REF##*/} DockerfileSimulation sgxwalletsim
+    - name: push
+      run: python3 scripts/docker_test.py ${GITHUB_REF##*/} DockerfileSimulation sgxwalletsim
+
+
 

README.md

 # sgxwallet: SKALE SGX-based hardware crypto wallet
 
 [![Discord](https://img.shields.io/discord/534485763354787851.svg)](https://discord.gg/vvUtWJB)
-
 ## Intro
 
 **sgxwallet** is a next generation hardware secure crypto wallet that is based on **Intel SGX** technology. It currently supports **Ethereum** and **SKALE**, and will support **Bitcoin** in the future.
@@ -20,6 +19,10 @@ The administrator manually approves each registration.
 
 The sgxwallet server is still in active development and therefore should be regarded as _alpha software_. The development is still subject to security hardening, further testing, and breaking changes.  **This server has not yet been reviewed or audited for security.**
 
+![Build, test and push sgxwallet container](https://github.com/skalenetwork/sgxwallet/workflows/Build,%20test%20and%20push%20sgxwallet%20container/badge.svg)
+![Build, test and push sim mode container](https://github.com/skalenetwork/sgxwallet/workflows/Build,%20test%20and%20push%20sim%20mode%20container/badge.svg)
+
+
 Table of Contents
 =================
 

scripts/docker_build.py

+#!/usr/bin/env python
+
+# ------------------------------------------------------------------------------
+# Bash script to build cpp-ethereum within TravisCI.
+#
+# The documentation for cpp-ethereum is hosted at http://cpp-ethereum.org
+#
+# ------------------------------------------------------------------------------
+# This file is part of cpp-ethereum.
+#
+# cpp-ethereum is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cpp-ethereum is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>
+#
+# (c) 2016 cpp-ethereum contributors.
+# ------------------------------------------------------------------------------
+#
+#    Copyright (C) 2018-2019 SKALE Labs
+#
+#    This file is part of skale-consensus.
+#
+#    skale-consensus is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, eithe    r version 3 of the License, or
+#    (at your option) any later version.
+#
+#    skale-consensus is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with skale-consensus.  If not, see <http://www.gnu.org/licenses/>.
+#
+#    @file  docker_build_push.py
+#    @author Stan Kladko
+#    @date 2018
+#
+
+import sys, os, subprocess, time
+os.chdir("..")
+topDir = os.getcwd() + "/sgxwallet"
+BRANCH = sys.argv[1];
+DOCKER_FILE_NAME = sys.argv[2];
+IMAGE_NAME = sys.argv[3];
+if (BRANCH == "develop") :
+   TAG_POSTFIX = "latest";
+else :
+    TAG_POSTFIX = "latest_commit"
+   
+
+print("Starting build for branch " + BRANCH, flush=True)
+
+assert subprocess.call(["pwd"]) == 0;
+
+assert subprocess.call(["docker", "build", topDir, "--file", topDir + "/" + DOCKER_FILE_NAME, "--tag",
+                                              "skalenetwork/" + IMAGE_NAME + ":" + TAG_POSTFIX]) == 0;
+

scripts/docker_push.py

+#!/usr/bin/env python
+
+# ------------------------------------------------------------------------------
+# Bash script to build cpp-ethereum within TravisCI.
+#
+# The documentation for cpp-ethereum is hosted at http://cpp-ethereum.org
+#
+# ------------------------------------------------------------------------------
+# This file is part of cpp-ethereum.
+#
+# cpp-ethereum is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cpp-ethereum is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>
+#
+# (c) 2016 cpp-ethereum contributors.
+# ------------------------------------------------------------------------------
+#
+#    Copyright (C) 2018-2019 SKALE Labs
+#
+#    This file is part of skale-consensus.
+#
+#    skale-consensus is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, eithe    r version 3 of the License, or
+#    (at your option) any later version.
+#
+#    skale-consensus is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with skale-consensus.  If not, see <http://www.gnu.org/licenses/>.
+#
+#    @file  docker_build_push.py
+#    @author Stan Kladko
+#    @date 2018
+#
+
+import sys, os, subprocess, time
+os.chdir("..")
+topDir = os.getcwd() + "/sgxwallet"
+print("Starting build push")
+print("Top directory is:" + topDir)
+SCRIPTS_DIR = topDir + "/scripts"
+
+BRANCH = sys.argv[1];
+DOCKER_FILE_NAME = sys.argv[2];
+IMAGE_NAME = sys.argv[3];
+if (BRANCH == "develop") :
+    TAG_POSTFIX = "latest";
+else :
+    TAG_POSTFIX = "latest_commit"
+
+
+
+#print(sys.argv[1]);
+#print(sys.argv[2]);
+
+assert subprocess.call(["docker", "push", "skalenetwork/" + IMAGE_NAME + ":" + TAG_POSTFIX]) == 0;
+

scripts/docker_test.py

@@ -6,19 +6,36 @@
 #    @date 2020
 #
 
-import sys
-import os
-import subprocess
-import socket
-
-assert os.path.isdir('sgx_data/sgxwallet.db')
-assert os.path.isdir('sgx_data/cert_data');
-assert os.path.isdir('sgx_data/CSR_DB');
-assert os.path.isdir('sgx_data/CSR_STATUS_DB');
-assert os.path.isfile('sgx_data/cert_data/SGXServerCert.crt')
-assert os.path.isfile('sgx_data/cert_data/SGXServerCert.key')
-assert os.path.isfile('sgx_data/cert_data/rootCA.pem')
-assert os.path.isfile('sgx_data/cert_data/rootCA.key')
+import sys, os, subprocess, socket, time
+os.chdir("..")
+topDir = os.getcwd() + "/sgxwallet"
+print("Starting build push")
+print("Top directory is:" + topDir)
+SCRIPTS_DIR = topDir + "/scripts"
+
+BRANCH = sys.argv[1];
+DOCKER_FILE_NAME = sys.argv[2];
+IMAGE_NAME = sys.argv[3];
+
+if (BRANCH == "develop") :
+    TAG_POSTFIX = "latest";
+else :
+    TAG_POSTFIX = "latest_commit"
+
+print("Running tests for branch " + BRANCH);
+assert subprocess.call(["docker", "run", "-v", topDir + "/sgx_data:/usr/src/sdk/sgx_data",
+                        "-d", "--network=host", "skalenetwork/" + IMAGE_NAME +":" + TAG_POSTFIX]) == 0
+
+time.sleep(5);
+
+assert os.path.isdir(topDir + '/sgx_data/sgxwallet.db')
+assert os.path.isdir(topDir + '/sgx_data/cert_data');
+assert os.path.isdir(topDir + '/sgx_data/CSR_DB');
+assert os.path.isdir(topDir + '/sgx_data/CSR_STATUS_DB');
+assert os.path.isfile(topDir + '/sgx_data/cert_data/SGXServerCert.crt')
+assert os.path.isfile(topDir + '/sgx_data/cert_data/SGXServerCert.key')
+assert os.path.isfile(topDir + '/sgx_data/cert_data/rootCA.pem')
+assert os.path.isfile(topDir + '/sgx_data/cert_data/rootCA.key')
 
 s1 = socket.socket()
 s2 = socket.socket()
@@ -37,4 +54,3 @@ s3.close()
 
 
 
-